Corrected patch.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30862 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -513,7 +513,6 @@ int wxChoice::GtkAddHelper(GtkWidget *menu, int pos, const wxString& item)
|
|||||||
|
|
||||||
ApplyWidgetStyle();
|
ApplyWidgetStyle();
|
||||||
}
|
}
|
||||||
else
|
|
||||||
|
|
||||||
// The best size of a wxChoice should probably
|
// The best size of a wxChoice should probably
|
||||||
// be changed everytime the control has been
|
// 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.
|
// it has to change. Adapted from Matt Ownby.
|
||||||
InvalidateBestSize();
|
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_connect( GTK_OBJECT( menu_item ), "activate",
|
||||||
GTK_SIGNAL_FUNC(gtk_choice_clicked_callback), (gpointer*)this );
|
GTK_SIGNAL_FUNC(gtk_choice_clicked_callback), (gpointer*)this );
|
||||||
|
|
||||||
|
|||||||
@@ -513,7 +513,6 @@ int wxChoice::GtkAddHelper(GtkWidget *menu, int pos, const wxString& item)
|
|||||||
|
|
||||||
ApplyWidgetStyle();
|
ApplyWidgetStyle();
|
||||||
}
|
}
|
||||||
else
|
|
||||||
|
|
||||||
// The best size of a wxChoice should probably
|
// The best size of a wxChoice should probably
|
||||||
// be changed everytime the control has been
|
// 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.
|
// it has to change. Adapted from Matt Ownby.
|
||||||
InvalidateBestSize();
|
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_connect( GTK_OBJECT( menu_item ), "activate",
|
||||||
GTK_SIGNAL_FUNC(gtk_choice_clicked_callback), (gpointer*)this );
|
GTK_SIGNAL_FUNC(gtk_choice_clicked_callback), (gpointer*)this );
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user