X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d27d59fb91131222207a535b43ef67babfd03ee9..fb8d7eb7a880f1f2e32d8830f9c5e12b2536e05f:/src/univ/menu.cpp

diff --git a/src/univ/menu.cpp b/src/univ/menu.cpp
index 5bc9e4ae72..957fb39972 100644
--- a/src/univ/menu.cpp
+++ b/src/univ/menu.cpp
@@ -602,7 +602,7 @@ void wxPopupMenuWindow::DoDraw(wxControlRenderer *renderer)
                 bmp = item->GetDisabledBitmap();
             }
 
-            if ( !bmp.Ok() )
+            if ( !bmp.IsOk() )
             {
                 // strangely enough, for unchecked item we use the
                 // "checked" bitmap because this is the default one - this
@@ -1207,6 +1207,10 @@ void wxMenu::Attach(wxMenuBarBase *menubar)
 
 void wxMenu::Detach()
 {
+    // After the menu is detached from the menu bar, it shouldn't send its
+    // events to it.
+    SetNextHandler(NULL);
+
     wxMenuBase::Detach();
 }