X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/b5dbe15d0bacde245539f54c4d97af6b4696f01f..b04237742c51e022af8ca8fe8933437734f392a3:/include/wx/cocoa/mdi.h?ds=inline diff --git a/include/wx/cocoa/mdi.h b/include/wx/cocoa/mdi.h index 4328334ca0..ae219e9976 100644 --- a/include/wx/cocoa/mdi.h +++ b/include/wx/cocoa/mdi.h @@ -2,10 +2,11 @@ // Name: wx/cocoa/mdi.h // Purpose: wxMDIParentFrame, wxMDIChildFrame, wxMDIClientWindow // Author: David Elliott -// Modified by: +// Modified by: 2008-10-31 Vadim Zeitlin: derive from the base classes // Created: 2003/09/08 // RCS-ID: $Id$ // Copyright: (c) 2003 David Elliott +// (c) 2008 Vadim Zeitlin // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -19,12 +20,12 @@ DECLARE_WXCOCOA_OBJC_CLASS(wxMDIParentFrameObserver); class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame; class WXDLLIMPEXP_FWD_CORE wxMDIClientWindow; -WX_DECLARE_LIST(wxMDIChildFrame, wxCocoaMDIChildFrameList); +WX_DECLARE_EXPORTED_LIST(wxMDIChildFrame, wxCocoaMDIChildFrameList); // ======================================================================== // wxMDIParentFrame // ======================================================================== -class WXDLLEXPORT wxMDIParentFrame: public wxFrame +class WXDLLIMPEXP_CORE wxMDIParentFrame : public wxMDIParentFrameBase { friend class WXDLLIMPEXP_FWD_CORE wxMDIChildFrame; DECLARE_EVENT_TABLE() @@ -76,17 +77,16 @@ protected: // Implementation // ------------------------------------------------------------------------ public: - wxMDIChildFrame *GetActiveChild() const; void SetActiveChild(wxMDIChildFrame *child); - wxMDIClientWindow *GetClientWindow() const; - virtual wxMDIClientWindow *OnCreateClient(); + // implement base class pure virtuals + // ---------------------------------- + + static bool IsTDI() { return false; } + + virtual void ActivateNext() { /* TODO */ } + virtual void ActivatePrevious() { /* TODO */ } - virtual void Cascade() {} - virtual void Tile(wxOrientation WXUNUSED(orient) = wxHORIZONTAL) {} - virtual void ArrangeIcons() {} - virtual void ActivateNext(); - virtual void ActivatePrevious(); protected: wxMDIClientWindow *m_clientWindow; wxMDIChildFrame *m_currentChild; @@ -96,7 +96,7 @@ protected: // ======================================================================== // wxMDIChildFrame // ======================================================================== -class WXDLLEXPORT wxMDIChildFrame: public wxFrame +class WXDLLIMPEXP_CORE wxMDIChildFrame: public wxFrame { friend class WXDLLIMPEXP_FWD_CORE wxMDIParentFrame; DECLARE_EVENT_TABLE() @@ -150,14 +150,15 @@ protected: // ======================================================================== // wxMDIClientWindow // ======================================================================== -class wxMDIClientWindow: public wxWindow +class wxMDIClientWindow : public wxMDIClientWindowBase { - DECLARE_DYNAMIC_CLASS(wxMDIClientWindow) public: - wxMDIClientWindow(); - wxMDIClientWindow( wxMDIParentFrame *parent, long style = 0 ); - virtual ~wxMDIClientWindow(); - virtual bool CreateClient( wxMDIParentFrame *parent, long style = 0 ); + wxMDIClientWindow() { } + + virtual bool CreateClient(wxMDIParentFrame *parent, + long style = wxHSCROLL | wxVSCROLL); + + DECLARE_DYNAMIC_CLASS(wxMDIClientWindow) }; #endif // __WX_COCOA_MDI_H__