Revert partially (auto) "reformat code! now the code is only ugly on the *inside*"

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

diff --git a/radiant/findtexturedialog.cpp b/radiant/findtexturedialog.cpp
index 14dc5406a5c4ef5aaadf8086081a88b43409f98c..d74fc6578ac7dcabc442a1ee328a58019e839659 100644 (file)
--- a/radiant/findtexturedialog.cpp
+++ b/radiant/findtexturedialog.cpp
@@ -50,7 +50,7 @@ static void setReplaceStr( const char* name );
 static void setFindStr( const char* name );
 static bool isOpen();
 static void show();
-typedef FreeCaller<&FindTextureDialog::show> ShowCaller;
+typedef FreeCaller<void(), &FindTextureDialog::show> ShowCaller;
 static void updateTextures( const char* name );
 
 FindTextureDialog();
@@ -90,12 +90,12 @@ static void OnApply( ui::Widget widget, gpointer data ){
        FindTextureDialog_apply();
 }
 
-static void OnFind( GtkWidget* widget, gpointer data ){
+static void OnFind( ui::Widget widget, gpointer data ){
        g_FindTextureDialog.exportData();
        FindTextureDialog_apply();
 }
 
-static void OnOK( GtkWidget* widget, gpointer data ){
+static void OnOK( ui::Widget widget, gpointer data ){
        g_FindTextureDialog.exportData();
        FindTextureDialog_apply();
        g_FindTextureDialog.HideDlg();
@@ -164,7 +164,7 @@ ui::Window FindTextureDialog::BuildDialog(){
     table.attach(entry, {1, 2, 0, 1}, {GTK_EXPAND | GTK_FILL, 0});
        entry.connect( "focus_in_event",
                                          G_CALLBACK( find_focus_in ), 0 );
-       AddDialogData( *GTK_ENTRY(entry), m_strFind );
+       AddDialogData( entry, m_strFind );
        GlobalTextureEntryCompletion::instance().connect( entry );
 
        entry = ui::Entry(ui::New);
@@ -172,13 +172,13 @@ ui::Window FindTextureDialog::BuildDialog(){
     table.attach(entry, {1, 2, 1, 2}, {GTK_EXPAND | GTK_FILL, 0});
        entry.connect( "focus_in_event",
                                          G_CALLBACK( replace_focus_in ), 0 );
-       AddDialogData( *GTK_ENTRY(entry), m_strReplace );
+       AddDialogData( entry, m_strReplace );
        GlobalTextureEntryCompletion::instance().connect( entry );
 
        auto check = ui::CheckButton( "Within selected brushes only" );
        check.show();
        vbox.pack_start( check, TRUE, TRUE, 0 );
-       AddDialogData( *GTK_TOGGLE_BUTTON(check), m_bSelectedOnly );
+       AddDialogData( check, m_bSelectedOnly );
 
        vbox = ui::VBox( FALSE, 5 );
        vbox.show();
@@ -189,14 +189,14 @@ ui::Window FindTextureDialog::BuildDialog(){
        vbox.pack_start( button, FALSE, FALSE, 0 );
        button.connect( "clicked",
                                          G_CALLBACK( OnApply ), 0 );
-       gtk_widget_set_size_request( button, 60, -1 );
+       button.dimensions(60, -1);
 
        button = ui::Button( "Close" );
        button.show();
        vbox.pack_start( button, FALSE, FALSE, 0 );
        button.connect( "clicked",
                                          G_CALLBACK( OnClose ), 0 );
-       gtk_widget_set_size_request( button, 60, -1 );
+       button.dimensions(60, -1);
 
        return dlg;
 }