Wean off #define

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

diff --git a/radiant/findtexturedialog.cpp b/radiant/findtexturedialog.cpp
index 04983314e13bd7824bc3dc5513d7ad27e595ea52..c7e2aca67b0614e6748fad98a80f4a95b20eae04 100644 (file)
--- a/radiant/findtexturedialog.cpp
+++ b/radiant/findtexturedialog.cpp
@@ -128,9 +128,9 @@ FindTextureDialog::~FindTextureDialog(){
 }
 
 ui::Window FindTextureDialog::BuildDialog(){
-       ui::Widget vbox, hbox, table, label;
-       ui::Widget button;
-       ui::Entry entry{nullptr};
+       ui::Widget vbox{ui::null}, hbox{ui::null}, table{ui::null}, label{ui::null};
+       ui::Widget button{ui::null};
+       ui::Entry entry{ui::null};
 
        auto dlg = ui::Window(create_floating_window( "Find / Replace Texture(s)", m_parent ));
 
@@ -163,22 +163,22 @@ ui::Window FindTextureDialog::BuildDialog(){
                                          (GtkAttachOptions) ( 0 ), 0, 0 );
        gtk_misc_set_alignment( GTK_MISC( label ), 0, 0.5 );
 
-       entry = ui::Entry();
+       entry = ui::Entry(ui::New);
        entry.show();
        gtk_table_attach( GTK_TABLE( table ), entry, 1, 2, 0, 1,
                                          (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
                                          (GtkAttachOptions) ( 0 ), 0, 0 );
-       g_signal_connect( G_OBJECT( entry ), "focus_in_event",
+       entry.connect( "focus_in_event",
                                          G_CALLBACK( find_focus_in ), 0 );
        AddDialogData( *GTK_ENTRY(entry), m_strFind );
        GlobalTextureEntryCompletion::instance().connect( entry );
 
-       entry = ui::Entry();
+       entry = ui::Entry(ui::New);
        entry.show();
        gtk_table_attach( GTK_TABLE( table ), entry, 1, 2, 1, 2,
                                          (GtkAttachOptions) ( GTK_EXPAND | GTK_FILL ),
                                          (GtkAttachOptions) ( 0 ), 0, 0 );
-       g_signal_connect( G_OBJECT( entry ), "focus_in_event",
+       entry.connect( "focus_in_event",
                                          G_CALLBACK( replace_focus_in ), 0 );
        AddDialogData( *GTK_ENTRY(entry), m_strReplace );
        GlobalTextureEntryCompletion::instance().connect( entry );
@@ -195,14 +195,14 @@ ui::Window FindTextureDialog::BuildDialog(){
        button = ui::Button( "Apply" );
        button.show();
        gtk_box_pack_start( GTK_BOX( vbox ), button, FALSE, FALSE, 0 );
-       g_signal_connect( G_OBJECT( button ), "clicked",
+       button.connect( "clicked",
                                          G_CALLBACK( OnApply ), 0 );
        gtk_widget_set_size_request( button, 60, -1 );
 
        button = ui::Button( "Close" );
        button.show();
        gtk_box_pack_start( GTK_BOX( vbox ), button, FALSE, FALSE, 0 );
-       g_signal_connect( G_OBJECT( button ), "clicked",
+       button.connect( "clicked",
                                          G_CALLBACK( OnClose ), 0 );
        gtk_widget_set_size_request( button, 60, -1 );
 
@@ -222,7 +222,7 @@ void FindTextureDialog::updateTextures( const char* name ){
 }
 
 bool FindTextureDialog::isOpen(){
-       return gtk_widget_get_visible( g_FindTextureDialog.GetWidget() ) == TRUE;
+       return g_FindTextureDialog.GetWidget().visible();
 }
 
 void FindTextureDialog::setFindStr( const char* name ){