X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/47b378bd88260611387af8604a1c8f62355350ab..333e57d578e9e0fb6555452b5a53698ffd85ee69:/include/wx/msw/mdi.h diff --git a/include/wx/msw/mdi.h b/include/wx/msw/mdi.h index cd0b21b28d..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 @@ -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)