X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5f3565a2fb3d678b03cf8547f37e56b1efe786f5..2aa24b607061a398d0876b87e695f4f9dc531cb2:/src/gtk/choice.cpp diff --git a/src/gtk/choice.cpp b/src/gtk/choice.cpp index 58aff17892..7b8633ef1b 100644 --- a/src/gtk/choice.cpp +++ b/src/gtk/choice.cpp @@ -38,6 +38,7 @@ extern bool g_blockEventsOnDrag; // "activate" //----------------------------------------------------------------------------- +extern "C" { static void gtk_choice_clicked_callback( GtkWidget *WXUNUSED(widget), wxChoice *choice ) { if (g_isIdle) @@ -61,7 +62,7 @@ static void gtk_choice_clicked_callback( GtkWidget *WXUNUSED(widget), wxChoice * GtkBin *bin = GTK_BIN( child->data ); if (!bin->child) { - selection = count: + selection = count; break; } child = child->next; @@ -84,6 +85,7 @@ static void gtk_choice_clicked_callback( GtkWidget *WXUNUSED(widget), wxChoice * choice->GetEventHandler()->ProcessEvent(event); } +} //----------------------------------------------------------------------------- // wxChoice @@ -569,7 +571,7 @@ int wxChoice::GtkAddHelper(GtkWidget *menu, int pos, const wxString& item) // it has to change. Adapted from Matt Ownby. InvalidateBestSize(); - gtk_signal_connect( GTK_OBJECT( menu_item ), "activate", + gtk_signal_connect_after( GTK_OBJECT( menu_item ), "activate", GTK_SIGNAL_FUNC(gtk_choice_clicked_callback), (gpointer*)this ); gtk_widget_show( menu_item );