X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/22f3361e1cf25c52a2da8fdfc5cb081809e18fb9..7f7b69e22002543877b0949b66ac3995a615780c:/include/wx/docmdi.h diff --git a/include/wx/docmdi.h b/include/wx/docmdi.h index be6f89a6eb..4754b66a67 100644 --- a/include/wx/docmdi.h +++ b/include/wx/docmdi.h @@ -12,13 +12,13 @@ #ifndef _WX_DOCMDI_H_ #define _WX_DOCMDI_H_ -#if defined(__GNUG__) && !defined(__APPLE__) +#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) #pragma interface "docmdi.h" #endif #include "wx/defs.h" -#if wxUSE_MDI_ARCHITECTURE && wxUSE_DOC_VIEW_ARCHITECTURE +#if wxUSE_MDI_ARCHITECTURE #include "wx/docview.h" #include "wx/mdi.h" @@ -59,11 +59,22 @@ private: class WXDLLEXPORT 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(); + 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); @@ -77,6 +88,7 @@ public: bool Destroy() { m_childView = (wxView *)NULL; return wxMDIChildFrame::Destroy(); } protected: + void Init(); wxDocument* m_childDocument; wxView* m_childView;