test for timegm() added

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

diff --git a/src/common/menucmn.cpp b/src/common/menucmn.cpp
index b5e8cd426659bf35df92f2765a4c07532157b462..5d917876657b78bfb573fc4fc6c1051d98cf9c0d 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.

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


@@ -301,16 +307,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;