X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7c74e7fe1de14f32dcd6f3c9cdd727de540bbd0e..e5ee4c908b9dbcf07f0441aa74d8635b7343be4d:/include/wx/mac/mdi.h diff --git a/include/wx/mac/mdi.h b/include/wx/mac/mdi.h index 93038739f8..091021d0fc 100644 --- a/include/wx/mac/mdi.h +++ b/include/wx/mac/mdi.h @@ -28,9 +28,8 @@ class WXDLLEXPORT wxMDIChildFrame; class WXDLLEXPORT wxMDIParentFrame: public wxFrame { -DECLARE_DYNAMIC_CLASS(wxMDIParentFrame) + DECLARE_DYNAMIC_CLASS(wxMDIParentFrame) - friend class WXDLLEXPORT wxMDIChildFrame; public: wxMDIParentFrame(); @@ -87,7 +86,14 @@ protected: // TODO maybe have this member wxMDIClientWindow *m_clientWindow; + wxMDIChildFrame * m_currentChild; + wxMenu* m_windowMenu; + // TRUE if MDI Frame is intercepting commands, not child + bool m_parentFrameActive; + +private: + friend class WXDLLEXPORT wxMDIChildFrame; DECLARE_EVENT_TABLE() }; @@ -105,6 +111,7 @@ public: long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxFrameNameStr) { + Init() ; Create(parent, id, title, pos, size, style, name); } @@ -120,14 +127,16 @@ public: // Set menu bar void SetMenuBar(wxMenuBar *menu_bar); - void SetClientSize(int width, int height); - void GetPosition(int *x, int *y) const ; // MDI operations virtual void Maximize(); virtual void Maximize( bool ){ Maximize() ; } // this one is inherited from wxFrame virtual void Restore(); virtual void Activate(); +protected: + + // common part of all ctors + void Init(); }; /* The client window is a child of the parent MDI frame, and itself