Added parent window parameter to wxHelpController constructor

[wxWidgets.git] / src / common / menucmn.cpp

diff --git a/src/common/menucmn.cpp b/src/common/menucmn.cpp
index 707646dfa7431b47d69abbcd6685a8a257003c3f..2437f07e4b13dd65d2737200e568a10d5c22786c 100644 (file)
--- a/src/common/menucmn.cpp
+++ b/src/common/menucmn.cpp
@@ -1,12 +1,12 @@
 ///////////////////////////////////////////////////////////////////////////////
 ///////////////////////////////////////////////////////////////////////////////

-// Name:        common/menucmn.cpp
+// Name:        src/common/menucmn.cpp

 // Purpose:     wxMenu and wxMenuBar methods common to all ports
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     26.10.99
 // RCS-ID:      $Id$
 // Purpose:     wxMenu and wxMenuBar methods common to all ports
 // Author:      Vadim Zeitlin
 // Modified by:
 // Created:     26.10.99
 // RCS-ID:      $Id$

-// Copyright:   (c) wxWindows team
-// Licence:     wxWindows license
+// Copyright:   (c) wxWidgets team
+// Licence:     wxWindows licence

 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 ///////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "menubase.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -44,8 +40,8 @@
 
 #include "wx/listimpl.cpp"
 
 
 #include "wx/listimpl.cpp"
 

-WX_DEFINE_LIST(wxMenuList);
-WX_DEFINE_LIST(wxMenuItemList);
+WX_DEFINE_LIST(wxMenuList)
+WX_DEFINE_LIST(wxMenuItemList)

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -68,10 +64,14 @@ wxMenuItemBase::wxMenuItemBase(wxMenu *parentMenu,
 
     m_parentMenu  = parentMenu;
     m_subMenu     = subMenu;
 
     m_parentMenu  = parentMenu;
     m_subMenu     = subMenu;

-    m_isEnabled   = TRUE;
-    m_isChecked   = FALSE;
+    m_isEnabled   = true;
+    m_isChecked   = false;

     m_id          = id;
     m_kind        = kind;
     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()
 }
 
 wxMenuItemBase::~wxMenuItemBase()


@@ -81,10 +81,21 @@ wxMenuItemBase::~wxMenuItemBase()
 
 #if wxUSE_ACCEL
 
 
 #if wxUSE_ACCEL
 

+static inline bool CompareAccelString(const wxString& str, const wxChar *accel)
+{
+#if wxUSE_INTL
+    return str == accel || str == wxGetTranslation(accel);
+#else
+    return str == accel;
+#endif
+}
+

 // return wxAcceleratorEntry for the given menu string or NULL if none
 // specified
 wxAcceleratorEntry *wxGetAccelFromString(const wxString& label)
 {
 // return wxAcceleratorEntry for the given menu string or NULL if none
 // 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 ) {
     // check for accelerators: they are given after '\t'
     int posTab = label.Find(wxT('\t'));
     if ( posTab != wxNOT_FOUND ) {


@@ -94,11 +105,11 @@ wxAcceleratorEntry *wxGetAccelFromString(const wxString& label)
         wxString current;
         for ( size_t n = (size_t)posTab + 1; n < label.Len(); n++ ) {
             if ( (label[n] == '+') || (label[n] == '-') ) {
         wxString current;
         for ( size_t n = (size_t)posTab + 1; n < label.Len(); n++ ) {
             if ( (label[n] == '+') || (label[n] == '-') ) {

-                if ( current == _("ctrl") )
+                if ( CompareAccelString(current, wxTRANSLATE("ctrl")) )

                     accelFlags |= wxACCEL_CTRL;
                     accelFlags |= wxACCEL_CTRL;

-                else if ( current == _("alt") )
+                else if ( CompareAccelString(current, wxTRANSLATE("alt")) )

                     accelFlags |= wxACCEL_ALT;
                     accelFlags |= wxACCEL_ALT;

-                else if ( current == _("shift") )
+                else if ( CompareAccelString(current, wxTRANSLATE("shift")) )

                     accelFlags |= wxACCEL_SHIFT;
                 else {
                     // we may have "Ctrl-+", for example, but we still want to
                     accelFlags |= wxACCEL_SHIFT;
                 else {
                     // we may have "Ctrl-+", for example, but we still want to


@@ -122,11 +133,11 @@ wxAcceleratorEntry *wxGetAccelFromString(const wxString& label)
                 current.clear();
             }
             else {
                 current.clear();
             }
             else {

-                current += wxTolower(label[n]);
+                current += (wxChar) wxTolower(label[n]);

             }
         }
 
             }
         }
 

-        if ( current.IsEmpty() ) {
+        if ( current.empty() ) {

             wxLogDebug(wxT("No accel key found, accel string ignored."));
         }
         else {
             wxLogDebug(wxT("No accel key found, accel string ignored."));
         }
         else {


@@ -142,66 +153,149 @@ wxAcceleratorEntry *wxGetAccelFromString(const wxString& label)
             }
             else {
                 // is it a function key?
             }
             else {
                 // is it a function key?

-                if ( current[0U] == 'f' && isdigit(current[1U]) &&
+                if ( current[0U] == 'f' && wxIsdigit(current[1U]) &&

                      (current.Len() == 2 ||
                      (current.Len() == 2 ||

-                     (current.Len() == 3 && isdigit(current[2U]))) ) {
-                    int n;
-                    wxSscanf(current.c_str() + 1, wxT("%d"), &n);
-
-                    keyCode = WXK_F1 + n - 1;
+                     (current.Len() == 3 && wxIsdigit(current[2U]))) ) {
+                    keyCode = WXK_F1 + wxAtoi(current.c_str() + 1) - 1;

                 }
                 else {
                     // several special cases
                     current.MakeUpper();
                 }
                 else {
                     // several special cases
                     current.MakeUpper();

-                    if ( current == wxT("DEL") ) {
+                    if ( current == wxT("DEL") )

                         keyCode = WXK_DELETE;
                         keyCode = WXK_DELETE;

-                    }
-                    else if ( current == wxT("DELETE") ) {
+                    else if ( current == wxT("DELETE") )

                         keyCode = WXK_DELETE;
                         keyCode = WXK_DELETE;

-                    }
-                    else if ( current == wxT("INS") ) {
+                    else if ( current == wxT("BACK") )
+                        keyCode = WXK_BACK;
+                    else if ( current == wxT("INS") )

                         keyCode = WXK_INSERT;
                         keyCode = WXK_INSERT;

-                    }
-                    else if ( current == wxT("INSERT") ) {
+                    else if ( current == wxT("INSERT") )

                         keyCode = WXK_INSERT;
                         keyCode = WXK_INSERT;

-                    }
-                    else if ( current == wxT("ENTER") || current == wxT("RETURN") ) {
+                    else if ( current == wxT("ENTER") || current == wxT("RETURN") )

                         keyCode = WXK_RETURN;
                         keyCode = WXK_RETURN;

-                    }
-                    else if ( current == wxT("PGUP") ) {
+                    else if ( current == wxT("PGUP") )

                         keyCode = WXK_PRIOR;
                         keyCode = WXK_PRIOR;

-                    }
-                    else if ( current == wxT("PGDN") ) {
+                    else if ( current == wxT("PGDN") )

                         keyCode = WXK_NEXT;
                         keyCode = WXK_NEXT;

-                    }
-                    else if ( current == wxT("LEFT") ) {
+                    else if ( current == wxT("LEFT") )

                         keyCode = WXK_LEFT;
                         keyCode = WXK_LEFT;

-                    }
-                    else if ( current == wxT("RIGHT") ) {
+                    else if ( current == wxT("RIGHT") )

                         keyCode = WXK_RIGHT;
                         keyCode = WXK_RIGHT;

-                    }
-                    else if ( current == wxT("UP") ) {
+                    else if ( current == wxT("UP") )

                         keyCode = WXK_UP;
                         keyCode = WXK_UP;

-                    }
-                    else if ( current == wxT("DOWN") ) {
+                    else if ( current == wxT("DOWN") )

                         keyCode = WXK_DOWN;
                         keyCode = WXK_DOWN;

-                    }
-                    else if ( current == wxT("HOME") ) {
+                    else if ( current == wxT("HOME") )

                         keyCode = WXK_HOME;
                         keyCode = WXK_HOME;

-                    }
-                    else if ( current == wxT("END") ) {
+                    else if ( current == wxT("END") )

                         keyCode = WXK_END;
                         keyCode = WXK_END;

-                    }
-                    else if ( current == wxT("SPACE") ) {
+                    else if ( current == wxT("SPACE") || current == _("SPACE") )

                         keyCode = WXK_SPACE;
                         keyCode = WXK_SPACE;

-                    }
-                    else if ( current == wxT("TAB") ) {
+                    else if ( current == wxT("TAB") )

                         keyCode = WXK_TAB;
                         keyCode = WXK_TAB;

-                    }
+                    else if ( current == wxT("ESC") || current == wxT("ESCAPE") )
+                        keyCode = WXK_ESCAPE;
+                    else if ( current == wxT("CANCEL") )
+                        keyCode = WXK_CANCEL;
+                    else if ( current == wxT("CLEAR") )
+                        keyCode = WXK_CLEAR;
+                    else if ( current == wxT("MENU") )
+                        keyCode = WXK_MENU;
+                    else if ( current == wxT("PAUSE") )
+                        keyCode = WXK_PAUSE;
+                    else if ( current == wxT("CAPITAL") )
+                        keyCode = WXK_CAPITAL;
+                    else if ( current == wxT("SELECT") )
+                        keyCode = WXK_SELECT;
+                    else if ( current == wxT("PRINT") )
+                        keyCode = WXK_PRINT;
+                    else if ( current == wxT("EXECUTE") )
+                        keyCode = WXK_EXECUTE;
+                    else if ( current == wxT("SNAPSHOT") )
+                        keyCode = WXK_SNAPSHOT;
+                    else if ( current == wxT("HELP") )
+                        keyCode = WXK_HELP;
+                    else if ( current == wxT("ADD") )
+                        keyCode = WXK_ADD;
+                    else if ( current == wxT("SEPARATOR") )
+                        keyCode = WXK_SEPARATOR;
+                    else if ( current == wxT("SUBTRACT") )
+                        keyCode = WXK_SUBTRACT;
+                    else if ( current == wxT("DECIMAL") )
+                        keyCode = WXK_DECIMAL;
+                    else if ( current == wxT("DIVIDE") )
+                        keyCode = WXK_DIVIDE;
+                    else if ( current == wxT("NUM_LOCK") )
+                        keyCode = WXK_NUMLOCK;
+                    else if ( current == wxT("SCROLL_LOCK") )
+                        keyCode = WXK_SCROLL;
+                    else if ( current == wxT("PAGEUP") )
+                        keyCode = WXK_PAGEUP;
+                    else if ( current == wxT("PAGEDOWN") )
+                        keyCode = WXK_PAGEDOWN;
+                    else if ( current == wxT("KP_SPACE") )
+                        keyCode = WXK_NUMPAD_SPACE;
+                    else if ( current == wxT("KP_TAB") )
+                        keyCode = WXK_NUMPAD_TAB;
+                    else if ( current == wxT("KP_ENTER") )
+                        keyCode = WXK_NUMPAD_ENTER;
+                    else if ( current == wxT("KP_HOME") )
+                        keyCode = WXK_NUMPAD_HOME;
+                    else if ( current == wxT("KP_LEFT") )
+                        keyCode = WXK_NUMPAD_LEFT;
+                    else if ( current == wxT("KP_UP") )
+                        keyCode = WXK_NUMPAD_UP;
+                    else if ( current == wxT("KP_RIGHT") )
+                        keyCode = WXK_NUMPAD_RIGHT;
+                    else if ( current == wxT("KP_DOWN") )
+                        keyCode = WXK_NUMPAD_DOWN;
+                    else if ( current == wxT("KP_PRIOR") )
+                        keyCode = WXK_NUMPAD_PRIOR;
+                    else if ( current == wxT("KP_PAGEUP") )
+                        keyCode = WXK_NUMPAD_PAGEUP;
+                    else if ( current == wxT("KP_NEXT;") )
+                        keyCode = WXK_NUMPAD_NEXT;
+                    else if ( current == wxT("KP_PAGEDOWN") )
+                        keyCode = WXK_NUMPAD_PAGEDOWN;
+                    else if ( current == wxT("KP_END") )
+                        keyCode = WXK_NUMPAD_END;
+                    else if ( current == wxT("KP_BEGIN") )
+                        keyCode = WXK_NUMPAD_BEGIN;
+                    else if ( current == wxT("KP_INSERT") )
+                        keyCode = WXK_NUMPAD_INSERT;
+                    else if ( current == wxT("KP_DELETE") )
+                        keyCode = WXK_NUMPAD_DELETE;
+                    else if ( current == wxT("KP_EQUAL") )
+                        keyCode = WXK_NUMPAD_EQUAL;
+                    else if ( current == wxT("KP_MULTIPLY") )
+                        keyCode = WXK_NUMPAD_MULTIPLY;
+                    else if ( current == wxT("KP_ADD") )
+                        keyCode = WXK_NUMPAD_ADD;
+                    else if ( current == wxT("KP_SEPARATOR") )
+                        keyCode = WXK_NUMPAD_SEPARATOR;
+                    else if ( current == wxT("KP_SUBTRACT") )
+                        keyCode = WXK_NUMPAD_SUBTRACT;
+                    else if ( current == wxT("KP_DECIMAL") )
+                        keyCode = WXK_NUMPAD_DECIMAL;
+                    else if ( current == wxT("KP_DIVIDE") )
+                        keyCode = WXK_NUMPAD_DIVIDE;
+                    else if ( current == wxT("WINDOWS_LEFT") )
+                        keyCode = WXK_WINDOWS_LEFT;
+                    else if ( current == wxT("WINDOWS_RIGHT") )
+                        keyCode = WXK_WINDOWS_RIGHT;
+                    else if ( current == wxT("WINDOWS_MENU") )
+                        keyCode = WXK_WINDOWS_MENU;
+                    else if ( current == wxT("COMMAND") )
+                        keyCode = WXK_COMMAND;
+                    else if ( current.Left(3) == wxT("KP_") && wxIsdigit(current[3U]) )
+                        keyCode = WXK_NUMPAD0 + wxAtoi(current.c_str() + 3);
+                    else if ( current.Left(7) == wxT("SPECIAL") && wxIsdigit(current[7U]) )
+                        keyCode = WXK_SPECIAL1 + wxAtoi(current.c_str() + 7) - 1;

                     else
                     {
                         wxLogDebug(wxT("Unrecognized accel key '%s', accel string ignored."),
                                    current.c_str());
                     else
                     {
                         wxLogDebug(wxT("Unrecognized accel key '%s', accel string ignored."),
                                    current.c_str());

+                        return NULL;

                     }
                 }
             }
                     }
                 }
             }


@@ -274,14 +368,14 @@ void wxMenuItemBase::SetAccel(wxAcceleratorEntry *accel)
 
 #endif // wxUSE_ACCEL
 
 
 #endif // wxUSE_ACCEL
 

+bool wxMenuBase::ms_locked = true;
+

 // ----------------------------------------------------------------------------
 // wxMenu ctor and dtor
 // ----------------------------------------------------------------------------
 
 void wxMenuBase::Init(long style)
 {
 // ----------------------------------------------------------------------------
 // wxMenu ctor and dtor
 // ----------------------------------------------------------------------------
 
 void wxMenuBase::Init(long style)
 {

-    m_items.DeleteContents(TRUE);
-

     m_menuBar = (wxMenuBar *)NULL;
     m_menuParent = (wxMenu *)NULL;
 
     m_menuBar = (wxMenuBar *)NULL;
     m_menuParent = (wxMenu *)NULL;
 


@@ -289,15 +383,11 @@ void wxMenuBase::Init(long style)
     m_style = style;
     m_clientData = (void *)NULL;
     m_eventHandler = this;
     m_style = style;
     m_clientData = (void *)NULL;
     m_eventHandler = this;

-
-#if wxUSE_MENU_CALLBACK
-    m_callback = (wxFunction) NULL;
-#endif // wxUSE_MENU_CALLBACK

 }
 
 wxMenuBase::~wxMenuBase()
 {
 }
 
 wxMenuBase::~wxMenuBase()
 {

-    // nothing to do, wxMenuItemList dtor will delete the menu items.
+    WX_CLEAR_LIST(wxMenuItemList, m_items);

 
     // Actually, in GTK, the submenus have to get deleted first.
 }
 
     // Actually, in GTK, the submenus have to get deleted first.
 }


@@ -310,30 +400,26 @@ void wxMenuBase::AddSubMenu(wxMenu *submenu)
 {
     wxCHECK_RET( submenu, _T("can't add a NULL submenu") );
 
 {
     wxCHECK_RET( submenu, _T("can't add a NULL submenu") );
 

-    if ( m_menuBar )
-    {
-        submenu->Attach(m_menuBar);
-    }
-

     submenu->SetParent((wxMenu *)this);
 }
 
     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);
 
     m_items.Append(item);

+    item->SetMenu((wxMenu*)this);

     if ( item->IsSubMenu() )
     {
         AddSubMenu(item->GetSubMenu());
     }
 
     if ( item->IsSubMenu() )
     {
         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() )
     {
 
     if ( pos == GetMenuItemCount() )
     {


@@ -341,27 +427,28 @@ bool wxMenuBase::Insert(size_t pos, wxMenuItem *item)
     }
     else
     {
     }
     else
     {

-        wxCHECK_MSG( pos < GetMenuItemCount(), FALSE,
+        wxCHECK_MSG( pos < GetMenuItemCount(), NULL,

                      wxT("invalid index in wxMenu::Insert") );
 
         return DoInsert(pos, item);
     }
 }
 
                      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::Node *node = m_items.Item(pos);
-    wxCHECK_MSG( node, FALSE, wxT("invalid index in wxMenu::Insert()") );
+    wxMenuItemList::compatibility_iterator node = m_items.Item(pos);
+    wxCHECK_MSG( node, NULL, wxT("invalid index in wxMenu::Insert()") );

 
     m_items.Insert(node, item);
 
     m_items.Insert(node, item);

+    item->SetMenu((wxMenu*)this);

     if ( item->IsSubMenu() )
     {
         AddSubMenu(item->GetSubMenu());
     }
 
     if ( item->IsSubMenu() )
     {
         AddSubMenu(item->GetSubMenu());
     }
 

-    return TRUE;
+    return item;

 }
 
 wxMenuItem *wxMenuBase::Remove(wxMenuItem *item)
 }
 
 wxMenuItem *wxMenuBase::Remove(wxMenuItem *item)


@@ -373,21 +460,23 @@ wxMenuItem *wxMenuBase::Remove(wxMenuItem *item)
 
 wxMenuItem *wxMenuBase::DoRemove(wxMenuItem *item)
 {
 
 wxMenuItem *wxMenuBase::DoRemove(wxMenuItem *item)
 {

-    wxMenuItemList::Node *node = m_items.Find(item);
+    wxMenuItemList::compatibility_iterator node = m_items.Find(item);

 
     // if we get here, the item is valid or one of Remove() functions is broken
     wxCHECK_MSG( node, NULL, wxT("bug in wxMenu::Remove logic") );
 
     // we detach the item, but we do delete the list node (i.e. don't call
     // DetachNode() here!)
 
     // if we get here, the item is valid or one of Remove() functions is broken
     wxCHECK_MSG( node, NULL, wxT("bug in wxMenu::Remove logic") );
 
     // we detach the item, but we do delete the list node (i.e. don't call
     // DetachNode() here!)

-    node->SetData((wxMenuItem *)NULL);  // to prevent it from deleting the item
-    m_items.DeleteNode(node);
+    m_items.Erase(node);

 
     // item isn't attached to anything any more
 
     // item isn't attached to anything any more

+    item->SetMenu((wxMenu *)NULL);

     wxMenu *submenu = item->GetSubMenu();
     if ( submenu )
     {
         submenu->SetParent((wxMenu *)NULL);
     wxMenu *submenu = item->GetSubMenu();
     if ( submenu )
     {
         submenu->SetParent((wxMenu *)NULL);

+        if ( submenu->IsAttached() )
+            submenu->Detach();

     }
 
     return item;
     }
 
     return item;


@@ -395,7 +484,7 @@ wxMenuItem *wxMenuBase::DoRemove(wxMenuItem *item)
 
 bool wxMenuBase::Delete(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);
 }
 
     return DoDelete(item);
 }


@@ -403,19 +492,19 @@ bool wxMenuBase::Delete(wxMenuItem *item)
 bool wxMenuBase::DoDelete(wxMenuItem *item)
 {
     wxMenuItem *item2 = DoRemove(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;
 
 
     // don't delete the submenu
     item2->SetSubMenu((wxMenu *)NULL);
 
     delete item2;
 

-    return TRUE;
+    return true;

 }
 
 bool wxMenuBase::Destroy(wxMenuItem *item)
 {
 }
 
 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);
 }
 
     return DoDestroy(item);
 }


@@ -423,22 +512,22 @@ bool wxMenuBase::Destroy(wxMenuItem *item)
 bool wxMenuBase::DoDestroy(wxMenuItem *item)
 {
     wxMenuItem *item2 = DoRemove(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;
 
 
     delete item2;
 

-    return TRUE;
+    return true;

 }
 
 // ----------------------------------------------------------------------------
 // wxMenu searching for items
 // ----------------------------------------------------------------------------
 
 }
 
 // ----------------------------------------------------------------------------
 // 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);
 int wxMenuBase::FindItem(const wxString& text) const
 {
     wxString label = wxMenuItem::GetLabelFromText(text);

-    for ( wxMenuItemList::Node *node = m_items.GetFirst();
+    for ( wxMenuItemList::compatibility_iterator node = m_items.GetFirst();

           node;
           node = node->GetNext() )
     {
           node;
           node = node->GetNext() )
     {


@@ -469,7 +558,7 @@ wxMenuItem *wxMenuBase::FindItem(int itemId, wxMenu **itemMenu) const
         *itemMenu = NULL;
 
     wxMenuItem *item = NULL;
         *itemMenu = NULL;
 
     wxMenuItem *item = NULL;

-    for ( wxMenuItemList::Node *node = m_items.GetFirst();
+    for ( wxMenuItemList::compatibility_iterator node = m_items.GetFirst();

           node && !item;
           node = node->GetNext() )
     {
           node && !item;
           node = node->GetNext() )
     {


@@ -498,7 +587,7 @@ wxMenuItem *wxMenuBase::FindItem(int itemId, wxMenu **itemMenu) const
 wxMenuItem *wxMenuBase::FindChildItem(int id, size_t *ppos) const
 {
     wxMenuItem *item = (wxMenuItem *)NULL;
 wxMenuItem *wxMenuBase::FindChildItem(int id, size_t *ppos) const
 {
     wxMenuItem *item = (wxMenuItem *)NULL;

-    wxMenuItemList::Node *node = GetMenuItems().GetFirst();
+    wxMenuItemList::compatibility_iterator node = GetMenuItems().GetFirst();

 
     size_t pos;
     for ( pos = 0; node; pos++ )
 
     size_t pos;
     for ( pos = 0; node; pos++ )


@@ -521,6 +610,15 @@ wxMenuItem *wxMenuBase::FindChildItem(int id, size_t *ppos) const
     return item;
 }
 
     return item;
 }
 

+// find by position
+wxMenuItem* wxMenuBase::FindItemByPosition(size_t position) const
+{
+    wxCHECK_MSG( position < m_items.GetCount(), NULL,
+                 _T("wxMenu::FindItemByPosition(): invalid menu index") );
+
+    return m_items.Item( position )->GetData();
+}
+

 // ----------------------------------------------------------------------------
 // wxMenu helpers used by derived classes
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // wxMenu helpers used by derived classes
 // ----------------------------------------------------------------------------


@@ -530,6 +628,15 @@ wxMenuItem *wxMenuBase::FindChildItem(int id, size_t *ppos) const
 // window will be used.
 void wxMenuBase::UpdateUI(wxEvtHandler* source)
 {
 // 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 )
     if ( !source && GetInvokingWindow() )
         source = GetInvokingWindow()->GetEventHandler();
     if ( !source )


@@ -537,7 +644,7 @@ void wxMenuBase::UpdateUI(wxEvtHandler* source)
     if ( !source )
         source = this;
 
     if ( !source )
         source = this;
 

-    wxMenuItemList::Node* node = GetMenuItems().GetFirst();
+    wxMenuItemList::compatibility_iterator  node = GetMenuItems().GetFirst();

     while ( node )
     {
         wxMenuItem* item = node->GetData();
     while ( node )
     {
         wxMenuItem* item = node->GetData();


@@ -549,7 +656,7 @@ void wxMenuBase::UpdateUI(wxEvtHandler* source)
 
             if ( source->ProcessEvent(event) )
             {
 
             if ( source->ProcessEvent(event) )
             {

-                // if anything changed, update the chanegd attribute
+                // if anything changed, update the changed attribute

                 if (event.GetSetText())
                     SetLabel(id, event.GetText());
                 if (event.GetSetChecked())
                 if (event.GetSetText())
                     SetLabel(id, event.GetText());
                 if (event.GetSetChecked())


@@ -562,7 +669,7 @@ void wxMenuBase::UpdateUI(wxEvtHandler* source)
             if ( item->GetSubMenu() )
                 item->GetSubMenu()->UpdateUI(source);
         }
             if ( item->GetSubMenu() )
                 item->GetSubMenu()->UpdateUI(source);
         }

-        //else: item is a separator (which don't process update UI events)
+        //else: item is a separator (which doesn't process update UI events)

 
         node = node->GetNext();
     }
 
         node = node->GetNext();
     }


@@ -574,19 +681,10 @@ bool wxMenuBase::SendEvent(int id, int checked)
     event.SetEventObject(this);
     event.SetInt(checked);
 
     event.SetEventObject(this);
     event.SetInt(checked);
 

-    bool processed = FALSE;
-
-#if wxUSE_MENU_CALLBACK
-    // Try a callback
-    if (m_callback)
-    {
-        (void)(*(m_callback))(*this, event);
-        processed = TRUE;
-    }
-#endif // wxUSE_MENU_CALLBACK
+    bool processed = false;

 
     // Try the menu's event handler
 
     // Try the menu's event handler

-    if ( !processed )
+    // if ( !processed )

     {
         wxEvtHandler *handler = GetEventHandler();
         if ( handler )
     {
         wxEvtHandler *handler = GetEventHandler();
         if ( handler )


@@ -618,6 +716,13 @@ bool wxMenuBase::SendEvent(int id, int checked)
 // wxMenu attaching/detaching to/from menu bar
 // ----------------------------------------------------------------------------
 
 // 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!
 void wxMenuBase::Attach(wxMenuBarBase *menubar)
 {
     // use Detach() instead!


@@ -654,7 +759,7 @@ bool wxMenuBase::IsEnabled( int id ) const
 {
     wxMenuItem *item = FindItem(id);
 
 {
     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();
 }
 
     return item->IsEnabled();
 }


@@ -672,7 +777,7 @@ bool wxMenuBase::IsChecked( int id ) const
 {
     wxMenuItem *item = FindItem(id);
 
 {
     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();
 }
 
     return item->IsChecked();
 }


@@ -690,7 +795,7 @@ wxString wxMenuBase::GetLabel( int id ) const
 {
     wxMenuItem *item = FindItem(id);
 
 {
     wxMenuItem *item = FindItem(id);
 

-    wxCHECK_MSG( item, wxT(""), wxT("wxMenu::GetLabel: no such item") );
+    wxCHECK_MSG( item, wxEmptyString, wxT("wxMenu::GetLabel: no such item") );

 
     return item->GetText();
 }
 
     return item->GetText();
 }


@@ -708,7 +813,7 @@ wxString wxMenuBase::GetHelpString( int id ) const
 {
     wxMenuItem *item = FindItem(id);
 
 {
     wxMenuItem *item = FindItem(id);
 

-    wxCHECK_MSG( item, wxT(""), wxT("wxMenu::GetHelpString: no such item") );
+    wxCHECK_MSG( item, wxEmptyString, wxT("wxMenu::GetHelpString: no such item") );

 
     return item->GetHelp();
 }
 
     return item->GetHelp();
 }


@@ -719,17 +824,13 @@ wxString wxMenuBase::GetHelpString( int id ) const
 
 wxMenuBarBase::wxMenuBarBase()
 {
 
 wxMenuBarBase::wxMenuBarBase()
 {

-    // we own the menus when we get them
-    m_menus.DeleteContents(TRUE);
-

     // not attached yet
     m_menuBarFrame = NULL;
 }
 
 wxMenuBarBase::~wxMenuBarBase()
 {
     // not attached yet
     m_menuBarFrame = NULL;
 }
 
 wxMenuBarBase::~wxMenuBarBase()
 {

-    // nothing to do, the list will delete the menus because of the call to
-    // DeleteContents() above
+    WX_CLEAR_LIST(wxMenuList, m_menus);

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -739,7 +840,7 @@ wxMenuBarBase::~wxMenuBarBase()
 
 wxMenu *wxMenuBarBase::GetMenu(size_t pos) const
 {
 
 wxMenu *wxMenuBarBase::GetMenu(size_t pos) const
 {

-    wxMenuList::Node *node = m_menus.Item(pos);
+    wxMenuList::compatibility_iterator node = m_menus.Item(pos);

     wxCHECK_MSG( node, NULL, wxT("bad index in wxMenuBar::GetMenu()") );
 
     return node->GetData();
     wxCHECK_MSG( node, NULL, wxT("bad index in wxMenuBar::GetMenu()") );
 
     return node->GetData();


@@ -747,12 +848,12 @@ wxMenu *wxMenuBarBase::GetMenu(size_t pos) const
 
 bool wxMenuBarBase::Append(wxMenu *menu, const wxString& WXUNUSED(title))
 {
 
 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);
 
 
     m_menus.Append(menu);
     menu->Attach(this);
 

-    return TRUE;
+    return true;

 }
 
 bool wxMenuBarBase::Insert(size_t pos, wxMenu *menu,
 }
 
 bool wxMenuBarBase::Insert(size_t pos, wxMenu *menu,


@@ -764,15 +865,15 @@ bool wxMenuBarBase::Insert(size_t pos, wxMenu *menu,
     }
     else // not at the end
     {
     }
     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::Node *node = m_menus.Item(pos);
-        wxCHECK_MSG( node, FALSE, wxT("bad index in wxMenuBar::Insert()") );
+        wxMenuList::compatibility_iterator node = m_menus.Item(pos);
+        wxCHECK_MSG( node, false, wxT("bad index in wxMenuBar::Insert()") );

 
         m_menus.Insert(node, menu);
         menu->Attach(this);
 
 
         m_menus.Insert(node, menu);
         menu->Attach(this);
 

-        return TRUE;
+        return true;

     }
 }
 
     }
 }
 


@@ -781,7 +882,7 @@ wxMenu *wxMenuBarBase::Replace(size_t pos, wxMenu *menu,
 {
     wxCHECK_MSG( menu, NULL, wxT("can't insert NULL menu") );
 
 {
     wxCHECK_MSG( menu, NULL, wxT("can't insert NULL menu") );
 

-    wxMenuList::Node *node = m_menus.Item(pos);
+    wxMenuList::compatibility_iterator node = m_menus.Item(pos);

     wxCHECK_MSG( node, NULL, wxT("bad index in wxMenuBar::Replace()") );
 
     wxMenu *menuOld = node->GetData();
     wxCHECK_MSG( node, NULL, wxT("bad index in wxMenuBar::Replace()") );
 
     wxMenu *menuOld = node->GetData();


@@ -795,16 +896,13 @@ wxMenu *wxMenuBarBase::Replace(size_t pos, wxMenu *menu,
 
 wxMenu *wxMenuBarBase::Remove(size_t pos)
 {
 
 wxMenu *wxMenuBarBase::Remove(size_t pos)
 {

-    wxMenuList::Node *node = m_menus.Item(pos);
+    wxMenuList::compatibility_iterator node = m_menus.Item(pos);

     wxCHECK_MSG( node, NULL, wxT("bad index in wxMenuBar::Remove()") );
 
     wxCHECK_MSG( node, NULL, wxT("bad index in wxMenuBar::Remove()") );
 

-    node = m_menus.DetachNode(node);
-    wxCHECK( node, NULL );  // unexpected

     wxMenu *menu = node->GetData();
     wxMenu *menu = node->GetData();

+    m_menus.Erase(node);

     menu->Detach();
 
     menu->Detach();
 

-    delete node;
-

     return menu;
 }
 
     return menu;
 }
 


@@ -856,10 +954,11 @@ wxMenuItem *wxMenuBarBase::FindItem(int id, wxMenu **menu) const
         *menu = NULL;
 
     wxMenuItem *item = NULL;
         *menu = NULL;
 
     wxMenuItem *item = NULL;

-    size_t count = GetMenuCount();
-    for ( size_t i = 0; !item && (i < count); i++ )
+    size_t count = GetMenuCount(), i;
+    wxMenuList::const_iterator it;
+    for ( i = 0, it = m_menus.begin(); !item && (i < count); i++, it++ )

     {
     {

-        item = m_menus[i]->FindItem(id, menu);
+        item = (*it)->FindItem(id, menu);

     }
 
     return item;
     }
 
     return item;


@@ -870,7 +969,7 @@ int wxMenuBarBase::FindMenuItem(const wxString& menu, const wxString& item) cons
     wxString label = wxMenuItem::GetLabelFromText(menu);
 
     int i = 0;
     wxString label = wxMenuItem::GetLabelFromText(menu);
 
     int i = 0;

-    wxMenuList::Node *node;
+    wxMenuList::compatibility_iterator node;

     for ( node = m_menus.GetFirst(); node; node = node->GetNext(), i++ )
     {
         if ( label == wxMenuItem::GetLabelFromText(GetLabelTop(i)) )
     for ( node = m_menus.GetFirst(); node; node = node->GetNext(), i++ )
     {
         if ( label == wxMenuItem::GetLabelFromText(GetLabelTop(i)) )


@@ -907,7 +1006,7 @@ bool wxMenuBarBase::IsChecked(int id) const
 {
     wxMenuItem *item = FindItem(id);
 
 {
     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();
 }
 
     return item->IsChecked();
 }


@@ -916,7 +1015,7 @@ bool wxMenuBarBase::IsEnabled(int id) const
 {
     wxMenuItem *item = FindItem(id);
 
 {
     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();
 }
 
     return item->IsEnabled();
 }