Merge commit '020d0244e4239b21dc804d630edff926386ea34f' into master-merge

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

diff --git a/libs/gtkutil/cursor.h b/libs/gtkutil/cursor.h
index 89c6f72b4703911b3a2d9cb1954cc5f02a0d8808..0a19fab14dda0a158389f15351b831fde47d2c06 100644 (file)
--- a/libs/gtkutil/cursor.h
+++ b/libs/gtkutil/cursor.h
@@ -22,6 +22,8 @@
 #if !defined( INCLUDED_GTKUTIL_CURSOR_H )
 #define INCLUDED_GTKUTIL_CURSOR_H
 
+// This is probably removable if set_cursor is not used.
+#include <gdk/gdk.h>
 #include <uilib/uilib.h>
 
 #include "debugging/debugging.h"
@@ -29,15 +31,15 @@
 typedef struct _GdkCursor GdkCursor;
 typedef struct _GdkEventMotion GdkEventMotion;
 
-#if 0
+// 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
 {
@@ -117,11 +119,17 @@ 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 );
+/* NetRadiantCustom does this instead:
+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, ui::Widget widget, MotionDeltaFunction function, void* data );
+/* NetRadiantCustom does this instead:
+void freeze_pointer( ui::Window window, ui::Widget widget, MotionDeltaFunction function, void* data ); */
+void freeze_pointer( ui::Widget widget, MotionDeltaFunction function, void* data );
 
-void unfreeze_pointer( ui::Window window, bool centerize );
+/* NetRadiantCustom does this instead:
+void unfreeze_pointer( ui::Window window, bool centerize ); */
+void unfreeze_pointer( ui::Widget widget, bool centerize );
 };
 
 #endif