GTK: wrap GTK_WIDGET

[xonotic/netradiant.git] / libs / gtkutil / window.cpp

diff --git a/libs/gtkutil/window.cpp b/libs/gtkutil/window.cpp
index 7fc62eae7d6239c0a8ad19f0e4ae7769b223091e..411e2b5ab2a1162a05d7e145d4b2bd04e624e474 100644 (file)
--- a/libs/gtkutil/window.cpp
+++ b/libs/gtkutil/window.cpp
@@ -28,7 +28,7 @@
 
 inline void CHECK_RESTORE( ui::Widget w ){
        if ( gpointer_to_int( g_object_get_data( G_OBJECT( w ), "was_mapped" ) ) != 0 ) {
-               gtk_widget_show( w );
+               w.show();
        }
 }
 
@@ -40,11 +40,11 @@ inline void CHECK_MINIMIZE( ui::Widget w ){
 static gboolean main_window_iconified( ui::Widget widget, GdkEventWindowState* event, gpointer data ){
        if ( ( event->changed_mask & ( GDK_WINDOW_STATE_ICONIFIED | GDK_WINDOW_STATE_WITHDRAWN ) ) != 0 ) {
                if ( ( event->new_window_state & ( GDK_WINDOW_STATE_ICONIFIED | GDK_WINDOW_STATE_WITHDRAWN ) ) != 0 ) {
-                       CHECK_MINIMIZE( ui::Widget(GTK_WIDGET( data )) );
+                       CHECK_MINIMIZE( ui::Widget::from( data ) );
                }
                else
                {
-                       CHECK_RESTORE( ui::Widget(GTK_WIDGET( data )) );
+                       CHECK_RESTORE( ui::Widget::from( data ) );
                }
        }
        return FALSE;
@@ -112,7 +112,7 @@ gboolean persistent_floating_window_delete( ui::Window floating, GdkEvent *event
 ui::Window create_persistent_floating_window( const char* title, ui::Window main_window ){
        ui::Window window = ui::Window(GTK_WINDOW( create_floating_window( title, main_window ) ));
 
-       gtk_widget_set_events( GTK_WIDGET( window ), GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK );
+       gtk_widget_set_events( window , GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK );
 
        connect_floating_window_delete_present( window, main_window );
        window.connect( "delete_event", G_CALLBACK( persistent_floating_window_delete ), 0 );
@@ -138,7 +138,7 @@ void window_remove_minmax( ui::Window window ){
 
 ui::ScrolledWindow create_scrolled_window( ui::Policy hscrollbar_policy, ui::Policy vscrollbar_policy, int border ){
        auto scr = ui::ScrolledWindow(ui::New);
-       gtk_widget_show( GTK_WIDGET( scr ) );
+       scr.show();
        gtk_scrolled_window_set_policy( scr, (GtkPolicyType) hscrollbar_policy, (GtkPolicyType) vscrollbar_policy );
        gtk_scrolled_window_set_shadow_type( scr, GTK_SHADOW_IN );
        gtk_container_set_border_width( GTK_CONTAINER( scr ), border );