Merge commit 'fe73dd74d0e40a33c090993390e4d5721a1f9e05' into garux-merge

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

diff --git a/libs/gtkutil/window.cpp b/libs/gtkutil/window.cpp
index bbeed5b9942884e9a4a8a39b0e3566a2dd9a9de0..11b6efeb21cd043373859011100ac7a7d676efd0 100644 (file)
--- a/libs/gtkutil/window.cpp
+++ b/libs/gtkutil/window.cpp
@@ -28,23 +28,23 @@
 
 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();
        }
 }
 
 inline void CHECK_MINIMIZE( ui::Widget w ){
        g_object_set_data( G_OBJECT( w ), "was_mapped", gint_to_pointer( gtk_widget_get_visible( w ) ) );
-       gtk_widget_hide( w );
+       w.hide();
 }
 
 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;
@@ -96,7 +96,7 @@ ui::Window create_floating_window( const char* title, ui::Window parent ){
 }
 
 void destroy_floating_window( ui::Window window ){
-       gtk_widget_destroy( GTK_WIDGET( window ) );
+       window.destroy();
 }
 
 gint window_realize_remove_sysmenu( ui::Widget widget, gpointer data ){
@@ -105,14 +105,14 @@ gint window_realize_remove_sysmenu( ui::Widget widget, gpointer data ){
 }
 
 gboolean persistent_floating_window_delete( ui::Window floating, GdkEvent *event, ui::Window main_window ){
-       gtk_widget_hide( GTK_WIDGET( floating ) );
+       floating.hide();
        return TRUE;
 }
 
 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 ) ));
+       auto 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 );
@@ -137,17 +137,17 @@ 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();
-       gtk_widget_show( GTK_WIDGET( scr ) );
+       auto scr = ui::ScrolledWindow(ui::New);
+       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 );
        return scr;
 }
 
-gboolean window_focus_in_clear_focus_widget(ui::Widget widget, GdkEventKey *event, gpointer data)
+gboolean window_focus_in_clear_focus_widget(ui::Window widget, GdkEventKey *event, gpointer data)
 {
-    gtk_window_set_focus( GTK_WINDOW( widget ), NULL );
+    gtk_window_set_focus( widget, NULL );
     return FALSE;
 }
 
@@ -183,30 +183,30 @@ void window_set_position(ui::Window window, const WindowPosition &position)
        gtk_window_set_default_size( window, position.w, position.h );
 }
 
-void WindowPosition_Parse(WindowPosition &position, const char *value)
+void WindowPosition_String::Import(WindowPosition &position, const char *value)
 {
        if ( sscanf( value, "%d %d %d %d", &position.x, &position.y, &position.w, &position.h ) != 4 ) {
                position = WindowPosition( c_default_window_pos ); // ensure sane default value for window position
        }
 }
 
-void WindowPosition_Write(const WindowPosition &position, const StringImportCallback &importCallback)
+void WindowPosition_String::Export(const WindowPosition &self, const Callback<void(const char *)> &returnz)
 {
        char buffer[64];
-       sprintf( buffer, "%d %d %d %d", position.x, position.y, position.w, position.h );
-       importCallback( buffer );
+       sprintf( buffer, "%d %d %d %d", self.x, self.y, self.w, self.h );
+       returnz( buffer );
 }
 
-void WindowPositionTracker_importString(WindowPositionTracker &self, const char *value)
+void WindowPositionTracker_String::Import(WindowPositionTracker &self, const char *value)
 {
        WindowPosition position;
-       WindowPosition_Parse( position, value );
+       WindowPosition_String::Import( position, value );
        self.setPosition( position );
 }
 
-void WindowPositionTracker_exportString(const WindowPositionTracker &self, const StringImportCallback &importer)
+void WindowPositionTracker_String::Export(const WindowPositionTracker &self, const Callback<void(const char *)> &returnz)
 {
-       WindowPosition_Write( self.getPosition(), importer );
+       WindowPosition_String::Export( self.getPosition(), returnz );
 }
 
 gboolean WindowPositionTracker::configure(ui::Widget widget, GdkEventConfigure *event, WindowPositionTracker *self)