some != NULL checks

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

diff --git a/src/common/menucmn.cpp b/src/common/menucmn.cpp
index 5fa6e0723b7bf89301b6373901975379f69c4ce3..fd1cc38a1e135b7abfd61c9a6bec376ad92c96c2 100644 (file)
--- a/src/common/menucmn.cpp
+++ b/src/common/menucmn.cpp
@@ -212,7 +212,7 @@ wxMenuItem *wxMenuBase::DoRemove(wxMenuItem *item)
 
 bool wxMenuBase::Delete(wxMenuItem *item)
 {
 
 bool wxMenuBase::Delete(wxMenuItem *item)
 {

-    wxCHECK_MSG( item, NULL, wxT("invalid item in wxMenu::Delete") );
+    wxCHECK_MSG( item, FALSE, wxT("invalid item in wxMenu::Delete") );

 
     return DoDelete(item);
 }
 
     return DoDelete(item);
 }


@@ -232,7 +232,7 @@ bool wxMenuBase::DoDelete(wxMenuItem *item)
 
 bool wxMenuBase::Destroy(wxMenuItem *item)
 {
 
 bool wxMenuBase::Destroy(wxMenuItem *item)
 {

-    wxCHECK_MSG( item, NULL, wxT("invalid item in wxMenu::Destroy") );
+    wxCHECK_MSG( item, FALSE, wxT("invalid item in wxMenu::Destroy") );

 
     return DoDestroy(item);
 }
 
     return DoDestroy(item);
 }


@@ -501,7 +501,7 @@ bool wxMenuBarBase::Insert(size_t pos, wxMenu *menu,
 {
     if ( pos == m_menus.GetCount() )
     {
 {
     if ( pos == m_menus.GetCount() )
     {

-        return Append(menu, title);
+        return wxMenuBarBase::Append(menu, title);

     }
     else
     {
     }
     else
     {


@@ -544,7 +544,7 @@ wxMenu *wxMenuBarBase::Remove(size_t pos)
     return menu;
 }
 
     return menu;
 }
 

-int wxMenuBarBase::FindMenu(const wxString& title)
+int wxMenuBarBase::FindMenu(const wxString& title) const

 {
     wxString label = wxMenuItem::GetLabelFromText(title);
 
 {
     wxString label = wxMenuItem::GetLabelFromText(title);