Corrected patch.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30862 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/gtk/choice.cpp b/src/gtk/choice.cpp
index c0b20e406beba2e11c6fb445495b88e100d98b8d..08a2f642b3ddb95de83a1579128ccde27454c33e 100644 (file)
--- a/src/gtk/choice.cpp
+++ b/src/gtk/choice.cpp
@@ -513,7 +513,6 @@ int wxChoice::GtkAddHelper(GtkWidget *menu, int pos, const wxString& item)
 
         ApplyWidgetStyle();
     }
-    else
 
     // The best size of a wxChoice should probably
     // be changed everytime the control has been
@@ -521,8 +520,6 @@ 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_FUNC(gtk_choice_clicked_callback), (gpointer*)this );
     gtk_signal_connect( GTK_OBJECT( menu_item ), "activate",
       GTK_SIGNAL_FUNC(gtk_choice_clicked_callback), (gpointer*)this );
 

diff --git a/src/gtk1/choice.cpp b/src/gtk1/choice.cpp
index c0b20e406beba2e11c6fb445495b88e100d98b8d..08a2f642b3ddb95de83a1579128ccde27454c33e 100644 (file)
--- a/src/gtk1/choice.cpp
+++ b/src/gtk1/choice.cpp
@@ -513,7 +513,6 @@ int wxChoice::GtkAddHelper(GtkWidget *menu, int pos, const wxString& item)
 
         ApplyWidgetStyle();
     }
-    else
 
     // The best size of a wxChoice should probably
     // be changed everytime the control has been
@@ -521,8 +520,6 @@ 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_FUNC(gtk_choice_clicked_callback), (gpointer*)this );
     gtk_signal_connect( GTK_OBJECT( menu_item ), "activate",
       GTK_SIGNAL_FUNC(gtk_choice_clicked_callback), (gpointer*)this );