Merge commit '01a950c3de3ef7f7da23360f925404e2bd385d5d' into master-merge

[xonotic/netradiant.git] / libs / gtkutil / cursor.h

diff --git a/libs/gtkutil/cursor.h b/libs/gtkutil/cursor.h
index 3b873db4f92e88fffc0b1a8e087c51282148a1aa..db0234d7c50e1ed58efb5bf6bcb4c6869e2e4659 100644 (file)
--- a/libs/gtkutil/cursor.h
+++ b/libs/gtkutil/cursor.h
@@ -22,6 +22,7 @@
 #if !defined( INCLUDED_GTKUTIL_CURSOR_H )
 #define INCLUDED_GTKUTIL_CURSOR_H
 
+#include <gdk/gdk.h>
 #include <uilib/uilib.h>
 
 #include "debugging/debugging.h"
@@ -29,15 +30,15 @@
 typedef struct _GdkCursor GdkCursor;
 typedef struct _GdkEventMotion GdkEventMotion;
 
-#if 0
+// Note: NetRadiantCustom disables them but we still make use of them.
+#if 1
 GdkCursor* create_blank_cursor();
+void set_cursor( ui::Widget widget, GdkCursorType cursor_type );
 void blank_cursor( ui::Widget widget );
 void default_cursor( ui::Widget widget );
 #endif
-void Sys_GetCursorPos( ui::Window window, int *x, int *y );
-void Sys_SetCursorPos( ui::Window window, int x, int y );
-
-
+void Sys_GetCursorPos( ui::Widget widget, int *x, int *y );
+void Sys_SetCursorPos( ui::Widget widget, int x, int y );
 
 class DeferredMotion
 {
@@ -110,18 +111,17 @@ class FreezePointer
 {
 unsigned int handle_motion;
 int recorded_x, recorded_y, last_x, last_y, center_x, center_y;
-GtkWidget* weedjet;
 typedef void ( *MotionDeltaFunction )( int x, int y, unsigned int state, void* data );
 MotionDeltaFunction m_function;
 void* m_data;
 public:
 FreezePointer() : handle_motion( 0 ), m_function( 0 ), m_data( 0 ){
 }
-static gboolean motion_delta( ui::Window widget, GdkEventMotion *event, FreezePointer* self );
+static gboolean motion_delta( ui::Widget widget, GdkEventMotion *event, FreezePointer* self );
 
-void freeze_pointer( ui::Window window, MotionDeltaFunction function, void* data );
+void freeze_pointer( ui::Widget widget, MotionDeltaFunction function, void* data );
 
-void unfreeze_pointer( ui::Window window );
+void unfreeze_pointer( ui::Widget widget );
 };
 
 #endif