X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7f3f059ac5f8e01052f9fb0854e31cb2303e193d..9869c26285dc51d13607cddaa04f65ce983653a5:/include/wx/msw/frame.h diff --git a/include/wx/msw/frame.h b/include/wx/msw/frame.h index b7404bddc2..54ad3beec4 100644 --- a/include/wx/msw/frame.h +++ b/include/wx/msw/frame.h @@ -4,7 +4,6 @@ // Author: Julian Smart // Modified by: // Created: 01/02/97 -// RCS-ID: $Id$ // Copyright: (c) Julian Smart // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -42,7 +41,6 @@ public: // implement base class pure virtuals virtual bool ShowFullScreen(bool show, long style = wxFULLSCREEN_ALL); - virtual void Raise(); // implementation only from now on // ------------------------------- @@ -78,7 +76,6 @@ public: // event handlers bool HandleSize(int x, int y, WXUINT flag); bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control); - bool HandleMenuSelect(WXWORD nItem, WXWORD nFlags, WXHMENU hMenu); // tooltip management #if wxUSE_TOOLTIPS @@ -106,6 +103,9 @@ 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; } + + // Look up the menu in the menu bar. + virtual wxMenu* MSWFindMenuFromHMENU(WXHMENU hMenu); #endif // wxUSE_MENUS protected: @@ -132,9 +132,6 @@ protected: // wxMDIChildFrame bool MSWDoTranslateMessage(wxFrame *frame, WXMSG *msg); - // handle WM_(UN)INITMENUPOPUP message to generate wxEVT_MENU_OPEN/CLOSE - bool HandleMenuPopup(wxEventType evtType, WXHMENU hMenu); - virtual bool IsMDIChild() const { return false; } // get default (wxWidgets) icon for the frame