X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/225fe9d6efa8294e0582a046dee2c4c608bd06dc..748fcded3c795db266076aac381aa335cc4aa42d:/include/wx/msw/mdi.h diff --git a/include/wx/msw/mdi.h b/include/wx/msw/mdi.h index 62d3657dd3..b65c21f750 100644 --- a/include/wx/msw/mdi.h +++ b/include/wx/msw/mdi.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: mdi.h +// Name: wx/msw/mdi.h // Purpose: MDI (Multiple Document Interface) classes // Author: Julian Smart // Modified by: @@ -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) }; // --------------------------------------------------------------------------- @@ -121,7 +123,7 @@ private: class WXDLLEXPORT wxMDIChildFrame : public wxFrame { public: - wxMDIChildFrame(); + wxMDIChildFrame() { Init(); } wxMDIChildFrame(wxMDIParentFrame *parent, wxWindowID id, const wxString& title, @@ -130,6 +132,8 @@ public: long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxFrameNameStr) { + Init(); + Create(parent, id, title, pos, size, style, name); } @@ -150,11 +154,14 @@ public: virtual void Restore(); virtual void Activate(); - // Handlers + // Implementation only from now on + // ------------------------------- + // Handlers 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); @@ -162,14 +169,25 @@ public: virtual void MSWDestroyWindow(); - // Implementation bool ResetWindowStyle(void *vrect); + void OnIdle(wxIdleEvent& event); + protected: virtual void DoGetPosition(int *x, int *y) const; virtual void DoSetClientSize(int width, int height); virtual void InternalSetMenuBar(); + virtual bool IsMDIChild() const { return TRUE; } + virtual WXHICON GetDefaultIcon() const; + + // common part of all ctors + void Init(); + +private: + bool m_needsResize; // flag which tells us to artificially resize the frame + + DECLARE_EVENT_TABLE() DECLARE_DYNAMIC_CLASS(wxMDIChildFrame) }; @@ -179,8 +197,6 @@ protected: class WXDLLEXPORT wxMDIClientWindow : public wxWindow { - DECLARE_DYNAMIC_CLASS(wxMDIClientWindow) - public: wxMDIClientWindow() { Init(); } wxMDIClientWindow(wxMDIParentFrame *parent, long style = 0) @@ -197,6 +213,9 @@ public: // Explicitly call default scroll behaviour void OnScroll(wxScrollEvent& event); + virtual void DoSetSize(int x, int y, + int width, int height, + int sizeFlags = wxSIZE_AUTO); protected: void Init() { m_scrollX = m_scrollY = 0; } @@ -204,6 +223,7 @@ protected: private: DECLARE_EVENT_TABLE() + DECLARE_DYNAMIC_CLASS(wxMDIClientWindow) }; #endif