quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use gtk_widget_get_window() instead of widget->window

Browse Source
This commit is contained in:
Garux
2020-05-20 00:05:49 +03:00
parent ff33df7d45
commit 12263f74d1
10 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libs/gtkutil/cursor.cpp
View File

@@ -46,12 +46,12 @@ GdkCursor* create_blank_cursor(){
void blank_cursor( GtkWidget* widget ){
GdkCursor* cursor = create_blank_cursor();
gdk_window_set_cursor( widget->window, cursor );
gdk_window_set_cursor( gtk_widget_get_window( widget ), cursor );
gdk_cursor_unref( cursor );
}
void default_cursor( GtkWidget* widget ){
gdk_window_set_cursor( widget->window, 0 );
gdk_window_set_cursor( gtk_widget_get_window( widget ), 0 );
}
#endif

8
libs/gtkutil/cursor.h
View File

@@ -182,8 +182,8 @@ void freeze_pointer( GtkWindow* window, GtkWidget* widget, MotionDeltaFunction f
//GdkGrabStatus status =
/* fixes cursor runaways during srsly quick drags in camera
drags with pressed buttons have no problem at all w/o this */
gdk_pointer_grab( GTK_WIDGET( window )->window, TRUE, mask, 0, cursor, GDK_CURRENT_TIME );
//gdk_window_set_cursor ( GTK_WIDGET( window )->window, cursor );
gdk_pointer_grab( gtk_widget_get_window( GTK_WIDGET( window ) ), TRUE, mask, 0, cursor, GDK_CURRENT_TIME );
//gdk_window_set_cursor ( gtk_widget_get_window( GTK_WIDGET( window ) ), cursor );
/* is needed to fix activating neighbor widgets, that happens, if using upper one */
gtk_grab_add( widget );
@@ -192,7 +192,7 @@ void freeze_pointer( GtkWindow* window, GtkWidget* widget, MotionDeltaFunction f
Sys_GetCursorPos( window, &recorded_x, &recorded_y );
/* using center for tracking for max safety */
gdk_window_get_origin( widget->window, &center_x, &center_y );
gdk_window_get_origin( gtk_widget_get_window( widget ), &center_x, &center_y );
center_y += widget->allocation.height / 2;
center_x += widget->allocation.width / 2;
@@ -224,7 +224,7 @@ void unfreeze_pointer( bool centerize ){
else{
Sys_SetCursorPos( m_window, recorded_x, recorded_y );
}
// gdk_window_set_cursor( GTK_WIDGET( m_window )->window, 0 );
// gdk_window_set_cursor( gtk_widget_get_window( GTK_WIDGET( m_window ) ), 0 );
gdk_pointer_ungrab( GDK_CURRENT_TIME );
gtk_grab_remove( m_widget );

4
libs/gtkutil/window.cpp
View File

@@ -123,7 +123,7 @@ void destroy_floating_window( GtkWindow* window ){
}
gint window_realize_remove_sysmenu( GtkWidget* widget, gpointer data ){
gdk_window_set_decorations( widget->window, (GdkWMDecoration)( GDK_DECOR_ALL | GDK_DECOR_MENU ) );
gdk_window_set_decorations( gtk_widget_get_window( widget ), (GdkWMDecoration)( GDK_DECOR_ALL | GDK_DECOR_MENU ) );
return FALSE;
}
@@ -150,7 +150,7 @@ GtkWindow* create_persistent_floating_window( const char* title, GtkWindow* main
}
gint window_realize_remove_minmax( GtkWidget* widget, gpointer data ){
gdk_window_set_decorations( widget->window, (GdkWMDecoration)( GDK_DECOR_ALL | GDK_DECOR_MINIMIZE | GDK_DECOR_MAXIMIZE ) );
gdk_window_set_decorations( gtk_widget_get_window( widget ), (GdkWMDecoration)( GDK_DECOR_ALL | GDK_DECOR_MINIMIZE | GDK_DECOR_MAXIMIZE ) );
return FALSE;
}