fix merge

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

diff --git a/libs/gtkutil/cursor.h b/libs/gtkutil/cursor.h
index 3b873db4f92e88fffc0b1a8e087c51282148a1aa..81767d2e591900fa4b258c3b0d473c363c5ca022 100644 (file)
--- a/libs/gtkutil/cursor.h
+++ b/libs/gtkutil/cursor.h
@@ -110,7 +110,7 @@ class FreezePointer
 {
 unsigned int handle_motion;
 int recorded_x, recorded_y, last_x, last_y, center_x, center_y;
-GtkWidget* weedjet;
+ui::Widget weedjet{ui::null};
 typedef void ( *MotionDeltaFunction )( int x, int y, unsigned int state, void* data );
 MotionDeltaFunction m_function;
 void* m_data;
@@ -119,7 +119,7 @@ FreezePointer() : handle_motion( 0 ), m_function( 0 ), m_data( 0 ){
 }
 static gboolean motion_delta( ui::Window widget, GdkEventMotion *event, FreezePointer* self );
 
-void freeze_pointer( ui::Window window, MotionDeltaFunction function, void* data );
+void freeze_pointer( ui::Window window, ui::Widget widget, MotionDeltaFunction function, void* data );
 
 void unfreeze_pointer( ui::Window window );
 };