X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d3c7fc996a73e9f6a83067bc28a3c5581a3fee65..f196316400fd247a760b2ef77d5064b4e10e5471:/include/wx/msw/mdi.h?ds=inline diff --git a/include/wx/msw/mdi.h b/include/wx/msw/mdi.h index 2148e5ab0a..8366985ec7 100644 --- a/include/wx/msw/mdi.h +++ b/include/wx/msw/mdi.h @@ -16,8 +16,8 @@ extern WXDLLEXPORT_DATA(const wxChar) wxStatusLineNameStr[]; -class WXDLLEXPORT wxMDIClientWindow; -class WXDLLEXPORT wxMDIChildFrame; +class WXDLLIMPEXP_FWD_CORE wxMDIClientWindow; +class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame; // --------------------------------------------------------------------------- // wxMDIParentFrame @@ -62,7 +62,7 @@ public: virtual wxMDIClientWindow *OnCreateClient(void); // MDI windows menu - wxMenu* GetWindowMenu() const { return m_windowMenu; }; + wxMenu* GetWindowMenu() const { return m_windowMenu; } void SetWindowMenu(wxMenu* menu) ; virtual void DoMenuUpdates(wxMenu* menu = NULL); @@ -92,6 +92,9 @@ public: virtual WXLRESULT MSWDefWindowProc(WXUINT, WXWPARAM, WXLPARAM); virtual bool MSWTranslateMessage(WXMSG* msg); + // override wxFrameBase function to also look in the active child menu bar + virtual const wxMenuItem *FindItemInMenuBar(int menuId) const; + protected: #if wxUSE_MENUS_NATIVE virtual void InternalSetMenuBar(); @@ -111,7 +114,7 @@ protected: bool m_parentFrameActive; private: - friend class WXDLLEXPORT wxMDIChildFrame; + friend class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame; DECLARE_EVENT_TABLE() DECLARE_DYNAMIC_CLASS(wxMDIParentFrame) @@ -178,6 +181,7 @@ public: virtual bool Show(bool show = true); protected: + virtual void DoGetScreenPosition(int *x, int *y) const; virtual void DoGetPosition(int *x, int *y) const; virtual void DoSetClientSize(int width, int height); virtual void InternalSetMenuBar();