X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e30285abc6cb45d7e2cd66ddfe3eb460821f57ae..77d2c45c38a3029f64f9e1a1ae042bd86b5d6091:/include/wx/docmdi.h diff --git a/include/wx/docmdi.h b/include/wx/docmdi.h index cd9b1d9b74..a94a48c73d 100644 --- a/include/wx/docmdi.h +++ b/include/wx/docmdi.h @@ -5,17 +5,13 @@ // Modified by: // Created: 01/02/97 // RCS-ID: $Id$ -// Copyright: (c) -// Licence: wxWindows licence +// Copyright: (c) Julian Smart +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_DOCMDI_H_ #define _WX_DOCMDI_H_ -#if defined(__GNUG__) && !defined(__APPLE__) -#pragma interface "docmdi.h" -#endif - #include "wx/defs.h" #if wxUSE_MDI_ARCHITECTURE @@ -27,13 +23,18 @@ * Use this instead of wxMDIParentFrame */ -class WXDLLEXPORT wxDocMDIParentFrame: public wxMDIParentFrame +class WXDLLIMPEXP_CORE wxDocMDIParentFrame: public wxMDIParentFrame { public: + wxDocMDIParentFrame(); wxDocMDIParentFrame(wxDocManager *manager, wxFrame *parent, wxWindowID id, const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxT("frame")); + bool Create(wxDocManager *manager, wxFrame *parent, wxWindowID id, + const wxString& title, const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE, const wxString& name = wxT("frame")); + // Extend event processing to search the document manager's event table virtual bool ProcessEvent(wxEvent& event); @@ -44,6 +45,7 @@ public: void OnCloseWindow(wxCloseEvent& event); protected: + void Init(); wxDocManager *m_docManager; private: @@ -56,13 +58,24 @@ private: * Use this instead of wxMDIChildFrame */ -class WXDLLEXPORT wxDocMDIChildFrame: public wxMDIChildFrame +class WXDLLIMPEXP_CORE wxDocMDIChildFrame: public wxMDIChildFrame { public: + wxDocMDIChildFrame(); wxDocMDIChildFrame(wxDocument *doc, wxView *view, wxMDIParentFrame *frame, wxWindowID id, const wxString& title, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long type = wxDEFAULT_FRAME_STYLE, const wxString& name = wxT("frame")); - ~wxDocMDIChildFrame(); + virtual ~wxDocMDIChildFrame(); + + bool Create(wxDocument *doc, + wxView *view, + wxMDIParentFrame *frame, + wxWindowID id, + const wxString& title, + const wxPoint& pos = wxDefaultPosition, + const wxSize& size = wxDefaultSize, + long type = wxDEFAULT_FRAME_STYLE, + const wxString& name = wxFrameNameStr); // Extend event processing to search the view's event table virtual bool ProcessEvent(wxEvent& event); @@ -75,8 +88,9 @@ public: inline void SetDocument(wxDocument *doc) { m_childDocument = doc; } inline void SetView(wxView *view) { m_childView = view; } bool Destroy() { m_childView = (wxView *)NULL; return wxMDIChildFrame::Destroy(); } - + protected: + void Init(); wxDocument* m_childDocument; wxView* m_childView;