X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fnetradiant.git;a=blobdiff_plain;f=radiant%2Fdialog.cpp;h=a5a39ecfff33a265b2fcb2c008c98b13359c981f;hp=e98cac9212901178a72b793658ae43405ba9f71e;hb=2951e448a7f008f2438be4bd5feba2e4f4400eef;hpb=62d99f889c0e98be65f779d3983109c84ce58cec diff --git a/radiant/dialog.cpp b/radiant/dialog.cpp index e98cac92..a5a39ecf 100644 --- a/radiant/dialog.cpp +++ b/radiant/dialog.cpp @@ -28,6 +28,8 @@ #include "dialog.h" +#include + #include "debugging/debugging.h" @@ -35,19 +37,6 @@ #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - #include "stream/stringstream.h" #include "convert.h" #include "gtkutil/dialog.h" @@ -58,9 +47,9 @@ #include "gtkmisc.h" -GtkEntry* DialogEntry_new(){ - GtkEntry* entry = GTK_ENTRY( gtk_entry_new() ); - gtk_widget_show( GTK_WIDGET( entry ) ); +ui::Entry DialogEntry_new(){ + auto entry = ui::Entry(ui::New); + entry.show(); gtk_widget_set_size_request( GTK_WIDGET( entry ), 64, -1 ); return entry; } @@ -68,32 +57,32 @@ GtkEntry* DialogEntry_new(){ class DialogEntryRow { public: -DialogEntryRow( GtkWidget* row, GtkEntry* entry ) : m_row( row ), m_entry( entry ){ +DialogEntryRow( ui::Widget row, ui::Entry entry ) : m_row( row ), m_entry( entry ){ } -GtkWidget* m_row; -GtkEntry* m_entry; +ui::Widget m_row; +ui::Entry m_entry; }; DialogEntryRow DialogEntryRow_new( const char* name ){ - GtkWidget* alignment = gtk_alignment_new( 0.0, 0.5, 0.0, 0.0 ); - gtk_widget_show( alignment ); + auto alignment = ui::Alignment( 0.0, 0.5, 0.0, 0.0 ); + alignment.show(); - GtkEntry* entry = DialogEntry_new(); - gtk_container_add( GTK_CONTAINER( alignment ), GTK_WIDGET( entry ) ); + auto entry = DialogEntry_new(); + alignment.add(entry); - return DialogEntryRow( GTK_WIDGET( DialogRow_new( name, alignment ) ), entry ); + return DialogEntryRow( ui::Widget(GTK_WIDGET( DialogRow_new( name, alignment ) )), entry ); } -GtkSpinButton* DialogSpinner_new( double value, double lower, double upper, int fraction ){ +ui::SpinButton DialogSpinner_new( double value, double lower, double upper, int fraction ){ double step = 1.0 / double(fraction); unsigned int digits = 0; for (; fraction > 1; fraction /= 10 ) { ++digits; } - GtkSpinButton* spin = GTK_SPIN_BUTTON( gtk_spin_button_new( GTK_ADJUSTMENT( gtk_adjustment_new( value, lower, upper, step, 10, 0 ) ), step, digits ) ); - gtk_widget_show( GTK_WIDGET( spin ) ); + auto spin = ui::SpinButton( ui::Adjustment( value, lower, upper, step, 10, 0 ), step, digits ); + spin.show(); gtk_widget_set_size_request( GTK_WIDGET( spin ), 64, -1 ); return spin; } @@ -101,20 +90,20 @@ GtkSpinButton* DialogSpinner_new( double value, double lower, double upper, int class DialogSpinnerRow { public: -DialogSpinnerRow( GtkWidget* row, GtkSpinButton* spin ) : m_row( row ), m_spin( spin ){ +DialogSpinnerRow( ui::Widget row, GtkSpinButton* spin ) : m_row( row ), m_spin( spin ){ } -GtkWidget* m_row; -GtkSpinButton* m_spin; +ui::Widget m_row; +ui::SpinButton m_spin; }; DialogSpinnerRow DialogSpinnerRow_new( const char* name, double value, double lower, double upper, int fraction ){ - GtkWidget* alignment = gtk_alignment_new( 0.0, 0.5, 0.0, 0.0 ); - gtk_widget_show( alignment ); + auto alignment = ui::Alignment( 0.0, 0.5, 0.0, 0.0 ); + alignment.show(); - GtkSpinButton* spin = DialogSpinner_new( value, lower, upper, fraction ); - gtk_container_add( GTK_CONTAINER( alignment ), GTK_WIDGET( spin ) ); + auto spin = DialogSpinner_new( value, lower, upper, fraction ); + alignment.add(spin); - return DialogSpinnerRow( GTK_WIDGET( DialogRow_new( name, alignment ) ), spin ); + return DialogSpinnerRow( ui::Widget(GTK_WIDGET( DialogRow_new( name, alignment ) )), spin ); } @@ -153,15 +142,15 @@ typedef ImportExport void IntRadioImport( GtkRadioButton& widget, int index ){ - radio_button_set_active( &widget, index ); + radio_button_set_active( ui::RadioButton(&widget), index ); } void IntRadioExport( GtkRadioButton& widget, const IntImportCallback& importCallback ){ - importCallback( radio_button_get_active( &widget ) ); + importCallback( radio_button_get_active( ui::RadioButton(&widget) ) ); } typedef ImportExport IntRadioImportExport; void TextEntryImport( GtkEntry& widget, const char* text ){ - gtk_entry_set_text( &widget, text ); + ui::Entry(&widget).text(text); } void TextEntryExport( GtkEntry& widget, const StringImportCallback& importCallback ){ importCallback( gtk_entry_get_text( &widget ) ); @@ -170,7 +159,7 @@ typedef ImportExport Te void IntEntryImport( GtkEntry& widget, int value ){ - entry_set_int( &widget, value ); + entry_set_int( ui::Entry(&widget), value ); } void IntEntryExport( GtkEntry& widget, const IntImportCallback& importCallback ){ importCallback( atoi( gtk_entry_get_text( &widget ) ) ); @@ -179,7 +168,7 @@ typedef ImportExport IntEntryImpo void SizeEntryImport( GtkEntry& widget, std::size_t value ){ - entry_set_int( &widget, int(value) ); + entry_set_int( ui::Entry(&widget), int(value) ); } void SizeEntryExport( GtkEntry& widget, const SizeImportCallback& importCallback ){ int value = atoi( gtk_entry_get_text( &widget ) ); @@ -192,7 +181,7 @@ typedef ImportExport Si void FloatEntryImport( GtkEntry& widget, float value ){ - entry_set_float( &widget, value ); + entry_set_float( ui::Entry(&widget), value ); } void FloatEntryExport( GtkEntry& widget, const FloatImportCallback& importCallback ){ importCallback( (float)atof( gtk_entry_get_text( &widget ) ) ); @@ -204,7 +193,7 @@ void FloatSpinnerImport( GtkSpinButton& widget, float value ){ gtk_spin_button_set_value( &widget, value ); } void FloatSpinnerExport( GtkSpinButton& widget, const FloatImportCallback& importCallback ){ - importCallback( float(gtk_spin_button_get_value_as_float( &widget ) ) ); + importCallback( float(gtk_spin_button_get_value( &widget ) ) ); } typedef ImportExport FloatSpinnerImportExport; @@ -318,39 +307,39 @@ Dialog::~Dialog(){ ( *i )->release(); } - ASSERT_MESSAGE( m_window == 0, "dialog window not destroyed" ); + ASSERT_MESSAGE( !m_window, "dialog window not destroyed" ); } void Dialog::ShowDlg(){ - ASSERT_MESSAGE( m_window != 0, "dialog was not constructed" ); + ASSERT_MESSAGE( m_window, "dialog was not constructed" ); importData(); - gtk_widget_show( GTK_WIDGET( m_window ) ); + m_window.show(); } void Dialog::HideDlg(){ - ASSERT_MESSAGE( m_window != 0, "dialog was not constructed" ); + ASSERT_MESSAGE( m_window, "dialog was not constructed" ); exportData(); - gtk_widget_hide( GTK_WIDGET( m_window ) ); + m_window.hide(); } -static gint delete_event_callback( GtkWidget *widget, GdkEvent* event, gpointer data ){ +static gint delete_event_callback( ui::Widget widget, GdkEvent* event, gpointer data ){ reinterpret_cast( data )->HideDlg(); reinterpret_cast( data )->EndModal( eIDCANCEL ); return TRUE; } void Dialog::Create(){ - ASSERT_MESSAGE( m_window == 0, "dialog cannot be constructed" ); + ASSERT_MESSAGE( !m_window, "dialog cannot be constructed" ); m_window = BuildDialog(); - g_signal_connect( G_OBJECT( m_window ), "delete_event", G_CALLBACK( delete_event_callback ), this ); + m_window.connect( "delete_event", G_CALLBACK( delete_event_callback ), this ); } void Dialog::Destroy(){ - ASSERT_MESSAGE( m_window != 0, "dialog cannot be destroyed" ); + ASSERT_MESSAGE( m_window, "dialog cannot be destroyed" ); - gtk_widget_destroy( GTK_WIDGET( m_window ) ); - m_window = 0; + m_window.destroy(); + m_window = ui::Window{ui::null}; } @@ -451,12 +440,12 @@ EMessageBoxReturn Dialog::DoModal(){ PreModal(); EMessageBoxReturn ret = modal_dialog_show( m_window, m_modal ); - ASSERT_NOTNULL( m_window ); + ASSERT_TRUE( (bool) m_window ); if ( ret == eIDOK ) { exportData(); } - gtk_widget_hide( GTK_WIDGET( m_window ) ); + m_window.hide(); PostModal( m_modal.ret ); @@ -464,120 +453,120 @@ EMessageBoxReturn Dialog::DoModal(){ } -GtkWidget* Dialog::addCheckBox( GtkWidget* vbox, const char* name, const char* flag, const BoolImportCallback& importViewer, const BoolExportCallback& exportViewer ){ - GtkWidget* check = gtk_check_button_new_with_label( flag ); - gtk_widget_show( check ); +ui::CheckButton Dialog::addCheckBox( ui::Widget vbox, const char* name, const char* flag, const BoolImportCallback& importViewer, const BoolExportCallback& exportViewer ){ + auto check = ui::CheckButton( flag ); + check.show(); AddBoolToggleData( *GTK_TOGGLE_BUTTON( check ), importViewer, exportViewer ); - DialogVBox_packRow( GTK_VBOX( vbox ), GTK_WIDGET( DialogRow_new( name, check ) ) ); + DialogVBox_packRow( ui::VBox(GTK_VBOX( vbox )), ui::Widget(GTK_WIDGET( DialogRow_new( name, check ) ) )); return check; } -GtkWidget* Dialog::addCheckBox( GtkWidget* vbox, const char* name, const char* flag, bool& data ){ +ui::CheckButton Dialog::addCheckBox( ui::Widget vbox, const char* name, const char* flag, bool& data ){ return addCheckBox( vbox, name, flag, BoolImportCaller( data ), BoolExportCaller( data ) ); } -void Dialog::addCombo( GtkWidget* vbox, const char* name, StringArrayRange values, const IntImportCallback& importViewer, const IntExportCallback& exportViewer ){ - GtkWidget* alignment = gtk_alignment_new( 0.0, 0.5, 0.0, 0.0 ); - gtk_widget_show( alignment ); +void Dialog::addCombo( ui::Widget vbox, const char* name, StringArrayRange values, const IntImportCallback& importViewer, const IntExportCallback& exportViewer ){ + auto alignment = ui::Alignment( 0.0, 0.5, 0.0, 0.0 ); + alignment.show(); { - GtkWidget* combo = gtk_combo_box_new_text(); + auto combo = ui::ComboBoxText(ui::New); for ( StringArrayRange::Iterator i = values.first; i != values.last; ++i ) { - gtk_combo_box_append_text( GTK_COMBO_BOX( combo ), *i ); + gtk_combo_box_text_append_text( GTK_COMBO_BOX_TEXT( combo ), *i ); } AddIntComboData( *GTK_COMBO_BOX( combo ), importViewer, exportViewer ); - gtk_widget_show( combo ); - gtk_container_add( GTK_CONTAINER( alignment ), combo ); + combo.show(); + alignment.add(combo); } - GtkTable* row = DialogRow_new( name, alignment ); - DialogVBox_packRow( GTK_VBOX( vbox ), GTK_WIDGET( row ) ); + auto row = DialogRow_new( name, alignment ); + DialogVBox_packRow( ui::VBox(GTK_VBOX(vbox)), row ); } -void Dialog::addCombo( GtkWidget* vbox, const char* name, int& data, StringArrayRange values ){ +void Dialog::addCombo( ui::Widget vbox, const char* name, int& data, StringArrayRange values ){ addCombo( vbox, name, values, IntImportCaller( data ), IntExportCaller( data ) ); } -void Dialog::addSlider( GtkWidget* vbox, const char* name, int& data, gboolean draw_value, const char* low, const char* high, double value, double lower, double upper, double step_increment, double page_increment ){ +void Dialog::addSlider( ui::Widget vbox, const char* name, int& data, gboolean draw_value, const char* low, const char* high, double value, double lower, double upper, double step_increment, double page_increment ){ #if 0 if ( draw_value == FALSE ) { - GtkWidget* hbox2 = gtk_hbox_new( FALSE, 0 ); - gtk_widget_show( hbox2 ); - gtk_box_pack_start( GTK_BOX( vbox ), GTK_WIDGET( hbox2 ), FALSE, FALSE, 0 ); + auto hbox2 = ui::HBox( FALSE, 0 ); + hbox2.show(); + vbox.pack_start( GTK_WIDGET( hbox2 ), FALSE, FALSE, 0 ); { - GtkWidget* label = gtk_label_new( low ); - gtk_widget_show( label ); - gtk_box_pack_start( GTK_BOX( hbox2 ), label, FALSE, FALSE, 0 ); + ui::Widget label = ui::Label( low ); + label.show(); + hbox2.pack_start( label, FALSE, FALSE, 0 ); } { - GtkWidget* label = gtk_label_new( high ); - gtk_widget_show( label ); - gtk_box_pack_end( GTK_BOX( hbox2 ), label, FALSE, FALSE, 0 ); + ui::Widget label = ui::Label( high ); + label.show(); + hbox2.pack_end(label, FALSE, FALSE, 0); } } #endif // adjustment - GtkObject* adj = gtk_adjustment_new( value, lower, upper, step_increment, page_increment, 0 ); - AddIntAdjustmentData( *GTK_ADJUSTMENT( adj ), IntImportCaller( data ), IntExportCaller( data ) ); + auto adj = ui::Adjustment( value, lower, upper, step_increment, page_increment, 0 ); + AddIntAdjustmentData( *GTK_ADJUSTMENT(adj), IntImportCaller( data ), IntExportCaller( data ) ); // scale - GtkWidget* alignment = gtk_alignment_new( 0.0, 0.5, 1.0, 0.0 ); - gtk_widget_show( alignment ); + auto alignment = ui::Alignment( 0.0, 0.5, 1.0, 0.0 ); + alignment.show(); - GtkWidget* scale = gtk_hscale_new( GTK_ADJUSTMENT( adj ) ); + ui::Widget scale = ui::HScale( adj ); gtk_scale_set_value_pos( GTK_SCALE( scale ), GTK_POS_LEFT ); - gtk_widget_show( scale ); - gtk_container_add( GTK_CONTAINER( alignment ), scale ); + scale.show(); + alignment.add(scale); gtk_scale_set_draw_value( GTK_SCALE( scale ), draw_value ); gtk_scale_set_digits( GTK_SCALE( scale ), 0 ); - GtkTable* row = DialogRow_new( name, alignment ); - DialogVBox_packRow( GTK_VBOX( vbox ), GTK_WIDGET( row ) ); + auto row = DialogRow_new( name, alignment ); + DialogVBox_packRow( ui::VBox(GTK_VBOX( vbox )), row ); } -void Dialog::addRadio( GtkWidget* vbox, const char* name, StringArrayRange names, const IntImportCallback& importViewer, const IntExportCallback& exportViewer ){ - GtkWidget* alignment = gtk_alignment_new( 0.0, 0.5, 0.0, 0.0 ); - gtk_widget_show( alignment ); +void Dialog::addRadio( ui::Widget vbox, const char* name, StringArrayRange names, const IntImportCallback& importViewer, const IntExportCallback& exportViewer ){ + auto alignment = ui::Alignment( 0.0, 0.5, 0.0, 0.0 ); + alignment.show();; { RadioHBox radioBox = RadioHBox_new( names ); - gtk_container_add( GTK_CONTAINER( alignment ), GTK_WIDGET( radioBox.m_hbox ) ); + alignment.add(radioBox.m_hbox); AddIntRadioData( *GTK_RADIO_BUTTON( radioBox.m_radio ), importViewer, exportViewer ); } - GtkTable* row = DialogRow_new( name, alignment ); - DialogVBox_packRow( GTK_VBOX( vbox ), GTK_WIDGET( row ) ); + auto row = DialogRow_new( name, alignment ); + DialogVBox_packRow( ui::VBox(GTK_VBOX( vbox )), row ); } -void Dialog::addRadio( GtkWidget* vbox, const char* name, int& data, StringArrayRange names ){ +void Dialog::addRadio( ui::Widget vbox, const char* name, int& data, StringArrayRange names ){ addRadio( vbox, name, names, IntImportCaller( data ), IntExportCaller( data ) ); } -void Dialog::addRadioIcons( GtkWidget* vbox, const char* name, StringArrayRange icons, const IntImportCallback& importViewer, const IntExportCallback& exportViewer ){ - GtkWidget* table = gtk_table_new( 2, static_cast( icons.last - icons.first ), FALSE ); - gtk_widget_show( table ); +void Dialog::addRadioIcons( ui::Widget vbox, const char* name, StringArrayRange icons, const IntImportCallback& importViewer, const IntExportCallback& exportViewer ){ + ui::Widget table = ui::Table( 2, icons.last - icons.first, FALSE ); + table.show();; gtk_table_set_row_spacings( GTK_TABLE( table ), 5 ); gtk_table_set_col_spacings( GTK_TABLE( table ), 5 ); GSList* group = 0; - GtkWidget* radio = 0; + ui::RadioButton radio{ui::null}; for ( StringArrayRange::Iterator icon = icons.first; icon != icons.last; ++icon ) { guint pos = static_cast( icon - icons.first ); - GtkImage* image = new_local_image( *icon ); - gtk_widget_show( GTK_WIDGET( image ) ); + auto image = new_local_image( *icon ); + image.show(); gtk_table_attach( GTK_TABLE( table ), GTK_WIDGET( image ), pos, pos + 1, 0, 1, (GtkAttachOptions) ( 0 ), (GtkAttachOptions) ( 0 ), 0, 0 ); - radio = gtk_radio_button_new( group ); - gtk_widget_show( radio ); + radio = ui::RadioButton(GTK_RADIO_BUTTON(gtk_radio_button_new( group ))); + radio.show(); gtk_table_attach( GTK_TABLE( table ), radio, pos, pos + 1, 1, 2, (GtkAttachOptions) ( 0 ), (GtkAttachOptions) ( 0 ), 0, 0 ); @@ -587,64 +576,64 @@ void Dialog::addRadioIcons( GtkWidget* vbox, const char* name, StringArrayRange AddIntRadioData( *GTK_RADIO_BUTTON( radio ), importViewer, exportViewer ); - DialogVBox_packRow( GTK_VBOX( vbox ), GTK_WIDGET( DialogRow_new( name, table ) ) ); + DialogVBox_packRow( ui::VBox(GTK_VBOX( vbox )), DialogRow_new( name, table ) ); } -void Dialog::addRadioIcons( GtkWidget* vbox, const char* name, int& data, StringArrayRange icons ){ +void Dialog::addRadioIcons( ui::Widget vbox, const char* name, int& data, StringArrayRange icons ){ addRadioIcons( vbox, name, icons, IntImportCaller( data ), IntExportCaller( data ) ); } -GtkWidget* Dialog::addIntEntry( GtkWidget* vbox, const char* name, const IntImportCallback& importViewer, const IntExportCallback& exportViewer ){ +ui::Widget Dialog::addIntEntry( ui::Widget vbox, const char* name, const IntImportCallback& importViewer, const IntExportCallback& exportViewer ){ DialogEntryRow row( DialogEntryRow_new( name ) ); - AddIntEntryData( *row.m_entry, importViewer, exportViewer ); - DialogVBox_packRow( GTK_VBOX( vbox ), row.m_row ); + AddIntEntryData( *GTK_ENTRY(row.m_entry), importViewer, exportViewer ); + DialogVBox_packRow( ui::VBox(GTK_VBOX( vbox )), row.m_row ); return row.m_row; } -GtkWidget* Dialog::addSizeEntry( GtkWidget* vbox, const char* name, const SizeImportCallback& importViewer, const SizeExportCallback& exportViewer ){ +ui::Widget Dialog::addSizeEntry( ui::Widget vbox, const char* name, const SizeImportCallback& importViewer, const SizeExportCallback& exportViewer ){ DialogEntryRow row( DialogEntryRow_new( name ) ); - AddSizeEntryData( *row.m_entry, importViewer, exportViewer ); - DialogVBox_packRow( GTK_VBOX( vbox ), row.m_row ); + AddSizeEntryData( *GTK_ENTRY(row.m_entry), importViewer, exportViewer ); + DialogVBox_packRow( ui::VBox(GTK_VBOX( vbox )), row.m_row ); return row.m_row; } -GtkWidget* Dialog::addFloatEntry( GtkWidget* vbox, const char* name, const FloatImportCallback& importViewer, const FloatExportCallback& exportViewer ){ +ui::Widget Dialog::addFloatEntry( ui::Widget vbox, const char* name, const FloatImportCallback& importViewer, const FloatExportCallback& exportViewer ){ DialogEntryRow row( DialogEntryRow_new( name ) ); - AddFloatEntryData( *row.m_entry, importViewer, exportViewer ); - DialogVBox_packRow( GTK_VBOX( vbox ), row.m_row ); + AddFloatEntryData( *GTK_ENTRY(row.m_entry), importViewer, exportViewer ); + DialogVBox_packRow( ui::VBox(GTK_VBOX( vbox )), row.m_row ); return row.m_row; } -GtkWidget* Dialog::addPathEntry( GtkWidget* vbox, const char* name, bool browse_directory, const StringImportCallback& importViewer, const StringExportCallback& exportViewer ){ +ui::Widget Dialog::addPathEntry( ui::Widget vbox, const char* name, bool browse_directory, const StringImportCallback& importViewer, const StringExportCallback& exportViewer ){ PathEntry pathEntry = PathEntry_new(); - g_signal_connect( G_OBJECT( pathEntry.m_button ), "clicked", G_CALLBACK( browse_directory ? button_clicked_entry_browse_directory : button_clicked_entry_browse_file ), pathEntry.m_entry ); + pathEntry.m_button.connect( "clicked", G_CALLBACK( browse_directory ? button_clicked_entry_browse_directory : button_clicked_entry_browse_file ), pathEntry.m_entry ); - AddTextEntryData( *GTK_ENTRY( pathEntry.m_entry ), importViewer, exportViewer ); + AddTextEntryData( *GTK_ENTRY(pathEntry.m_entry), importViewer, exportViewer ); - GtkTable* row = DialogRow_new( name, GTK_WIDGET( pathEntry.m_frame ) ); - DialogVBox_packRow( GTK_VBOX( vbox ), GTK_WIDGET( row ) ); + auto row = DialogRow_new( name, ui::Widget(GTK_WIDGET( pathEntry.m_frame )) ); + DialogVBox_packRow( ui::VBox(GTK_VBOX( vbox )), row ); - return GTK_WIDGET( row ); + return ui::Widget(GTK_WIDGET( row )); } -GtkWidget* Dialog::addPathEntry( GtkWidget* vbox, const char* name, CopiedString& data, bool browse_directory ){ +ui::Widget Dialog::addPathEntry( ui::Widget vbox, const char* name, CopiedString& data, bool browse_directory ){ return addPathEntry( vbox, name, browse_directory, StringImportCallback( StringImportCaller( data ) ), StringExportCallback( StringExportCaller( data ) ) ); } -GtkWidget* Dialog::addSpinner( GtkWidget* vbox, const char* name, double value, double lower, double upper, const IntImportCallback& importViewer, const IntExportCallback& exportViewer ){ +ui::SpinButton Dialog::addSpinner( ui::Widget vbox, const char* name, double value, double lower, double upper, const IntImportCallback& importViewer, const IntExportCallback& exportViewer ){ DialogSpinnerRow row( DialogSpinnerRow_new( name, value, lower, upper, 1 ) ); - AddIntSpinnerData( *row.m_spin, importViewer, exportViewer ); - DialogVBox_packRow( GTK_VBOX( vbox ), row.m_row ); - return row.m_row; + AddIntSpinnerData( *GTK_SPIN_BUTTON(row.m_spin), importViewer, exportViewer ); + DialogVBox_packRow( ui::VBox(GTK_VBOX( vbox )), row.m_row ); + return ui::SpinButton(row.m_spin); } -GtkWidget* Dialog::addSpinner( GtkWidget* vbox, const char* name, int& data, double value, double lower, double upper ){ +ui::SpinButton Dialog::addSpinner( ui::Widget vbox, const char* name, int& data, double value, double lower, double upper ){ return addSpinner( vbox, name, value, lower, upper, IntImportCallback( IntImportCaller( data ) ), IntExportCallback( IntExportCaller( data ) ) ); } -GtkWidget* Dialog::addSpinner( GtkWidget* vbox, const char* name, double value, double lower, double upper, const FloatImportCallback& importViewer, const FloatExportCallback& exportViewer ){ +ui::SpinButton Dialog::addSpinner( ui::Widget vbox, const char* name, double value, double lower, double upper, const FloatImportCallback& importViewer, const FloatExportCallback& exportViewer ){ DialogSpinnerRow row( DialogSpinnerRow_new( name, value, lower, upper, 10 ) ); - AddFloatSpinnerData( *row.m_spin, importViewer, exportViewer ); - DialogVBox_packRow( GTK_VBOX( vbox ), row.m_row ); - return row.m_row; + AddFloatSpinnerData( *GTK_SPIN_BUTTON(row.m_spin), importViewer, exportViewer ); + DialogVBox_packRow( ui::VBox(GTK_VBOX( vbox )), row.m_row ); + return ui::SpinButton(row.m_spin); }