Wrap GtkSpinButton

[xonotic/netradiant.git] / radiant / patchdialog.cpp

diff --git a/radiant/patchdialog.cpp b/radiant/patchdialog.cpp
index 8deb5bd9dc8e4aff8b712977e804b3fb207eff35..eff14bd647407745b0ce96cc79a4809febc28268 100644 (file)
--- a/radiant/patchdialog.cpp
+++ b/radiant/patchdialog.cpp
@@ -596,7 +596,7 @@ ui::Window PatchInspector::BuildDialog(){
                                                gtk_widget_show( GTK_WIDGET( vbox3 ) );
                                                gtk_container_add( GTK_CONTAINER( frame ), GTK_WIDGET( vbox3 ) );
                                                {
-                                                       GtkTable* table = GTK_TABLE( gtk_table_new( 2, 2, FALSE ) );
+                                                       GtkTable* table = ui::Table( 2, 2, FALSE );
                                                        gtk_widget_show( GTK_WIDGET( table ) );
                                                        gtk_box_pack_start( GTK_BOX( vbox3 ), GTK_WIDGET( table ), TRUE, TRUE, 0 );
                                                        gtk_table_set_row_spacings( table, 5 );
@@ -641,7 +641,7 @@ ui::Window PatchInspector::BuildDialog(){
                                                                m_pColCombo = combo;
                                                        }
                                                }
-                                               GtkTable* table = GTK_TABLE( gtk_table_new( 5, 2, FALSE ) );
+                                               GtkTable* table = ui::Table( 5, 2, FALSE );
                                                gtk_widget_show( GTK_WIDGET( table ) );
                                                gtk_box_pack_start( GTK_BOX( vbox3 ), GTK_WIDGET( table ), TRUE, TRUE, 0 );
                                                gtk_table_set_row_spacings( table, 5 );
@@ -743,7 +743,7 @@ ui::Window PatchInspector::BuildDialog(){
                                                gtk_widget_show( GTK_WIDGET( vbox3 ) );
                                                gtk_container_add( GTK_CONTAINER( frame ), GTK_WIDGET( vbox3 ) );
                                                {
-                                                       GtkTable* table = GTK_TABLE( gtk_table_new( 3, 2, FALSE ) );
+                                                       GtkTable* table = ui::Table( 3, 2, FALSE );
                                                        gtk_widget_show( GTK_WIDGET( table ) );
                                                        gtk_box_pack_start( GTK_BOX( vbox3 ), GTK_WIDGET( table ), TRUE, TRUE, 0 );
                                                        gtk_table_set_row_spacings( table, 5 );
@@ -827,7 +827,7 @@ ui::Window PatchInspector::BuildDialog(){
                                                g_signal_connect( G_OBJECT( entry ), "key_press_event", G_CALLBACK( OnDialogKey ), 0 );
                                        }
                                        {
-                                               GtkTable* table = GTK_TABLE( gtk_table_new( 5, 4, FALSE ) );
+                                               GtkTable* table = ui::Table( 5, 4, FALSE );
                                                gtk_widget_show( GTK_WIDGET( table ) );
                                                gtk_box_pack_start( GTK_BOX( vbox2 ), GTK_WIDGET( table ), TRUE, TRUE, 0 );
                                                gtk_table_set_row_spacings( table, 5 );
@@ -902,11 +902,11 @@ ui::Window PatchInspector::BuildDialog(){
                                                        // so we need to have at least one initialisation somewhere
                                                        entry_set_float( entry, g_pi_globals.shift[0] );
 
-                                                       GtkAdjustment* adj = GTK_ADJUSTMENT( gtk_adjustment_new( 0, -8192, 8192, 1, 1, 0 ) );
+                                                       auto adj = ui::Adjustment( 0, -8192, 8192, 1, 1, 0 );
                                                        g_signal_connect( G_OBJECT( adj ), "value_changed", G_CALLBACK( OnSpinChanged ), entry );
                                                        g_object_set_data( G_OBJECT( window ), "hshift_adj", adj );
 
-                                                       GtkSpinButton* spin = GTK_SPIN_BUTTON( gtk_spin_button_new( adj, 1, 0 ) );
+                                                       GtkSpinButton* spin = ui::SpinButton( adj, 1, 0 );
                                                        gtk_widget_show( GTK_WIDGET( spin ) );
                                                        gtk_table_attach( table, GTK_WIDGET( spin ), 1, 2, 0, 1,
                                                                                          (GtkAttachOptions)( 0 ),
@@ -923,11 +923,11 @@ ui::Window PatchInspector::BuildDialog(){
                                                        gtk_widget_set_usize( GTK_WIDGET( entry ), 50, -2 );
                                                        entry_set_float( entry, g_pi_globals.shift[1] );
 
-                                                       GtkAdjustment* adj = GTK_ADJUSTMENT( gtk_adjustment_new( 0, -8192, 8192, 1, 1, 0 ) );
+                                                       auto adj = ui::Adjustment( 0, -8192, 8192, 1, 1, 0 );
                                                        g_signal_connect( G_OBJECT( adj ), "value_changed", G_CALLBACK( OnSpinChanged ), entry );
                                                        g_object_set_data( G_OBJECT( window ), "vshift_adj", adj );
 
-                                                       GtkSpinButton* spin = GTK_SPIN_BUTTON( gtk_spin_button_new( adj, 1, 0 ) );
+                                                       GtkSpinButton* spin = ui::SpinButton( adj, 1, 0 );
                                                        gtk_widget_show( GTK_WIDGET( spin ) );
                                                        gtk_table_attach( table, GTK_WIDGET( spin ), 1, 2, 1, 2,
                                                                                          (GtkAttachOptions)( 0 ),
@@ -944,11 +944,11 @@ ui::Window PatchInspector::BuildDialog(){
                                                        gtk_widget_set_usize( GTK_WIDGET( entry ), 50, -2 );
                                                        entry_set_float( entry, g_pi_globals.scale[0] );
 
-                                                       GtkAdjustment* adj = GTK_ADJUSTMENT( gtk_adjustment_new( 0, -1000, 1000, 1, 1, 0 ) );
+                                                       auto adj = ui::Adjustment( 0, -1000, 1000, 1, 1, 0 );
                                                        g_signal_connect( G_OBJECT( adj ), "value_changed", G_CALLBACK( OnSpinChanged ), entry );
                                                        g_object_set_data( G_OBJECT( window ), "hscale_adj", adj );
 
-                                                       GtkSpinButton* spin = GTK_SPIN_BUTTON( gtk_spin_button_new( adj, 1, 0 ) );
+                                                       GtkSpinButton* spin = ui::SpinButton( adj, 1, 0 );
                                                        gtk_widget_show( GTK_WIDGET( spin ) );
                                                        gtk_table_attach( table, GTK_WIDGET( spin ), 1, 2, 2, 3,
                                                                                          (GtkAttachOptions)( 0 ),
@@ -965,11 +965,11 @@ ui::Window PatchInspector::BuildDialog(){
                                                        gtk_widget_set_usize( GTK_WIDGET( entry ), 50, -2 );
                                                        entry_set_float( entry, g_pi_globals.scale[1] );
 
-                                                       GtkAdjustment* adj = GTK_ADJUSTMENT( gtk_adjustment_new( 0, -1000, 1000, 1, 1, 0 ) );
+                                                       auto adj = ui::Adjustment( 0, -1000, 1000, 1, 1, 0 );
                                                        g_signal_connect( G_OBJECT( adj ), "value_changed", G_CALLBACK( OnSpinChanged ), entry );
                                                        g_object_set_data( G_OBJECT( window ), "vscale_adj", adj );
 
-                                                       GtkSpinButton* spin = GTK_SPIN_BUTTON( gtk_spin_button_new( adj, 1, 0 ) );
+                                                       GtkSpinButton* spin = ui::SpinButton( adj, 1, 0 );
                                                        gtk_widget_show( GTK_WIDGET( spin ) );
                                                        gtk_table_attach( table, GTK_WIDGET( spin ), 1, 2, 3, 4,
                                                                                          (GtkAttachOptions)( 0 ),
@@ -986,11 +986,11 @@ ui::Window PatchInspector::BuildDialog(){
                                                        gtk_widget_set_usize( GTK_WIDGET( entry ), 50, -2 );
                                                        entry_set_float( entry, g_pi_globals.rotate );
 
-                                                       GtkAdjustment* adj = GTK_ADJUSTMENT( gtk_adjustment_new( 0, -1000, 1000, 1, 1, 0 ) ); // NOTE: Arnout - this really should be 360 but can't change it anymore as it could break existing maps
+                                                       auto adj = ui::Adjustment( 0, -1000, 1000, 1, 1, 0 ); // NOTE: Arnout - this really should be 360 but can't change it anymore as it could break existing maps
                                                        g_signal_connect( G_OBJECT( adj ), "value_changed", G_CALLBACK( OnSpinChanged ), entry );
                                                        g_object_set_data( G_OBJECT( window ), "rotate_adj", adj );
 
-                                                       GtkSpinButton* spin = GTK_SPIN_BUTTON( gtk_spin_button_new( adj, 1, 0 ) );
+                                                       GtkSpinButton* spin = ui::SpinButton( adj, 1, 0 );
                                                        gtk_widget_show( GTK_WIDGET( spin ) );
                                                        gtk_table_attach( table, GTK_WIDGET( spin ), 1, 2, 4, 5,
                                                                                          (GtkAttachOptions)( 0 ),