From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Wed, 26 Sep 2012 22:30:00 +0000 (+0000)
Subject: Do not unref GtkWidget of unattached wxMenuBar.
X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/4fcad4fb6de3ff496673fd0fcc5411d8df1d0b3e

Do not unref GtkWidget of unattached wxMenuBar.

This results in the destruction of the widgets of all of its menu and when
wxMenu objects are themselves destroyed in the base class dtor, we try to
destroy their already destroyed widgets, resulting in critical GTK warnings.

Simply don't do anything in wxMenuBar dtor itself if the menu bar is not
attached to a frame as the workaround was only needed in case of destroying
attached menu bars.

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

diff --git a/src/gtk/menu.cpp b/src/gtk/menu.cpp
index fe49bc3fa1..b04089376b 100644
--- a/src/gtk/menu.cpp
+++ b/src/gtk/menu.cpp
@@ -63,7 +63,7 @@ static void DoCommonMenuCallbackCode(wxMenu *menu, wxMenuEvent& event)
 
 wxMenuBar::~wxMenuBar()
 {
-    if (m_widget)
+    if (m_widget && IsAttached())
     {
         // Work around a probable bug in Ubuntu 12.04 which causes a warning if
         // gtk_widget_destroy() is called on a wxMenuBar attached to a frame