-DGTK_DISABLE_SINGLE_INCLUDES

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

diff --git a/radiant/dialog.cpp b/radiant/dialog.cpp
index 6fb5161eb95f3b5c7cb92fb7be9ac5f1c8e3c9a3..727ac358aa3d106d6fe12e59751a6ea7a6f902d2 100644 (file)
--- a/radiant/dialog.cpp
+++ b/radiant/dialog.cpp
@@ -35,18 +35,7 @@
 
 #include <cstdlib>
 
-#include <gtk/gtkmain.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtktogglebutton.h>
-#include <gtk/gtkspinbutton.h>
-#include <gtk/gtkradiobutton.h>
-#include <gtk/gtkentry.h>
-#include <gtk/gtkcombobox.h>
-#include <gtk/gtklabel.h>
-#include <gtk/gtktable.h>
-#include <gtk/gtkhscale.h>
-#include <gtk/gtkalignment.h>
+#include <gtk/gtk.h>
 
 #include "stream/stringstream.h"
 #include "convert.h"
@@ -92,7 +81,7 @@ GtkSpinButton* DialogSpinner_new( double value, double lower, double upper, int
        {
                ++digits;
        }
-       GtkSpinButton* spin = GTK_SPIN_BUTTON( gtk_spin_button_new( GTK_ADJUSTMENT( gtk_adjustment_new( value, lower, upper, step, 10, 0 ) ), step, digits ) );
+       GtkSpinButton* spin = ui::SpinButton( ui::Adjustment( value, lower, upper, step, 10, 0 ), step, digits );
        gtk_widget_show( GTK_WIDGET( spin ) );
        gtk_widget_set_size_request( GTK_WIDGET( spin ), 64, -1 );
        return spin;
@@ -350,7 +339,7 @@ void Dialog::Destroy(){
        ASSERT_MESSAGE( m_window, "dialog cannot be destroyed" );
 
        gtk_widget_destroy( GTK_WIDGET( m_window ) );
-       m_window = ui::Window(nullptr);
+       m_window = ui::Window();
 }
 
 
@@ -481,7 +470,7 @@ void Dialog::addCombo( ui::Widget vbox, const char* name, StringArrayRange value
        ui::Widget alignment = ui::Alignment( 0.0, 0.5, 0.0, 0.0 );
        gtk_widget_show( alignment );
        {
-               ui::Widget combo = ui::Widget(gtk_combo_box_new_text());
+               ui::Widget combo = ui::ComboBoxText();
 
                for ( StringArrayRange::Iterator i = values.first; i != values.last; ++i )
                {
@@ -522,14 +511,14 @@ void Dialog::addSlider( ui::Widget vbox, const char* name, int& data, gboolean d
 #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
        ui::Widget alignment = ui::Alignment( 0.0, 0.5, 1.0, 0.0 );
        gtk_widget_show( alignment );
 
-       ui::Widget scale = ui::Widget(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 );
@@ -559,7 +548,7 @@ void Dialog::addRadio( ui::Widget vbox, const char* name, int& data, StringArray
 }
 
 void Dialog::addRadioIcons( ui::Widget vbox, const char* name, StringArrayRange icons, const IntImportCallback& importViewer, const IntExportCallback& exportViewer ){
-       ui::Widget table = ui::Widget(gtk_table_new( 2, static_cast<guint>( icons.last - icons.first ), FALSE ));
+       ui::Widget table = ui::Table( 2, icons.last - icons.first, FALSE );
        gtk_widget_show( table );
 
        gtk_table_set_row_spacings( GTK_TABLE( table ), 5 );
@@ -635,7 +624,7 @@ ui::SpinButton Dialog::addSpinner( ui::Widget vbox, const char* name, double val
        DialogSpinnerRow row( DialogSpinnerRow_new( name, value, lower, upper, 1 ) );
        AddIntSpinnerData( *row.m_spin, importViewer, exportViewer );
        DialogVBox_packRow( GTK_VBOX( vbox ), row.m_row );
-       return ui::SpinButton(row.m_row);
+       return ui::SpinButton(row.m_spin);
 }
 
 ui::SpinButton Dialog::addSpinner( ui::Widget vbox, const char* name, int& data, double value, double lower, double upper ){
@@ -646,5 +635,5 @@ ui::SpinButton Dialog::addSpinner( ui::Widget vbox, const char* name, double val
        DialogSpinnerRow row( DialogSpinnerRow_new( name, value, lower, upper, 10 ) );
        AddFloatSpinnerData( *row.m_spin, importViewer, exportViewer );
        DialogVBox_packRow( GTK_VBOX( vbox ), row.m_row );
-       return ui::SpinButton(row.m_row);
+       return ui::SpinButton(row.m_spin);
 }