Compile fix for GTK 1.2.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@20565 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1122,10 +1122,6 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem)
|
|||||||
{
|
{
|
||||||
GtkWidget *menuItem;
|
GtkWidget *menuItem;
|
||||||
|
|
||||||
#if defined(USE_MENU_BITMAPS) || !GTK_CHECK_VERSION(1, 2, 0)
|
|
||||||
bool appended = FALSE;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// does this item terminate the current radio group?
|
// does this item terminate the current radio group?
|
||||||
bool endOfRadioGroup = TRUE;
|
bool endOfRadioGroup = TRUE;
|
||||||
|
|
||||||
@@ -1213,8 +1209,6 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem)
|
|||||||
|
|
||||||
gtk_menu_append( GTK_MENU(m_menu), menuItem );
|
gtk_menu_append( GTK_MENU(m_menu), menuItem );
|
||||||
gtk_widget_show( menuItem );
|
gtk_widget_show( menuItem );
|
||||||
|
|
||||||
appended = TRUE; // We've done this, don't do it again
|
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
else // a normal item
|
else // a normal item
|
||||||
|
@@ -1122,10 +1122,6 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem)
|
|||||||
{
|
{
|
||||||
GtkWidget *menuItem;
|
GtkWidget *menuItem;
|
||||||
|
|
||||||
#if defined(USE_MENU_BITMAPS) || !GTK_CHECK_VERSION(1, 2, 0)
|
|
||||||
bool appended = FALSE;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// does this item terminate the current radio group?
|
// does this item terminate the current radio group?
|
||||||
bool endOfRadioGroup = TRUE;
|
bool endOfRadioGroup = TRUE;
|
||||||
|
|
||||||
@@ -1213,8 +1209,6 @@ bool wxMenu::GtkAppend(wxMenuItem *mitem)
|
|||||||
|
|
||||||
gtk_menu_append( GTK_MENU(m_menu), menuItem );
|
gtk_menu_append( GTK_MENU(m_menu), menuItem );
|
||||||
gtk_widget_show( menuItem );
|
gtk_widget_show( menuItem );
|
||||||
|
|
||||||
appended = TRUE; // We've done this, don't do it again
|
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
else // a normal item
|
else // a normal item
|
||||||
|
Reference in New Issue
Block a user