X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fnetradiant.git;a=blobdiff_plain;f=radiant%2Ffindtexturedialog.cpp;h=d74fc6578ac7dcabc442a1ee328a58019e839659;hp=48c564c4c40d18b80b5301ade53dd4a4ed3a9db7;hb=cd6613e5171544b68d4ae70546c90a15c99b22a5;hpb=51fa1a72ab2099fab13b429097300ed464c25a9d diff --git a/radiant/findtexturedialog.cpp b/radiant/findtexturedialog.cpp index 48c564c4..d74fc657 100644 --- 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 ShowCaller; static void updateTextures( const char* name ); FindTextureDialog(); @@ -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();