Removed lots of OnClose functions; doc'ed OnCloseWindow better;

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

diff --git a/src/msw/menu.cpp b/src/msw/menu.cpp
index b46c88c3ed1bdfc000f74fe4567f67c110b8345e..2278e11d3f45c0b34362b7f23374296b8df1c6d2 100644 (file)
--- a/src/msw/menu.cpp
+++ b/src/msw/menu.cpp
@@ -73,6 +73,8 @@ wxMenu::wxMenu(const wxString& Title, const wxFunction func)
   m_hMenu = (WXHMENU) CreatePopupMenu();
   m_savehMenu = 0 ;
   m_topLevelMenu = this;
   m_hMenu = (WXHMENU) CreatePopupMenu();
   m_savehMenu = 0 ;
   m_topLevelMenu = this;

+  m_clientData = (void*) NULL;
+

   if (m_title != "")
   {
     Append(idMenuTitle, m_title) ;
   if (m_title != "")
   {
     Append(idMenuTitle, m_title) ;


@@ -229,10 +231,10 @@ void wxMenu::Append(int Id, const wxString& label,
 void wxMenu::Delete(int id)
 {
   wxNode *node;
 void wxMenu::Delete(int id)
 {
   wxNode *node;

-  wxMenuItem *item;

   int pos;
   HMENU menu;
 
   int pos;
   HMENU menu;
 

+  wxMenuItem *item = NULL;

   for (pos = 0, node = m_menuItems.First(); node; node = node->Next(), pos++) {
         item = (wxMenuItem *)node->Data();
         if (item->GetId() == id)
   for (pos = 0, node = m_menuItems.First(); node; node = node->Next(), pos++) {
         item = (wxMenuItem *)node->Data();
         if (item->GetId() == id)


@@ -308,9 +310,9 @@ void wxMenu::SetTitle(const wxString& label)
   {
     if ( !label.IsEmpty() )
     {
   {
     if ( !label.IsEmpty() )
     {

-      if ( !InsertMenu(hMenu, 0, MF_BYPOSITION | MF_STRING,
-                       idMenuTitle, m_title) ||
-           !InsertMenu(hMenu, 1, MF_BYPOSITION, -1, NULL) )
+      if ( !InsertMenu(hMenu, 0u, MF_BYPOSITION | MF_STRING,
+                       (unsigned)idMenuTitle, m_title) ||
+           !InsertMenu(hMenu, 1u, MF_BYPOSITION, (unsigned)-1, NULL) )

       {
         wxLogLastError("InsertMenu");
       }
       {
         wxLogLastError("InsertMenu");
       }


@@ -330,9 +332,9 @@ void wxMenu::SetTitle(const wxString& label)
     else
     {
       // modify the title
     else
     {
       // modify the title

-      if ( !ModifyMenu(hMenu, 0,
+      if ( !ModifyMenu(hMenu, 0u,

                        MF_BYPOSITION | MF_STRING,
                        MF_BYPOSITION | MF_STRING,

-                       idMenuTitle, m_title) )
+                       (unsigned)idMenuTitle, m_title) )

       {
         wxLogLastError("ModifyMenu");
       }
       {
         wxLogLastError("ModifyMenu");
       }


@@ -411,7 +413,7 @@ wxString wxMenu::GetLabel(int id) const
 
 bool wxMenu::MSWCommand(WXUINT WXUNUSED(param), WXWORD id)
 {
 
 bool wxMenu::MSWCommand(WXUINT WXUNUSED(param), WXWORD id)
 {

-  wxCommandEvent event(wxEVENT_TYPE_MENU_COMMAND);
+  wxCommandEvent event(wxEVT_COMMAND_MENU_SELECTED);

   event.SetEventObject( this );
   event.SetId( id );
   event.SetInt( id );
   event.SetEventObject( this );
   event.SetId( id );
   event.SetInt( id );


@@ -484,8 +486,10 @@ void wxMenu::SetHelpString(int itemId, const wxString& helpString)
 wxString wxMenu::GetHelpString (int itemId) const
 {
   wxMenuItem *item = FindItemForId (itemId);
 wxString wxMenu::GetHelpString (int itemId) const
 {
   wxMenuItem *item = FindItemForId (itemId);

-  wxString str("");
-  return (item == NULL) ? str : item->GetHelp();
+  if (item)
+    return item->GetHelp();
+  else
+    return wxEmptyString;

 }
 
 void wxMenu::ProcessCommand(wxCommandEvent & event)
 }
 
 void wxMenu::ProcessCommand(wxCommandEvent & event)


@@ -508,7 +512,7 @@ void wxMenu::ProcessCommand(wxCommandEvent & event)
   // Try the window the menu was popped up from (and up
   // through the hierarchy)
   if ( !processed && GetInvokingWindow())
   // Try the window the menu was popped up from (and up
   // through the hierarchy)
   if ( !processed && GetInvokingWindow())

-    processed = GetInvokingWindow()->ProcessEvent(event);
+    processed = GetInvokingWindow()->GetEventHandler()->ProcessEvent(event);

 }
 
 extern wxMenu *wxCurrentPopupMenu;
 }
 
 extern wxMenu *wxCurrentPopupMenu;


@@ -665,7 +669,7 @@ bool wxMenuBar::Checked(int Id) const
   if (!item)
     return FALSE;
 
   if (!item)
     return FALSE;
 

-  int Flag ;
+  int Flag = 0;

 
   if (itemMenu->m_hMenu)
     Flag=GetMenuState((HMENU)itemMenu->m_hMenu, Id, MF_BYCOMMAND) ;
 
   if (itemMenu->m_hMenu)
     Flag=GetMenuState((HMENU)itemMenu->m_hMenu, Id, MF_BYCOMMAND) ;


@@ -890,8 +894,11 @@ wxMenuItem *wxMenuBar::FindItemForId (int Id, wxMenu ** itemMenu) const
   wxMenuItem *item = NULL;
   int i;
   for (i = 0; i < m_menuCount; i++)
   wxMenuItem *item = NULL;
   int i;
   for (i = 0; i < m_menuCount; i++)

-    if ((item = m_menus[i]->FindItemForId (Id, itemMenu)))
+  {
+    item = m_menus[i]->FindItemForId (Id, itemMenu);
+    if (item)

       return item;
       return item;

+  }

   return NULL;
 }
 
   return NULL;
 }