Wrap gtkutil/entry

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

diff --git a/libs/gtkutil/dialog.cpp b/libs/gtkutil/dialog.cpp
index d22dc94c1b4a73fade9ffe4608246862ee72ed46..6c0c8edbb20c28af90437c21e9fc59295b653da3 100644 (file)
--- a/libs/gtkutil/dialog.cpp
+++ b/libs/gtkutil/dialog.cpp
@@ -26,40 +26,40 @@
 #include "button.h"
 #include "window.h"
 
-GtkVBox* create_dialog_vbox( int spacing, int border ){
-       GtkVBox* vbox = ui::VBox( FALSE, spacing );
-       gtk_widget_show( GTK_WIDGET( vbox ) );
+ui::VBox create_dialog_vbox( int spacing, int border ){
+       auto vbox = ui::VBox( FALSE, spacing );
+       vbox.show();
        gtk_container_set_border_width( GTK_CONTAINER( vbox ), border );
        return vbox;
 }
 
-GtkHBox* create_dialog_hbox( int spacing, int border ){
-       GtkHBox* hbox = ui::HBox( FALSE, spacing );
-       gtk_widget_show( GTK_WIDGET( hbox ) );
+ui::HBox create_dialog_hbox( int spacing, int border ){
+       auto hbox = ui::HBox( FALSE, spacing );
+       hbox.show();
        gtk_container_set_border_width( GTK_CONTAINER( hbox ), border );
        return hbox;
 }
 
-GtkFrame* create_dialog_frame( const char* label, GtkShadowType shadow ){
-       GtkFrame* frame = ui::Frame( label );
-       gtk_widget_show( GTK_WIDGET( frame ) );
+ui::Frame create_dialog_frame( const char* label, GtkShadowType shadow ){
+       auto frame = ui::Frame( label );
+       frame.show();
        gtk_frame_set_shadow_type( frame, shadow );
        return frame;
 }
 
-GtkTable* create_dialog_table( unsigned int rows, unsigned int columns, unsigned int row_spacing, unsigned int col_spacing, int border ){
-       GtkTable* table = ui::Table( rows, columns, FALSE );
-       gtk_widget_show( GTK_WIDGET( table ) );
+ui::Table create_dialog_table( unsigned int rows, unsigned int columns, unsigned int row_spacing, unsigned int col_spacing, int border ){
+       auto table = ui::Table( rows, columns, FALSE );
+       table.show();
        gtk_table_set_row_spacings( table, row_spacing );
        gtk_table_set_col_spacings( table, col_spacing );
        gtk_container_set_border_width( GTK_CONTAINER( table ), border );
        return table;
 }
 
-GtkButton* create_dialog_button( const char* label, GCallback func, gpointer data ){
-       GtkButton* button = ui::Button( label );
+ui::Button create_dialog_button( const char* label, GCallback func, gpointer data ){
+       auto button = ui::Button( label );
        gtk_widget_set_size_request( GTK_WIDGET( button ), 64, -1 );
-       gtk_widget_show( GTK_WIDGET( button ) );
+       button.show();
        g_signal_connect( G_OBJECT( button ), "clicked", func, data );
        return button;
 }
@@ -73,13 +73,13 @@ ui::Window create_dialog_window( ui::Window parent, const char* title, GCallback
        return window;
 }
 
-gboolean modal_dialog_button_clicked( GtkWidget *widget, ModalDialogButton* button ){
+gboolean modal_dialog_button_clicked( ui::Widget widget, ModalDialogButton* button ){
        button->m_dialog.loop = false;
        button->m_dialog.ret = button->m_value;
        return TRUE;
 }
 
-gboolean modal_dialog_delete( GtkWidget *widget, GdkEvent* event, ModalDialog* dialog ){
+gboolean modal_dialog_delete( ui::Widget widget, GdkEvent* event, ModalDialog* dialog ){
        dialog->loop = 0;
        dialog->ret = eIDCANCEL;
        return TRUE;
@@ -101,7 +101,7 @@ EMessageBoxReturn modal_dialog_show( ui::Window window, ModalDialog& dialog ){
        return dialog.ret;
 }
 
-GtkButton* create_modal_dialog_button( const char* label, ModalDialogButton& button ){
+ui::Button create_modal_dialog_button( const char* label, ModalDialogButton& button ){
        return create_dialog_button( label, G_CALLBACK( modal_dialog_button_clicked ), &button );
 }
 
@@ -110,7 +110,7 @@ ui::Window create_modal_dialog_window( ui::Window parent, const char* title, Mod
 }
 
 ui::Window create_fixedsize_modal_dialog_window( ui::Window parent, const char* title, ModalDialog& dialog, int width, int height ){
-       ui::Window window = create_modal_dialog_window( parent, title, dialog, width, height );
+       auto window = create_modal_dialog_window( parent, title, dialog, width, height );
 
        gtk_window_set_resizable( window, FALSE );
        gtk_window_set_modal( window, TRUE );
@@ -127,37 +127,37 @@ ui::Window create_fixedsize_modal_dialog_window( ui::Window parent, const char*
        return window;
 }
 
-gboolean dialog_button_ok( GtkWidget *widget, ModalDialog* data ){
+gboolean dialog_button_ok( ui::Widget widget, ModalDialog* data ){
        data->loop = false;
        data->ret = eIDOK;
        return TRUE;
 }
 
-gboolean dialog_button_cancel( GtkWidget *widget, ModalDialog* data ){
+gboolean dialog_button_cancel( ui::Widget widget, ModalDialog* data ){
        data->loop = false;
        data->ret = eIDCANCEL;
        return TRUE;
 }
 
-gboolean dialog_button_yes( GtkWidget *widget, ModalDialog* data ){
+gboolean dialog_button_yes( ui::Widget widget, ModalDialog* data ){
        data->loop = false;
        data->ret = eIDYES;
        return TRUE;
 }
 
-gboolean dialog_button_no( GtkWidget *widget, ModalDialog* data ){
+gboolean dialog_button_no( ui::Widget widget, ModalDialog* data ){
        data->loop = false;
        data->ret = eIDNO;
        return TRUE;
 }
 
-gboolean dialog_delete_callback( GtkWidget *widget, GdkEventAny* event, ModalDialog* data ){
+gboolean dialog_delete_callback( ui::Widget widget, GdkEventAny* event, ModalDialog* data ){
        gtk_widget_hide( widget );
        data->loop = false;
        return TRUE;
 }
 
-ui::Window create_simple_modal_dialog_window( const char* title, ModalDialog& dialog, GtkWidget* contents ){
+ui::Window create_simple_modal_dialog_window( const char* title, ModalDialog& dialog, ui::Widget contents ){
        ui::Window window = create_fixedsize_modal_dialog_window(ui::Window(), title, dialog );
 
        GtkVBox* vbox1 = create_dialog_vbox( 8, 4 );
@@ -203,13 +203,13 @@ PathEntry PathEntry_new(){
        GtkHBox* hbox = ui::HBox( FALSE, 0 );
        gtk_widget_show( GTK_WIDGET( hbox ) );
 
-       GtkEntry* entry = ui::Entry();
+       auto entry = ui::Entry();
        gtk_entry_set_has_frame( entry, FALSE );
        gtk_widget_show( GTK_WIDGET( entry ) );
        gtk_box_pack_start( GTK_BOX( hbox ), GTK_WIDGET( entry ), TRUE, TRUE, 0 );
 
        // browse button
-       GtkButton* button = ui::Button();
+       auto button = ui::Button();
        button_set_icon( button, "ellipsis.bmp" );
        gtk_widget_show( GTK_WIDGET( button ) );
        gtk_box_pack_end( GTK_BOX( hbox ), GTK_WIDGET( button ), FALSE, FALSE, 0 );
@@ -224,7 +224,7 @@ void PathEntry_setPath( PathEntry& self, const char* path ){
 }
 typedef ReferenceCaller1<PathEntry, const char*, PathEntry_setPath> PathEntrySetPathCaller;
 
-void BrowsedPathEntry_clicked( GtkWidget* widget, BrowsedPathEntry* self ){
+void BrowsedPathEntry_clicked( ui::Widget widget, BrowsedPathEntry* self ){
        self->m_browse( PathEntrySetPathCaller( self->m_entry ) );
 }
 
@@ -235,8 +235,8 @@ BrowsedPathEntry::BrowsedPathEntry( const BrowseCallback& browse ) :
 }
 
 
-GtkLabel* DialogLabel_new( const char* name ){
-       ui::Label label = ui::Label( name );
+ui::Label DialogLabel_new( const char* name ){
+       auto label = ui::Label( name );
        gtk_widget_show(label);
        gtk_misc_set_alignment( GTK_MISC( label ), 1, 0.5 );
        gtk_label_set_justify( label, GTK_JUSTIFY_LEFT );
@@ -244,8 +244,8 @@ GtkLabel* DialogLabel_new( const char* name ){
        return label;
 }
 
-GtkTable* DialogRow_new( const char* name, GtkWidget* widget ){
-       GtkTable* table = ui::Table( 1, 3, TRUE );
+ui::Table DialogRow_new( const char* name, ui::Widget widget ){
+       auto table = ui::Table( 1, 3, TRUE );
        gtk_widget_show( GTK_WIDGET( table ) );
 
        gtk_table_set_col_spacings( table, 4 );
@@ -262,6 +262,6 @@ GtkTable* DialogRow_new( const char* name, GtkWidget* widget ){
        return table;
 }
 
-void DialogVBox_packRow( GtkVBox* vbox, GtkWidget* row ){
+void DialogVBox_packRow( ui::VBox vbox, ui::Widget row ){
        gtk_box_pack_start( GTK_BOX( vbox ), row, FALSE, FALSE, 0 );
 }