Shell version of dllar, needed for building DLLs while generating

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

diff --git a/src/common/menucmn.cpp b/src/common/menucmn.cpp
index 707646dfa7431b47d69abbcd6685a8a257003c3f..62118b53b5f87a0ed155f0e3b65e564f72c90b0c 100644 (file)
--- a/src/common/menucmn.cpp
+++ b/src/common/menucmn.cpp
@@ -6,7 +6,7 @@
 // Created:     26.10.99
 // RCS-ID:      $Id$
 // Copyright:   (c) wxWindows team
 // Created:     26.10.99
 // RCS-ID:      $Id$
 // Copyright:   (c) wxWindows team

-// Licence:     wxWindows license
+// Licence:     wxWindows licence

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


@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "menubase.h"
 #endif
 
     #pragma implementation "menubase.h"
 #endif
 


@@ -72,6 +72,10 @@ wxMenuItemBase::wxMenuItemBase(wxMenu *parentMenu,
     m_isChecked   = FALSE;
     m_id          = id;
     m_kind        = kind;
     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()
 }
 
 wxMenuItemBase::~wxMenuItemBase()


@@ -81,6 +85,15 @@ 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)


@@ -94,11 +107,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,7 +135,7 @@ wxAcceleratorEntry *wxGetAccelFromString(const wxString& label)
                 current.clear();
             }
             else {
                 current.clear();
             }
             else {

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

             }
         }
 
             }
         }
 


@@ -142,9 +155,9 @@ 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]))) ) {
+                     (current.Len() == 3 && wxIsdigit(current[2U]))) ) {

                     int n;
                     wxSscanf(current.c_str() + 1, wxT("%d"), &n);
 
                     int n;
                     wxSscanf(current.c_str() + 1, wxT("%d"), &n);
 


@@ -153,51 +166,40 @@ wxAcceleratorEntry *wxGetAccelFromString(const wxString& label)
                 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") )

                         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
                     {
                         wxLogDebug(wxT("Unrecognized accel key '%s', accel string ignored."),
                     else
                     {
                         wxLogDebug(wxT("Unrecognized accel key '%s', accel string ignored."),


@@ -280,8 +282,6 @@ void wxMenuItemBase::SetAccel(wxAcceleratorEntry *accel)
 
 void wxMenuBase::Init(long style)
 {
 
 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 +289,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.
 }


@@ -318,22 +314,23 @@ void wxMenuBase::AddSubMenu(wxMenu *submenu)
     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() )
     {


@@ -348,20 +345,21 @@ bool wxMenuBase::Insert(size_t pos, wxMenuItem *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);
+    wxMenuItemList::compatibility_iterator node = m_items.Item(pos);

     wxCHECK_MSG( node, FALSE, wxT("invalid index in wxMenu::Insert()") );
 
     m_items.Insert(node, item);
     wxCHECK_MSG( node, FALSE, wxT("invalid index in wxMenu::Insert()") );
 
     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,17 +371,17 @@ 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 )
     {
     wxMenu *submenu = item->GetSubMenu();
     if ( submenu )
     {


@@ -438,7 +436,7 @@ bool wxMenuBase::DoDestroy(wxMenuItem *item)
 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 +467,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 +496,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 +519,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 +537,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 +553,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 +565,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 +578,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();
     }


@@ -576,15 +592,6 @@ bool wxMenuBase::SendEvent(int id, int checked)
 
     bool processed = FALSE;
 
 
     bool processed = FALSE;
 

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

     // Try the menu's event handler
     if ( !processed )
     {
     // Try the menu's event handler
     if ( !processed )
     {


@@ -719,17 +726,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 +742,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();


@@ -766,7 +769,7 @@ bool wxMenuBarBase::Insert(size_t pos, wxMenu *menu,
     {
         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);
+        wxMenuList::compatibility_iterator node = m_menus.Item(pos);

         wxCHECK_MSG( node, FALSE, wxT("bad index in wxMenuBar::Insert()") );
 
         m_menus.Insert(node, menu);
         wxCHECK_MSG( node, FALSE, wxT("bad index in wxMenuBar::Insert()") );
 
         m_menus.Insert(node, menu);


@@ -781,7 +784,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 +798,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 +856,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 +871,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)) )