somebody added #ifdefed #pragma to disable warnings about // in c source, instead...

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

diff --git a/src/common/menucmn.cpp b/src/common/menucmn.cpp
index b5e8cd426659bf35df92f2765a4c07532157b462..9f16ca8512689404c87394eae0fc8efa143ea81b 100644 (file)
--- a/src/common/menucmn.cpp
+++ b/src/common/menucmn.cpp
@@ -51,7 +51,8 @@ WX_DEFINE_LIST(wxMenuItemList);
 
 wxMenuItemBase::~wxMenuItemBase()
 {
 
 wxMenuItemBase::~wxMenuItemBase()
 {

-    delete m_subMenu;
+    if (m_subMenu)
+        delete m_subMenu;

 }
 
 #if wxUSE_ACCEL
 }
 
 #if wxUSE_ACCEL


@@ -124,11 +125,16 @@ 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
+    // nothing to do, wxMenuItemList dtor will delete the menu items.
+       // Actually, in GTK, the submenus have to get deleted first.

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


@@ -147,10 +153,18 @@ bool wxMenuBase::DoAppend(wxMenuItem *item)
 bool wxMenuBase::Insert(size_t pos, wxMenuItem *item)
 {
     wxCHECK_MSG( item, FALSE, wxT("invalid item in wxMenu::Insert") );
 bool wxMenuBase::Insert(size_t pos, wxMenuItem *item)
 {
     wxCHECK_MSG( item, FALSE, wxT("invalid item in wxMenu::Insert") );

-    wxCHECK_MSG( pos < GetMenuItemCount(), FALSE,
-                 wxT("invalid index in wxMenu::Insert") );

 
 

-    return DoInsert(pos, item);
+    if ( pos == GetMenuItemCount() )
+    {
+        return DoAppend(item);
+    }
+    else
+    {
+        wxCHECK_MSG( pos < GetMenuItemCount(), FALSE,
+                     wxT("invalid index in wxMenu::Insert") );
+
+        return DoInsert(pos, item);
+    }

 }
 
 bool wxMenuBase::DoInsert(size_t pos, wxMenuItem *item)
 }
 
 bool wxMenuBase::DoInsert(size_t pos, wxMenuItem *item)


@@ -238,7 +252,7 @@ bool wxMenuBase::DoDestroy(wxMenuItem *item)
 // Finds the item id matching the given string, -1 if not found.
 int wxMenuBase::FindItem(const wxString& text) const
 {
 // Finds the item id matching the given string, -1 if not found.
 int wxMenuBase::FindItem(const wxString& text) const
 {

-    wxString label = wxMenuItem(NULL, wxID_SEPARATOR, text).GetLabel();
+    wxString label = wxMenuItem::GetLabelFromText(text);

     for ( wxMenuItemList::Node *node = m_items.GetFirst();
           node;
           node = node->GetNext() )
     for ( wxMenuItemList::Node *node = m_items.GetFirst();
           node;
           node = node->GetNext() )


@@ -301,16 +315,19 @@ wxMenuItem *wxMenuBase::FindChildItem(int id, size_t *ppos) const
     size_t pos;
     for ( pos = 0; node; pos++ )
     {
     size_t pos;
     for ( pos = 0; node; pos++ )
     {

-        item = node->GetData();
-        if ( item->GetId() == id )
+        if ( node->GetData()->GetId() == id )
+        {
+            item = node->GetData();
+

             break;
             break;

+        }

 
         node = node->GetNext();
     }
 
     if ( ppos )
     {
 
         node = node->GetNext();
     }
 
     if ( ppos )
     {

-        *ppos = item ? pos : wxNOT_FOUND;
+        *ppos = item ? pos : (size_t)wxNOT_FOUND;

     }
 
     return item;
     }
 
     return item;


@@ -478,16 +495,23 @@ bool wxMenuBarBase::Append(wxMenu *menu, const wxString& WXUNUSED(title))
 }
 
 bool wxMenuBarBase::Insert(size_t pos, wxMenu *menu,
 }
 
 bool wxMenuBarBase::Insert(size_t pos, wxMenu *menu,

-                           const wxString& WXUNUSED(title))
+                           const wxString& title)

 {
 {

-    wxCHECK_MSG( menu, FALSE, wxT("can't insert NULL menu") );
+    if ( pos == m_menus.GetCount() )
+    {
+        return Append(menu, title);
+    }
+    else
+    {
+        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::Node *node = m_menus.Item(pos);
+        wxCHECK_MSG( node, FALSE, wxT("bad index in wxMenuBar::Insert()") );

 
 

-    m_menus.Insert(node, menu);
+        m_menus.Insert(node, menu);

 
 

-    return TRUE;
+        return TRUE;
+    }

 }
 
 wxMenu *wxMenuBarBase::Replace(size_t pos, wxMenu *menu,
 }
 
 wxMenu *wxMenuBarBase::Replace(size_t pos, wxMenu *menu,