GetItem() now works (it was completely broken)

[wxWidgets.git] / src / msw / menu.cpp

diff --git a/src/msw/menu.cpp b/src/msw/menu.cpp
index 1004cd16e88b54914b3ed19aba29e14b3a365dff..097a1238545ef49cc6954e00a30a9d76e2558425 100644 (file)
--- a/src/msw/menu.cpp
+++ b/src/msw/menu.cpp
@@ -19,6 +19,7 @@
 
 #ifdef __GNUG__
 #pragma implementation "menu.h"
+#pragma implementation "menuitem.h"
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
@@ -48,8 +49,8 @@
 #include <string.h>
 
 #if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxMenu, wxWindow)
-IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxWindow)
+IMPLEMENT_DYNAMIC_CLASS(wxMenu, wxEvtHandler)
+IMPLEMENT_DYNAMIC_CLASS(wxMenuBar, wxEvtHandler)
 #endif
 
 // ============================================================================
@@ -139,7 +140,7 @@ void wxMenu::Break(void)
 // function appends a new item or submenu to the menu
 void wxMenu::Append(wxMenuItem *pItem)
 {
-  wxCHECK( pItem != NULL );
+  wxCHECK_RET( pItem != NULL, "can't append NULL item to the menu" );
 
   m_menuItems.Append(pItem);
 
@@ -158,7 +159,7 @@ void wxMenu::Append(wxMenuItem *pItem)
   UINT id;
   wxMenu *SubMenu = pItem->GetSubMenu();
   if ( SubMenu != NULL ) {
-    wxASSERT( SubMenu->m_hMenu != NULL );
+    wxASSERT( SubMenu->m_hMenu != (WXHMENU) NULL );
 
     id = (UINT)SubMenu->m_hMenu;
 
@@ -269,7 +270,7 @@ void wxMenu::Delete(int id)
 void wxMenu::Enable(int Id, bool Flag)
 {
   wxMenuItem *item = FindItemForId(Id);
-  wxCHECK( item != NULL );
+  wxCHECK_RET( item != NULL, "can't enable non-existing menu item" );
 
   item->Enable(Flag);
 }
@@ -277,7 +278,7 @@ void wxMenu::Enable(int Id, bool Flag)
 bool wxMenu::Enabled(int Id) const
 {
   wxMenuItem *item = FindItemForId(Id);
-  wxCHECK_RET( item != NULL, FALSE );
+  wxCHECK( item != NULL, FALSE );
 
   return item->IsEnabled();
 }
@@ -285,7 +286,7 @@ bool wxMenu::Enabled(int Id) const
 void wxMenu::Check(int Id, bool Flag)
 {
   wxMenuItem *item = FindItemForId(Id);
-  wxCHECK( item != NULL );
+  wxCHECK_RET( item != NULL, "can't get status of non-existing menu item" );
 
   item->Check(Flag);
 }
@@ -293,7 +294,7 @@ void wxMenu::Check(int Id, bool Flag)
 bool wxMenu::Checked(int Id) const
 {
   wxMenuItem *item = FindItemForId(Id);
-  wxCHECK_RET( item != NULL, FALSE );
+  wxCHECK( item != NULL, FALSE );
 
   return item->IsChecked();
 }
@@ -311,7 +312,7 @@ void wxMenu::SetTitle(const wxString& label)
              (UINT)-2, (const char *)m_title);
 }
 
-const wxString& wxMenu::GetTitle() const
+const wxString wxMenu::GetTitle() const
 {
    return m_title;
 }
@@ -370,7 +371,7 @@ wxString wxMenu::GetLabel(int Id) const
   return wxString(tmp) ;
 }
 
-bool wxMenu::MSWCommand(const WXUINT WXUNUSED(param), const WXWORD id)
+bool wxMenu::MSWCommand(WXUINT WXUNUSED(param), WXWORD id)
 {
   wxCommandEvent event(wxEVENT_TYPE_MENU_COMMAND);
   event.SetEventObject( this );
@@ -407,7 +408,7 @@ int wxMenu::FindItem (const wxString& itemString) const
   return -1;
 }
 
-wxMenuItem *wxMenu::FindItemForId(const int itemId, wxMenu ** itemMenu) const
+wxMenuItem *wxMenu::FindItemForId(int itemId, wxMenu ** itemMenu) const
 {
   if (itemMenu)
     *itemMenu = NULL;
@@ -435,14 +436,14 @@ wxMenuItem *wxMenu::FindItemForId(const int itemId, wxMenu ** itemMenu) const
   return NULL;
 }
 
-void wxMenu::SetHelpString(const int itemId, const wxString& helpString)
+void wxMenu::SetHelpString(int itemId, const wxString& helpString)
 {
   wxMenuItem *item = FindItemForId (itemId);
   if (item)
     item->SetHelp(helpString);
 }
 
-wxString wxMenu::GetHelpString (const int itemId) const
+wxString wxMenu::GetHelpString (int itemId) const
 {
   wxMenuItem *item = FindItemForId (itemId);
   wxString str("");
@@ -473,7 +474,7 @@ void wxMenu::ProcessCommand(wxCommandEvent & event)
 }
 
 extern wxMenu *wxCurrentPopupMenu;
-bool wxWindow::PopupMenu(wxMenu *menu, const int x, const int y)
+bool wxWindow::PopupMenu(wxMenu *menu, int x, int y)
 {
   menu->SetInvokingWindow(this);
 
@@ -505,7 +506,7 @@ wxMenuBar::wxMenuBar(void)
   m_hMenu = 0;
 }
 
-wxMenuBar::wxMenuBar(const int N, wxMenu *Menus[], const wxString Titles[])
+wxMenuBar::wxMenuBar(int N, wxMenu *Menus[], const wxString Titles[])
 {
   m_eventHandler = this;
   m_menuCount = N;
@@ -562,7 +563,7 @@ wxMenuBar::~wxMenuBar(void)
 
 // Must only be used AFTER menu has been attached to frame,
 // otherwise use individual menus to enable/disable items
-void wxMenuBar::Enable(const int Id, const bool Flag)
+void wxMenuBar::Enable(int Id, bool Flag)
 {
   int ms_flag;
   if (Flag)
@@ -582,7 +583,7 @@ void wxMenuBar::Enable(const int Id, const bool Flag)
 
 }
 
-void wxMenuBar::EnableTop(const int pos, const bool flag)
+void wxMenuBar::EnableTop(int pos, bool flag)
 {
   int ms_flag;
   if (flag)
@@ -596,7 +597,7 @@ void wxMenuBar::EnableTop(const int pos, const bool flag)
 
 // Must only be used AFTER menu has been attached to frame,
 // otherwise use individual menus
-void wxMenuBar::Check(const int Id, const bool Flag)
+void wxMenuBar::Check(int Id, bool Flag)
 {
   wxMenu *itemMenu = NULL;
   wxMenuItem *item = FindItemForId(Id, &itemMenu) ;
@@ -619,7 +620,7 @@ void wxMenuBar::Check(const int Id, const bool Flag)
 //  CheckMenuItem((HMENU)m_hMenu, Id, MF_BYCOMMAND | ms_flag);
 }
 
-bool wxMenuBar::Checked(const int Id) const
+bool wxMenuBar::Checked(int Id) const
 {
   wxMenu *itemMenu = NULL;
   wxMenuItem *item = FindItemForId(Id, &itemMenu) ;
@@ -641,7 +642,7 @@ bool wxMenuBar::Checked(const int Id) const
     return FALSE ;
 }
 
-bool wxMenuBar::Enabled(const int Id) const
+bool wxMenuBar::Enabled(int Id) const
 {
   wxMenu *itemMenu = NULL;
   wxMenuItem *item = FindItemForId(Id, &itemMenu) ;
@@ -662,7 +663,7 @@ bool wxMenuBar::Enabled(const int Id) const
 }
 
 
-void wxMenuBar::SetLabel(const int Id, const wxString& label)
+void wxMenuBar::SetLabel(int Id, const wxString& label)
 {
   wxMenu *itemMenu = NULL;
   wxMenuItem *item = FindItemForId(Id, &itemMenu) ;
@@ -682,7 +683,7 @@ void wxMenuBar::SetLabel(const int Id, const wxString& label)
   }
 }
 
-wxString wxMenuBar::GetLabel(const int Id) const
+wxString wxMenuBar::GetLabel(int Id) const
 {
   wxMenu *itemMenu = NULL;
   wxMenuItem *item = FindItemForId(Id, &itemMenu) ;
@@ -706,7 +707,7 @@ wxString wxMenuBar::GetLabel(const int Id) const
   return wxString(tmp) ;
 }
 
-void wxMenuBar::SetLabelTop(const int pos, const wxString& label)
+void wxMenuBar::SetLabelTop(int pos, const wxString& label)
 {
   UINT was_flag = GetMenuState((HMENU)m_hMenu,pos,MF_BYPOSITION) ;
   if (was_flag&MF_POPUP)
@@ -719,7 +720,7 @@ void wxMenuBar::SetLabelTop(const int pos, const wxString& label)
     ModifyMenu((HMENU)m_hMenu,pos,MF_BYPOSITION|MF_STRING|was_flag,pos,(const char *)label) ;
 }
 
-wxString wxMenuBar::GetLabelTop(const int pos) const
+wxString wxMenuBar::GetLabelTop(int pos) const
 {
   static char tmp[128] ;
   int len = GetMenuString((HMENU)m_hMenu,pos,tmp,127,MF_BYPOSITION) ;
@@ -727,7 +728,7 @@ wxString wxMenuBar::GetLabelTop(const int pos) const
   return wxString(tmp);
 }
 
-bool wxMenuBar::OnDelete(wxMenu *a_menu, const int pos)
+bool wxMenuBar::OnDelete(wxMenu *a_menu, int pos)
 {
   if (!m_menuBarFrame)
         return TRUE;
@@ -796,7 +797,7 @@ void wxMenuBar::Append (wxMenu * menu, const wxString& title)
   ((wxMenu *)menu)->SetParent(this);
 }
 
-void wxMenuBar::Delete(wxMenu * menu, const int i)
+void wxMenuBar::Delete(wxMenu * menu, int i)
 {
   int j;
   int ii = (int) i;
@@ -843,7 +844,7 @@ int wxMenuBar::FindMenuItem (const wxString& menuString, const wxString& itemStr
   return -1;
 }
 
-wxMenuItem *wxMenuBar::FindItemForId (const int Id, wxMenu ** itemMenu) const
+wxMenuItem *wxMenuBar::FindItemForId (int Id, wxMenu ** itemMenu) const
 {
   if (itemMenu)
     *itemMenu = NULL;
@@ -856,7 +857,7 @@ wxMenuItem *wxMenuBar::FindItemForId (const int Id, wxMenu ** itemMenu) const
   return NULL;
 }
 
-void wxMenuBar::SetHelpString (const int Id, const wxString& helpString)
+void wxMenuBar::SetHelpString (int Id, const wxString& helpString)
 {
   int i;
   for (i = 0; i < m_menuCount; i++)
@@ -869,7 +870,7 @@ void wxMenuBar::SetHelpString (const int Id, const wxString& helpString)
     }
 }
 
-wxString wxMenuBar::GetHelpString (const int Id) const
+wxString wxMenuBar::GetHelpString (int Id) const
 {
   int i;
   for (i = 0; i < m_menuCount; i++)