changed wxYES_NO to be equal to wxYES | wxNO freeing another style bit which allows...

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

diff --git a/include/wx/docmdi.h b/include/wx/docmdi.h
index 195b6126f775b20c3baa830ae94b3ff1fc319a85..1e3047bdd8bd77196fc900607a0151da9e3e3180 100644 (file)
--- a/include/wx/docmdi.h
+++ b/include/wx/docmdi.h
@@ -16,6 +16,10 @@
 #pragma interface "docmdi.h"
 #endif
 
+#include "wx/defs.h"
+
+#if wxUSE_MDI_ARCHITECTURE && wxUSE_DOC_VIEW_ARCHITECTURE
+
 #include "wx/docview.h"
 #include "wx/mdi.h"
 
@@ -23,7 +27,7 @@
  * Use this instead of wxMDIParentFrame
  */
 
-class wxDocMDIParentFrame: public wxMDIParentFrame
+class WXDLLEXPORT wxDocMDIParentFrame: public wxMDIParentFrame
 {
   DECLARE_CLASS(wxDocMDIParentFrame)
  public:
@@ -31,7 +35,6 @@ class wxDocMDIParentFrame: public wxMDIParentFrame
       const wxString& title, const wxPoint& pos = wxDefaultPosition,
       const wxSize& size = wxDefaultSize, long style = wxDEFAULT_FRAME_STYLE, const wxString& name = "frame");
 
-  bool OnClose(void);
   // Extend event processing to search the document manager's event table
   virtual bool ProcessEvent(wxEvent& event);
 
@@ -39,6 +42,7 @@ class wxDocMDIParentFrame: public wxMDIParentFrame
 
   void OnExit(wxCommandEvent& event);
   void OnMRUFile(wxCommandEvent& event);
+  void OnCloseWindow(wxCloseEvent& event);
 
  protected:
   wxDocManager *m_docManager;
@@ -61,16 +65,17 @@ class WXDLLEXPORT wxDocMDIChildFrame: public wxMDIChildFrame
     long type = wxDEFAULT_FRAME_STYLE, const wxString& name = "frame");
   ~wxDocMDIChildFrame(void);
 
-  bool OnClose(void);
   // Extend event processing to search the view's event table
   virtual bool ProcessEvent(wxEvent& event);
 
   void OnActivate(wxActivateEvent& event);
+  void OnCloseWindow(wxCloseEvent& event);
 
   inline wxDocument *GetDocument(void) const { return m_childDocument; }
   inline wxView *GetView(void) const { return m_childView; }
   inline void SetDocument(wxDocument *doc) { m_childDocument = doc; }
   inline void SetView(wxView *view) { m_childView = view; }
+  bool Destroy() { m_childView = (wxView *)NULL; return wxFrame::Destroy(); }
  protected:
   wxDocument*       m_childDocument;
   wxView*           m_childView;
@@ -79,5 +84,8 @@ DECLARE_EVENT_TABLE()
 
 };
 
+#endif
+    // wxUSE_MDI_ARCHITECTURE
+
 #endif
     // _WX_DOCMDI_H_