don't define _CRTDBG_MAP_ALLOC as it is apparently unnecessary (patch 995135)

[wxWidgets.git] / include / wx / docmdi.h

diff --git a/include/wx/docmdi.h b/include/wx/docmdi.h
index 089a328ce42ac3249ec589ce97f61ad2ba9c45f0..c8e94f3159e39a598c72a2e40c8180d6267effda 100644 (file)
--- 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"
@@ -30,10 +30,15 @@
 class WXDLLEXPORT 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,11 +49,13 @@ public:
     void OnCloseWindow(wxCloseEvent& event);
 
 protected:
+    void Init();
     wxDocManager *m_docManager;
 
 private:
     DECLARE_CLASS(wxDocMDIParentFrame)
     DECLARE_EVENT_TABLE()
+    DECLARE_NO_COPY_CLASS(wxDocMDIParentFrame)
 };
 
 /*
@@ -58,11 +65,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);
 
@@ -76,12 +94,14 @@ public:
     bool Destroy() { m_childView = (wxView *)NULL; return wxMDIChildFrame::Destroy(); }
     
 protected:
+    void Init();
     wxDocument*       m_childDocument;
     wxView*           m_childView;
 
 private:
     DECLARE_EVENT_TABLE()
     DECLARE_CLASS(wxDocMDIChildFrame)
+    DECLARE_NO_COPY_CLASS(wxDocMDIChildFrame)
 };
 
 #endif