Remove a few gdk includes in headers

diff --git a/plugins/textool/StdAfx.h b/plugins/textool/StdAfx.h
index 4a3f8435c423a9ca62d4a96f0b3d3c7243efcabb..f884c53e75f8e269158bce9073b00405ab320edc 100644 (file)
--- a/plugins/textool/StdAfx.h
+++ b/plugins/textool/StdAfx.h
@@ -23,7 +23,6 @@
 // precompiled headers
 
 // standard headers
 // precompiled headers
 
 // standard headers

-#include <gdk/gdkkeysyms.h>

 #include <stdio.h>
 #include <stdlib.h>
 
 #include <stdio.h>
 #include <stdlib.h>
 

diff --git a/radiant/windowobservers.cpp b/radiant/windowobservers.cpp
index 4d5c2897be4f8e335055812ba8f635b2b02b7317..3bd2334daf1f0f2d8e55bd8078338e7b146b0a70 100644 (file)
--- a/radiant/windowobservers.cpp
+++ b/radiant/windowobservers.cpp
@@ -149,3 +149,18 @@ void GlobalWindowObservers_connectWidget( ui::Widget widget ){
        widget.connect( "button_release_event", G_CALLBACK( modifiers_button_release ), &g_window_observers );
        widget.connect( "motion_notify_event", G_CALLBACK( modifiers_motion ), &g_window_observers );
 }
        widget.connect( "button_release_event", G_CALLBACK( modifiers_button_release ), &g_window_observers );
        widget.connect( "motion_notify_event", G_CALLBACK( modifiers_motion ), &g_window_observers );
 }

+
+ModifierFlags modifiers_for_state(unsigned int state)
+{
+       ModifierFlags modifiers = c_modifierNone;
+       if ( state & GDK_SHIFT_MASK ) {
+               modifiers |= c_modifierShift;
+       }
+       if ( state & GDK_CONTROL_MASK ) {
+               modifiers |= c_modifierControl;
+       }
+       if ( state & GDK_MOD1_MASK ) {
+               modifiers |= c_modifierAlt;
+       }
+       return modifiers;
+}

diff --git a/radiant/windowobservers.h b/radiant/windowobservers.h
index 9785d9dc9df3d552ed6a2b41e93c74bf27e612ec..37fe2f1598b52c57c7bbdc5c975b1d5a0316e57a 100644 (file)
--- a/radiant/windowobservers.h
+++ b/radiant/windowobservers.h
@@ -24,7 +24,6 @@
 
 #include "windowobserver.h"
 
 
 #include "windowobserver.h"
 

-#include <gdk/gdk.h>

 #include <uilib/uilib.h>
 
 #include "math/vector.h"
 #include <uilib/uilib.h>
 
 #include "math/vector.h"


@@ -47,19 +46,7 @@ inline ButtonIdentifier button_for_button( unsigned int button ){
        return c_buttonInvalid;
 }
 
        return c_buttonInvalid;
 }
 

-inline ModifierFlags modifiers_for_state( unsigned int state ){
-       ModifierFlags modifiers = c_modifierNone;
-       if ( state & GDK_SHIFT_MASK ) {
-               modifiers |= c_modifierShift;
-       }
-       if ( state & GDK_CONTROL_MASK ) {
-               modifiers |= c_modifierControl;
-       }
-       if ( state & GDK_MOD1_MASK ) {
-               modifiers |= c_modifierAlt;
-       }
-       return modifiers;
-}
+ModifierFlags modifiers_for_state( unsigned int state );

 
 inline WindowVector WindowVector_forDouble( double x, double y ){
        return WindowVector( static_cast<float>( x ), static_cast<float>( y ) );
 
 inline WindowVector WindowVector_forDouble( double x, double y ){
        return WindowVector( static_cast<float>( x ), static_cast<float>( y ) );