X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e0dd12db9955e1e173064bde29943f171c53698f..ad05b1880e5b7047b1de265f48fb104f73564119:/src/common/menucmn.cpp

diff --git a/src/common/menucmn.cpp b/src/common/menucmn.cpp
index 3b2c9d37aa..b272d1483d 100644
--- a/src/common/menucmn.cpp
+++ b/src/common/menucmn.cpp
@@ -98,6 +98,8 @@ static inline bool CompareAccelString(const wxString& str, const wxChar *accel)
 // specified
 wxAcceleratorEntry *wxGetAccelFromString(const wxString& label)
 {
+    // wxPrintf( wxT("label %s\n"), label.c_str() );
+
     // check for accelerators: they are given after '\t'
     int posTab = label.Find(wxT('\t'));
     if ( posTab != wxNOT_FOUND ) {
@@ -276,6 +278,8 @@ void wxMenuItemBase::SetAccel(wxAcceleratorEntry *accel)
 
 #endif // wxUSE_ACCEL
 
+bool wxMenuBase::ms_locked = true;
+
 // ----------------------------------------------------------------------------
 // wxMenu ctor and dtor
 // ----------------------------------------------------------------------------
@@ -306,11 +310,6 @@ void wxMenuBase::AddSubMenu(wxMenu *submenu)
 {
     wxCHECK_RET( submenu, _T("can't add a NULL submenu") );
 
-    if ( m_menuBar )
-    {
-        submenu->Attach(m_menuBar);
-    }
-
     submenu->SetParent((wxMenu *)this);
 }
 
@@ -537,6 +536,15 @@ wxMenuItem* wxMenuBase::FindItemByPosition(size_t position) const
 // window will be used.
 void wxMenuBase::UpdateUI(wxEvtHandler* source)
 {
+    if (GetInvokingWindow())
+    {
+        // Don't update menus if the parent
+        // frame is about to get deleted
+        wxWindow *tlw = wxGetTopLevelParent( GetInvokingWindow() );
+        if (tlw && wxPendingDelete.Member(tlw))
+            return;
+    }
+
     if ( !source && GetInvokingWindow() )
         source = GetInvokingWindow()->GetEventHandler();
     if ( !source )
@@ -616,6 +624,13 @@ bool wxMenuBase::SendEvent(int id, int checked)
 // wxMenu attaching/detaching to/from menu bar
 // ----------------------------------------------------------------------------
 
+wxMenuBar* wxMenuBase::GetMenuBar() const
+{
+    if(GetParent())
+        return GetParent()->GetMenuBar();
+    return m_menuBar;
+}
+
 void wxMenuBase::Attach(wxMenuBarBase *menubar)
 {
     // use Detach() instead!