X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0bba37f51ded370ee79e26916c4c94ce5dc1f44e..27ed553558b1fa6d577fa7bbe738bae57a174f80:/include/wx/mac/carbon/mdi.h diff --git a/include/wx/mac/carbon/mdi.h b/include/wx/mac/carbon/mdi.h index eb55fff2a1..2bb1d94beb 100644 --- a/include/wx/mac/carbon/mdi.h +++ b/include/wx/mac/carbon/mdi.h @@ -14,14 +14,10 @@ #ifndef _WX_MDI_H_ #define _WX_MDI_H_ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface "mdi.h" -#endif - #include "wx/frame.h" -WXDLLEXPORT_DATA(extern const wxChar*) wxFrameNameStr; -WXDLLEXPORT_DATA(extern const wxChar*) wxStatusLineNameStr; +WXDLLEXPORT_DATA(extern const wxChar) wxFrameNameStr[]; +WXDLLEXPORT_DATA(extern const wxChar) wxStatusLineNameStr[]; class WXDLLEXPORT wxMDIClientWindow; class WXDLLEXPORT wxMDIChildFrame; @@ -32,15 +28,16 @@ class WXDLLEXPORT wxMDIParentFrame: public wxFrame public: - wxMDIParentFrame(); - inline wxMDIParentFrame(wxWindow *parent, - wxWindowID id, - const wxString& title, - const wxPoint& pos = wxDefaultPosition, - const wxSize& size = wxDefaultSize, - long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL, // Scrolling refers to client window - const wxString& name = wxFrameNameStr) + wxMDIParentFrame() { Init(); } + wxMDIParentFrame(wxWindow *parent, + wxWindowID id, + const wxString& title, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long style = wxDEFAULT_FRAME_STYLE | wxVSCROLL | wxHSCROLL, // Scrolling refers to client window + const wxString& name = wxFrameNameStr) { + Init(); Create(parent, id, title, pos, size, style, name); } @@ -77,26 +74,41 @@ public: // MDI operations virtual void Cascade(); - virtual void Tile(); + virtual void Tile(wxOrientation WXUNUSED(orient) = wxHORIZONTAL); virtual void ArrangeIcons(); virtual void ActivateNext(); virtual void ActivatePrevious(); virtual bool Show( bool show = true ); + // overridden base clas virtuals + virtual void AddChild(wxWindowBase *child); + virtual void RemoveChild(wxWindowBase *child); + protected: + // common part of all ctors + void Init(); + + // returns true if this frame has some contents and so should be visible, + // false if it's used solely as container for its children + bool ShouldBeVisible() const; + - // TODO maybe have this member - wxMDIClientWindow *m_clientWindow; - wxMDIChildFrame * m_currentChild; - wxMenu* m_windowMenu; + // TODO maybe have this member + wxMDIClientWindow *m_clientWindow; + wxMDIChildFrame *m_currentChild; + wxMenu *m_windowMenu; - // TRUE if MDI Frame is intercepting commands, not child + // true if MDI Frame is intercepting commands, not child bool m_parentFrameActive; + // true if the frame should be shown but is not because it is empty and + // useless otherwise than a container for its children + bool m_shouldBeShown; + private: friend class WXDLLEXPORT wxMDIChildFrame; -DECLARE_EVENT_TABLE() + DECLARE_EVENT_TABLE() }; class WXDLLEXPORT wxMDIChildFrame: public wxFrame @@ -167,15 +179,14 @@ class WXDLLEXPORT wxMDIClientWindow: public wxWindow // Note: this is virtual, to allow overridden behaviour. virtual bool CreateClient(wxMDIParentFrame *parent, long style = wxVSCROLL | wxHSCROLL); - // Gets the size available for subwindows after menu size, toolbar size - // and status bar size have been subtracted. If you want to manage your own - // toolbar(s), don't call SetToolBar. - void DoGetClientSize(int *width, int *height) const; - // Explicitly call default scroll behaviour void OnScroll(wxScrollEvent& event); protected: + // Gets the size available for subwindows after menu size, toolbar size + // and status bar size have been subtracted. If you want to manage your own + // toolbar(s), don't call SetToolBar. + void DoGetClientSize(int *width, int *height) const; DECLARE_EVENT_TABLE() };