From 2695ce5a8736c2985c25dae5ed45032701ba48a2 Mon Sep 17 00:00:00 2001 From: Robin Dunn Date: Wed, 23 Apr 2003 21:08:42 +0000 Subject: [PATCH] Prevent a Gtk-CRITICAL message when Remove()ing a menu from a menubar that has submenus. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@20319 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/gtk/menu.cpp | 3 ++- src/gtk1/menu.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp index bda7fb461b..c6d6a77b7f 100644 --- a/src/gtk/menu.cpp +++ b/src/gtk/menu.cpp @@ -1118,7 +1118,8 @@ wxMenu::~wxMenu() { m_items.Clear(); - gtk_widget_destroy( m_menu ); + if ( GTK_IS_WIDGET( m_menu )) + gtk_widget_destroy( m_menu ); gtk_object_unref( GTK_OBJECT(m_factory) ); } diff --git a/src/gtk1/menu.cpp b/src/gtk1/menu.cpp index bda7fb461b..c6d6a77b7f 100644 --- a/src/gtk1/menu.cpp +++ b/src/gtk1/menu.cpp @@ -1118,7 +1118,8 @@ wxMenu::~wxMenu() { m_items.Clear(); - gtk_widget_destroy( m_menu ); + if ( GTK_IS_WIDGET( m_menu )) + gtk_widget_destroy( m_menu ); gtk_object_unref( GTK_OBJECT(m_factory) ); }