X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/91dd52fe3ba8275366cf26a729f00a6a59d34855..14dd645ee16eb022afb19f35d0c8cfdf2d3cdee9:/include/wx/msw/mdi.h diff --git a/include/wx/msw/mdi.h b/include/wx/msw/mdi.h index 891aaff8c5..b65c21f750 100644 --- a/include/wx/msw/mdi.h +++ b/include/wx/msw/mdi.h @@ -30,8 +30,6 @@ class WXDLLEXPORT wxMDIChildFrame; class WXDLLEXPORT wxMDIParentFrame : public wxFrame { - DECLARE_DYNAMIC_CLASS(wxMDIParentFrame) - public: wxMDIParentFrame(); wxMDIParentFrame(wxWindow *parent, @@ -98,11 +96,14 @@ public: virtual bool MSWTranslateMessage(WXMSG* msg); protected: +#if wxUSE_MENUS_NATIVE virtual void InternalSetMenuBar(); +#endif // wxUSE_MENUS_NATIVE + + virtual WXHICON GetDefaultIcon() const; wxMDIClientWindow * m_clientWindow; wxMDIChildFrame * m_currentChild; -// WXHMENU m_windowMenu; wxMenu* m_windowMenu; // TRUE if MDI Frame is intercepting commands, not child @@ -112,6 +113,7 @@ private: friend class WXDLLEXPORT wxMDIChildFrame; DECLARE_EVENT_TABLE() + DECLARE_DYNAMIC_CLASS(wxMDIParentFrame) }; // --------------------------------------------------------------------------- @@ -159,6 +161,7 @@ public: bool HandleMDIActivate(long bActivate, WXHWND, WXHWND); bool HandleWindowPosChanging(void *lpPos); bool HandleCommand(WXWORD id, WXWORD cmd, WXHWND control); + bool HandleGetMinMaxInfo(void *mmInfo); virtual long MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam); virtual long MSWDefWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM lParam); @@ -176,6 +179,8 @@ protected: virtual void InternalSetMenuBar(); virtual bool IsMDIChild() const { return TRUE; } + virtual WXHICON GetDefaultIcon() const; + // common part of all ctors void Init();