X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1c193821a999730fbf6a9bea83763f37daae68f1..2334fef6eaf763bc0b9132a86cc57c395c85c557:/src/common/menucmn.cpp

diff --git a/src/common/menucmn.cpp b/src/common/menucmn.cpp
index 0a00187d3b..0f49207fd0 100644
--- a/src/common/menucmn.cpp
+++ b/src/common/menucmn.cpp
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     26.10.99
 // RCS-ID:      $Id$
-// Copyright:   (c) wxWindows team
+// Copyright:   (c) wxWidgets team
 // Licence:     wxWindows licence
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "menubase.h"
 #endif
 
@@ -68,10 +68,14 @@ wxMenuItemBase::wxMenuItemBase(wxMenu *parentMenu,
 
     m_parentMenu  = parentMenu;
     m_subMenu     = subMenu;
-    m_isEnabled   = TRUE;
-    m_isChecked   = FALSE;
+    m_isEnabled   = true;
+    m_isChecked   = false;
     m_id          = id;
     m_kind        = kind;
+    if (m_id == wxID_ANY)
+        m_id = wxNewId();
+    if (m_id == wxID_SEPARATOR)
+        m_kind = wxITEM_SEPARATOR;
 }
 
 wxMenuItemBase::~wxMenuItemBase()
@@ -94,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 ) {
@@ -131,7 +137,7 @@ wxAcceleratorEntry *wxGetAccelFromString(const wxString& label)
                 current.clear();
             }
             else {
-                current += wxTolower(label[n]);
+                current += (wxChar) wxTolower(label[n]);
             }
         }
 
@@ -166,6 +172,8 @@ wxAcceleratorEntry *wxGetAccelFromString(const wxString& label)
                         keyCode = WXK_DELETE;
                     else if ( current == wxT("DELETE") )
                         keyCode = WXK_DELETE;
+                    else if ( current == wxT("BACK") )
+                        keyCode = WXK_BACK;
                     else if ( current == wxT("INS") )
                         keyCode = WXK_INSERT;
                     else if ( current == wxT("INSERT") )
@@ -270,6 +278,8 @@ void wxMenuItemBase::SetAccel(wxAcceleratorEntry *accel)
 
 #endif // wxUSE_ACCEL
 
+bool wxMenuBase::ms_locked = true;
+
 // ----------------------------------------------------------------------------
 // wxMenu ctor and dtor
 // ----------------------------------------------------------------------------
@@ -288,7 +298,7 @@ void wxMenuBase::Init(long style)
 wxMenuBase::~wxMenuBase()
 {
     WX_CLEAR_LIST(wxMenuItemList, m_items);
-    
+
     // Actually, in GTK, the submenus have to get deleted first.
 }
 
@@ -300,17 +310,12 @@ 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);
 }
 
-bool wxMenuBase::DoAppend(wxMenuItem *item)
+wxMenuItem* wxMenuBase::DoAppend(wxMenuItem *item)
 {
-    wxCHECK_MSG( item, FALSE, wxT("invalid item in wxMenu::Append()") );
+    wxCHECK_MSG( item, NULL, wxT("invalid item in wxMenu::Append()") );
 
     m_items.Append(item);
     item->SetMenu((wxMenu*)this);
@@ -319,12 +324,12 @@ bool wxMenuBase::DoAppend(wxMenuItem *item)
         AddSubMenu(item->GetSubMenu());
     }
 
-    return TRUE;
+    return item;
 }
 
-bool wxMenuBase::Insert(size_t pos, wxMenuItem *item)
+wxMenuItem* wxMenuBase::Insert(size_t pos, wxMenuItem *item)
 {
-    wxCHECK_MSG( item, FALSE, wxT("invalid item in wxMenu::Insert") );
+    wxCHECK_MSG( item, NULL, wxT("invalid item in wxMenu::Insert") );
 
     if ( pos == GetMenuItemCount() )
     {
@@ -332,19 +337,19 @@ bool wxMenuBase::Insert(size_t pos, wxMenuItem *item)
     }
     else
     {
-        wxCHECK_MSG( pos < GetMenuItemCount(), FALSE,
+        wxCHECK_MSG( pos < GetMenuItemCount(), NULL,
                      wxT("invalid index in wxMenu::Insert") );
 
         return DoInsert(pos, item);
     }
 }
 
-bool wxMenuBase::DoInsert(size_t pos, wxMenuItem *item)
+wxMenuItem* wxMenuBase::DoInsert(size_t pos, wxMenuItem *item)
 {
-    wxCHECK_MSG( item, FALSE, wxT("invalid item in wxMenu::Insert()") );
+    wxCHECK_MSG( item, NULL, wxT("invalid item in wxMenu::Insert()") );
 
     wxMenuItemList::compatibility_iterator node = m_items.Item(pos);
-    wxCHECK_MSG( node, FALSE, wxT("invalid index in wxMenu::Insert()") );
+    wxCHECK_MSG( node, NULL, wxT("invalid index in wxMenu::Insert()") );
 
     m_items.Insert(node, item);
     item->SetMenu((wxMenu*)this);
@@ -353,7 +358,7 @@ bool wxMenuBase::DoInsert(size_t pos, wxMenuItem *item)
         AddSubMenu(item->GetSubMenu());
     }
 
-    return TRUE;
+    return item;
 }
 
 wxMenuItem *wxMenuBase::Remove(wxMenuItem *item)
@@ -380,6 +385,8 @@ wxMenuItem *wxMenuBase::DoRemove(wxMenuItem *item)
     if ( submenu )
     {
         submenu->SetParent((wxMenu *)NULL);
+        if ( submenu->IsAttached() )
+            submenu->Detach();
     }
 
     return item;
@@ -387,7 +394,7 @@ wxMenuItem *wxMenuBase::DoRemove(wxMenuItem *item)
 
 bool wxMenuBase::Delete(wxMenuItem *item)
 {
-    wxCHECK_MSG( item, FALSE, wxT("invalid item in wxMenu::Delete") );
+    wxCHECK_MSG( item, false, wxT("invalid item in wxMenu::Delete") );
 
     return DoDelete(item);
 }
@@ -395,19 +402,19 @@ bool wxMenuBase::Delete(wxMenuItem *item)
 bool wxMenuBase::DoDelete(wxMenuItem *item)
 {
     wxMenuItem *item2 = DoRemove(item);
-    wxCHECK_MSG( item2, FALSE, wxT("failed to delete menu item") );
+    wxCHECK_MSG( item2, false, wxT("failed to delete menu item") );
 
     // don't delete the submenu
     item2->SetSubMenu((wxMenu *)NULL);
 
     delete item2;
 
-    return TRUE;
+    return true;
 }
 
 bool wxMenuBase::Destroy(wxMenuItem *item)
 {
-    wxCHECK_MSG( item, FALSE, wxT("invalid item in wxMenu::Destroy") );
+    wxCHECK_MSG( item, false, wxT("invalid item in wxMenu::Destroy") );
 
     return DoDestroy(item);
 }
@@ -415,18 +422,18 @@ bool wxMenuBase::Destroy(wxMenuItem *item)
 bool wxMenuBase::DoDestroy(wxMenuItem *item)
 {
     wxMenuItem *item2 = DoRemove(item);
-    wxCHECK_MSG( item2, FALSE, wxT("failed to delete menu item") );
+    wxCHECK_MSG( item2, false, wxT("failed to delete menu item") );
 
     delete item2;
 
-    return TRUE;
+    return true;
 }
 
 // ----------------------------------------------------------------------------
 // wxMenu searching for items
 // ----------------------------------------------------------------------------
 
-// Finds the item id matching the given string, -1 if not found.
+// Finds the item id matching the given string, wxNOT_FOUND if not found.
 int wxMenuBase::FindItem(const wxString& text) const
 {
     wxString label = wxMenuItem::GetLabelFromText(text);
@@ -531,6 +538,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 )
@@ -575,7 +591,7 @@ bool wxMenuBase::SendEvent(int id, int checked)
     event.SetEventObject(this);
     event.SetInt(checked);
 
-    bool processed = FALSE;
+    bool processed = false;
 
     // Try the menu's event handler
     if ( !processed )
@@ -610,6 +626,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!
@@ -646,7 +669,7 @@ bool wxMenuBase::IsEnabled( int id ) const
 {
     wxMenuItem *item = FindItem(id);
 
-    wxCHECK_MSG( item, FALSE, wxT("wxMenu::IsEnabled: no such item") );
+    wxCHECK_MSG( item, false, wxT("wxMenu::IsEnabled: no such item") );
 
     return item->IsEnabled();
 }
@@ -664,7 +687,7 @@ bool wxMenuBase::IsChecked( int id ) const
 {
     wxMenuItem *item = FindItem(id);
 
-    wxCHECK_MSG( item, FALSE, wxT("wxMenu::IsChecked: no such item") );
+    wxCHECK_MSG( item, false, wxT("wxMenu::IsChecked: no such item") );
 
     return item->IsChecked();
 }
@@ -735,12 +758,12 @@ wxMenu *wxMenuBarBase::GetMenu(size_t pos) const
 
 bool wxMenuBarBase::Append(wxMenu *menu, const wxString& WXUNUSED(title))
 {
-    wxCHECK_MSG( menu, FALSE, wxT("can't append NULL menu") );
+    wxCHECK_MSG( menu, false, wxT("can't append NULL menu") );
 
     m_menus.Append(menu);
     menu->Attach(this);
 
-    return TRUE;
+    return true;
 }
 
 bool wxMenuBarBase::Insert(size_t pos, wxMenu *menu,
@@ -752,15 +775,15 @@ bool wxMenuBarBase::Insert(size_t pos, wxMenu *menu,
     }
     else // not at the end
     {
-        wxCHECK_MSG( menu, FALSE, wxT("can't insert NULL menu") );
+        wxCHECK_MSG( menu, false, wxT("can't insert NULL menu") );
 
         wxMenuList::compatibility_iterator node = m_menus.Item(pos);
-        wxCHECK_MSG( node, FALSE, wxT("bad index in wxMenuBar::Insert()") );
+        wxCHECK_MSG( node, false, wxT("bad index in wxMenuBar::Insert()") );
 
         m_menus.Insert(node, menu);
         menu->Attach(this);
 
-        return TRUE;
+        return true;
     }
 }
 
@@ -787,7 +810,6 @@ wxMenu *wxMenuBarBase::Remove(size_t pos)
     wxCHECK_MSG( node, NULL, wxT("bad index in wxMenuBar::Remove()") );
 
     wxMenu *menu = node->GetData();
-    wxCHECK( node, NULL );  // unexpected
     m_menus.Erase(node);
     menu->Detach();
 
@@ -894,7 +916,7 @@ bool wxMenuBarBase::IsChecked(int id) const
 {
     wxMenuItem *item = FindItem(id);
 
-    wxCHECK_MSG( item, FALSE, wxT("wxMenuBar::IsChecked(): no such item") );
+    wxCHECK_MSG( item, false, wxT("wxMenuBar::IsChecked(): no such item") );
 
     return item->IsChecked();
 }
@@ -903,7 +925,7 @@ bool wxMenuBarBase::IsEnabled(int id) const
 {
     wxMenuItem *item = FindItem(id);
 
-    wxCHECK_MSG( item, FALSE, wxT("wxMenuBar::IsEnabled(): no such item") );
+    wxCHECK_MSG( item, false, wxT("wxMenuBar::IsEnabled(): no such item") );
 
     return item->IsEnabled();
 }