Misc fixes

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

diff --git a/radiant/windowobservers.h b/radiant/windowobservers.h
index eab5fe5989e4606a5b2a828a3cdf87fedf808262..4ac90b443a5d583d1d00fef0a6c68ad933d92464 100644 (file)
--- a/radiant/windowobservers.h
+++ b/radiant/windowobservers.h
@@ -24,46 +24,36 @@
 
 #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 );
-
-inline ButtonIdentifier button_for_button( unsigned int button ){
-       switch ( button )
-       {
-       case 1:
-               return c_buttonLeft;
-       case 2:
-               return c_buttonMiddle;
-       case 3:
-               return c_buttonRight;
-       }
-       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;
+void GlobalWindowObservers_add(WindowObserver *observer);
+
+void GlobalWindowObservers_connectWidget(ui::Widget widget);
+
+void GlobalWindowObservers_connectTopLevel(ui::Window window);
+
+inline ButtonIdentifier button_for_button(unsigned int button)
+{
+    switch (button) {
+        case 1:
+            return c_buttonLeft;
+        case 2:
+            return c_buttonMiddle;
+        case 3:
+            return c_buttonRight;
+    }
+    return c_buttonInvalid;
 }
 
-inline WindowVector WindowVector_forDouble( double x, double y ){
-       return WindowVector( static_cast<float>( x ), static_cast<float>( y ) );
+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 ));
 }
 
 #endif