X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=radiant%2Fdialog.cpp;h=8133cdb0cb07494f1bd4779ff30fa57c29288450;hb=77c80c7378e97bc70be38283b438e3ec460a0429;hp=b5d7052cbf8b580e7b2e95fff6d38f1c20be185f;hpb=8505e24b7f9831e0c01860ed50b835aae4e856a2;p=xonotic%2Fnetradiant.git

diff --git a/radiant/dialog.cpp b/radiant/dialog.cpp
index b5d7052c..8133cdb0 100644
--- a/radiant/dialog.cpp
+++ b/radiant/dialog.cpp
@@ -28,6 +28,8 @@
 
 #include "dialog.h"
 
+#include <gtk/gtk.h>
+
 #include "debugging/debugging.h"
 
 
@@ -46,7 +48,7 @@
 
 
 ui::Entry DialogEntry_new(){
-	auto entry = ui::Entry();
+	auto entry = ui::Entry(ui::New);
 	entry.show();
 	gtk_widget_set_size_request( GTK_WIDGET( entry ), 64, -1 );
 	return entry;
@@ -55,10 +57,10 @@ ui::Entry DialogEntry_new(){
 class DialogEntryRow
 {
 public:
-DialogEntryRow( ui::Widget row, GtkEntry* entry ) : m_row( row ), m_entry( entry ){
+DialogEntryRow( ui::Widget row, ui::Entry entry ) : m_row( row ), m_entry( entry ){
 }
 ui::Widget m_row;
-GtkEntry* m_entry;
+ui::Entry m_entry;
 };
 
 DialogEntryRow DialogEntryRow_new( const char* name ){
@@ -91,7 +93,7 @@ public:
 DialogSpinnerRow( ui::Widget row, GtkSpinButton* spin ) : m_row( row ), m_spin( spin ){
 }
 ui::Widget m_row;
-GtkSpinButton* m_spin;
+ui::SpinButton m_spin;
 };
 
 DialogSpinnerRow DialogSpinnerRow_new( const char* name, double value, double lower, double upper, int fraction ){
@@ -148,7 +150,7 @@ void IntRadioExport( GtkRadioButton& widget, const IntImportCallback& importCall
 typedef ImportExport<GtkRadioButton, int, IntRadioImport, IntRadioExport> 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 ) );
@@ -330,7 +332,7 @@ void Dialog::Create(){
 	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(){
@@ -468,7 +470,7 @@ void Dialog::addCombo( ui::Widget vbox, const char* name, StringArrayRange value
 	auto alignment = ui::Alignment( 0.0, 0.5, 0.0, 0.0 );
 	alignment.show();
 	{
-		ui::Widget combo = ui::ComboBoxText();
+		auto combo = ui::ComboBoxText(ui::New);
 
 		for ( StringArrayRange::Iterator i = values.first; i != values.last; ++i )
 		{
@@ -553,7 +555,7 @@ void Dialog::addRadioIcons( ui::Widget vbox, const char* name, StringArrayRange
 	gtk_table_set_col_spacings( GTK_TABLE( table ), 5 );
 
 	GSList* group = 0;
-	ui::Widget radio;
+	ui::RadioButton radio{ui::null};
 	for ( StringArrayRange::Iterator icon = icons.first; icon != icons.last; ++icon )
 	{
 		guint pos = static_cast<guint>( icon - icons.first );
@@ -563,7 +565,7 @@ void Dialog::addRadioIcons( ui::Widget vbox, const char* name, StringArrayRange
 						  (GtkAttachOptions) ( 0 ),
 						  (GtkAttachOptions) ( 0 ), 0, 0 );
 
-		radio = ui::Widget(gtk_radio_button_new( group ));
+		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 ),
@@ -583,30 +585,30 @@ void Dialog::addRadioIcons( ui::Widget vbox, const char* name, int& data, String
 
 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 );
+	AddIntEntryData( *GTK_ENTRY(row.m_entry), importViewer, exportViewer );
 	DialogVBox_packRow( ui::VBox(GTK_VBOX( vbox )), row.m_row );
 	return row.m_row;
 }
 
 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 );
+	AddSizeEntryData( *GTK_ENTRY(row.m_entry), importViewer, exportViewer );
 	DialogVBox_packRow( ui::VBox(GTK_VBOX( vbox )), row.m_row );
 	return row.m_row;
 }
 
 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 );
+	AddFloatEntryData( *GTK_ENTRY(row.m_entry), importViewer, exportViewer );
 	DialogVBox_packRow( ui::VBox(GTK_VBOX( vbox )), row.m_row );
 	return row.m_row;
 }
 
 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 );
 
 	auto row = DialogRow_new( name, ui::Widget(GTK_WIDGET( pathEntry.m_frame )) );
 	DialogVBox_packRow( ui::VBox(GTK_VBOX( vbox )), row );
@@ -620,7 +622,7 @@ ui::Widget Dialog::addPathEntry( ui::Widget vbox, const char* name, CopiedString
 
 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 );
+	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);
 }
@@ -631,7 +633,7 @@ ui::SpinButton Dialog::addSpinner( ui::Widget vbox, const char* name, int& data,
 
 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 );
+	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);
 }