remove the recently added MSWFindMenuBarItem() as we already had FindItemInMenuBar...

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58478 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/include/wx/frame.h b/include/wx/frame.h
index fe6694fbc746c13b0b5f7a1fc93f8762ef499b31..82588b26e38e23e158ac7bfcb9ac82f51003e4c8 100644 (file)
--- a/include/wx/frame.h
+++ b/include/wx/frame.h
@@ -83,7 +83,7 @@ public:
     // find the item by id in the frame menu bar: this is an internal function
     // and exists mainly in order to be overridden in the MDI parent frame
     // which also looks at its active child menu bar
     // find the item by id in the frame menu bar: this is an internal function
     // and exists mainly in order to be overridden in the MDI parent frame
     // which also looks at its active child menu bar

-    virtual const wxMenuItem *FindItemInMenuBar(int menuId) const;
+    virtual wxMenuItem *FindItemInMenuBar(int menuId) const;

 
     // generate menu command corresponding to the given menu item
     //
 
     // generate menu command corresponding to the given menu item
     //

diff --git a/include/wx/msw/frame.h b/include/wx/msw/frame.h
index e43cc2247e3ad6e5679b4c6da4bf298de5a92bd1..348853262afa6d1e77e50492601fe583cb4ce8bd 100644 (file)
--- a/include/wx/msw/frame.h
+++ b/include/wx/msw/frame.h
@@ -107,9 +107,6 @@ public:
     // get the currently active menu: this is the same as the frame menu for
     // normal frames but is overridden by wxMDIParentFrame
     virtual WXHMENU MSWGetActiveMenu() const { return m_hMenu; }
     // get the currently active menu: this is the same as the frame menu for
     // normal frames but is overridden by wxMDIParentFrame
     virtual WXHMENU MSWGetActiveMenu() const { return m_hMenu; }

-
-    // find the item in our menu bar: this is again a hook for MDI frames
-    virtual wxMenuItem *MSWFindMenuBarItem(WXWORD id);

 #endif // wxUSE_MENUS
 
 protected:
 #endif // wxUSE_MENUS
 
 protected:

diff --git a/include/wx/msw/mdi.h b/include/wx/msw/mdi.h
index 127cc968ba617792656e6d979943f3db88bbe225..857f9bed3cd5223c5612a179b22d4285ed6d0c16 100644 (file)
--- a/include/wx/msw/mdi.h
+++ b/include/wx/msw/mdi.h
@@ -104,8 +104,8 @@ public:
 
 #if wxUSE_MENUS
     // override wxFrameBase function to also look in the active child menu bar
 
 #if wxUSE_MENUS
     // override wxFrameBase function to also look in the active child menu bar

-    virtual const wxMenuItem *FindItemInMenuBar(int menuId) const;
-    virtual wxMenuItem *MSWFindMenuBarItem(WXWORD id);
+    // and the "Window" menu
+    virtual wxMenuItem *FindItemInMenuBar(int menuId) const;

 #endif // wxUSE_MENUS
 
 protected:
 #endif // wxUSE_MENUS
 
 protected:

diff --git a/src/common/framecmn.cpp b/src/common/framecmn.cpp
index baab1cfa3e03166fba05b0dacf972f010ff1d8ca..df7261eefcfcf6c854770245843f1d3ca125baee 100644 (file)
--- a/src/common/framecmn.cpp
+++ b/src/common/framecmn.cpp
@@ -551,7 +551,7 @@ void wxFrameBase::SetMenuBar(wxMenuBar *menubar)
     this->AttachMenuBar(menubar);
 }
 
     this->AttachMenuBar(menubar);
 }
 

-const wxMenuItem *wxFrameBase::FindItemInMenuBar(int menuId) const
+wxMenuItem *wxFrameBase::FindItemInMenuBar(int menuId) const

 {
     const wxMenuBar * const menuBar = GetMenuBar();
 
 {
     const wxMenuBar * const menuBar = GetMenuBar();
 

diff --git a/src/msw/frame.cpp b/src/msw/frame.cpp
index 774e99e27bb09a991b96fd25e388a3a28616f363..2559981536a2257c101ff077ee4f63d0637bac14 100644 (file)
--- a/src/msw/frame.cpp
+++ b/src/msw/frame.cpp
@@ -901,7 +901,7 @@ bool wxFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND control)
         if ( !wxCurrentPopupMenu )
 #endif // wxUSE_MENUS_NATIVE
         {
         if ( !wxCurrentPopupMenu )
 #endif // wxUSE_MENUS_NATIVE
         {

-            wxMenuItem * const mitem = MSWFindMenuBarItem(id);
+            wxMenuItem * const mitem = FindItemInMenuBar((signed short)id);

             if ( mitem )
                 return ProcessCommand(mitem);
         }
             if ( mitem )
                 return ProcessCommand(mitem);
         }


@@ -913,12 +913,6 @@ bool wxFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND control)
 
 #if wxUSE_MENUS
 
 
 #if wxUSE_MENUS
 

-wxMenuItem *wxFrame::MSWFindMenuBarItem(WXWORD id)
-{
-    wxMenuBar * const mbar = GetMenuBar();
-    return mbar ? mbar->FindItem((signed short)id) : NULL;
-}
-

 bool wxFrame::HandleMenuSelect(WXWORD nItem, WXWORD flags, WXHMENU hMenu)
 {
     int item;
 bool wxFrame::HandleMenuSelect(WXWORD nItem, WXWORD flags, WXHMENU hMenu)
 {
     int item;

diff --git a/src/msw/mdi.cpp b/src/msw/mdi.cpp
index af398a3de6ce0e1e2652c855ee4861af3ed25635..0a72ab2ea7abdb06c253ad09b84e797dd984fd52 100644 (file)
--- a/src/msw/mdi.cpp
+++ b/src/msw/mdi.cpp
@@ -406,14 +406,17 @@ void wxMDIParentFrame::DoMenuUpdates(wxMenu* menu)
     }
 }
 
     }
 }
 

-const wxMenuItem *wxMDIParentFrame::FindItemInMenuBar(int menuId) const
+wxMenuItem *wxMDIParentFrame::FindItemInMenuBar(int menuId) const

 {
 {

-    const wxMenuItem *item = wxFrame::FindItemInMenuBar(menuId);
+    wxMenuItem *item = wxFrame::FindItemInMenuBar(menuId);

     if ( !item && GetActiveChild() )
     {
         item = GetActiveChild()->FindItemInMenuBar(menuId);
     }
 
     if ( !item && GetActiveChild() )
     {
         item = GetActiveChild()->FindItemInMenuBar(menuId);
     }
 

+    if ( !item && m_windowMenu )
+        item = m_windowMenu->FindItem(menuId);
+

     return item;
 }
 
     return item;
 }
 


@@ -683,15 +686,6 @@ void wxMDIParentFrame::OnMDICommand(wxCommandEvent& event)
     ::SendMessage(GetWinHwnd(GetClientWindow()), msg, wParam, lParam);
 }
 
     ::SendMessage(GetWinHwnd(GetClientWindow()), msg, wParam, lParam);
 }
 

-wxMenuItem *wxMDIParentFrame::MSWFindMenuBarItem(WXWORD id)
-{
-    wxMenuItem *mitem = wxFrame::MSWFindMenuBarItem(id);
-    if ( !mitem && m_windowMenu )
-        mitem = m_windowMenu->FindItem((signed short)id);
-
-    return mitem;
-}
-

 #endif // wxUSE_MENUS
 
 bool wxMDIParentFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND hwnd)
 #endif // wxUSE_MENUS
 
 bool wxMDIParentFrame::HandleCommand(WXWORD id, WXWORD cmd, WXHWND hwnd)