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

diff --git a/src/univ/menu.cpp b/src/univ/menu.cpp
index 5bc9e4ae72..ed0c4a05a9 100644
--- a/src/univ/menu.cpp
+++ b/src/univ/menu.cpp
@@ -4,7 +4,6 @@
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     25.08.00
-// RCS-ID:      $Id$
 // Copyright:   (c) 2000 SciTech Software, Inc. (www.scitechsoft.com)
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
@@ -602,7 +601,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 +1206,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();
 }