picomodel: white default color of fm, md2 (was one white and rest black)

[xonotic/netradiant.git] / radiant / windowobservers.h

diff --git a/radiant/windowobservers.h b/radiant/windowobservers.h
index eab5fe5989e4606a5b2a828a3cdf87fedf808262..37fe2f1598b52c57c7bbdc5c975b1d5a0316e57a 100644 (file)
--- a/radiant/windowobservers.h
+++ b/radiant/windowobservers.h
@@ -24,16 +24,14 @@
 
 #include "windowobserver.h"
 
-#include <gdk/gdktypes.h>
+#include <uilib/uilib.h>
 
 #include "math/vector.h"
 
 class WindowObserver;
 void GlobalWindowObservers_add( WindowObserver* observer );
-typedef struct _GtkWidget GtkWidget;
-typedef struct _GtkWindow GtkWindow;
-void GlobalWindowObservers_connectWidget( GtkWidget* widget );
-void GlobalWindowObservers_connectTopLevel( GtkWindow* window );
+void GlobalWindowObservers_connectWidget( ui::Widget widget );
+void GlobalWindowObservers_connectTopLevel( ui::Window window );
 
 inline ButtonIdentifier button_for_button( unsigned int button ){
        switch ( button )
@@ -48,19 +46,7 @@ inline ButtonIdentifier button_for_button( unsigned int button ){
        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 ) );