use generic timer in wxMGL and wxX11

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

diff --git a/include/wx/docmdi.h b/include/wx/docmdi.h
index 43c4d9d8715ef5f8db4e40d7cf6566cd11fadd58..1e3047bdd8bd77196fc900607a0151da9e3e3180 100644 (file)
--- a/include/wx/docmdi.h
+++ b/include/wx/docmdi.h
@@ -16,6 +16,10 @@
 #pragma interface "docmdi.h"
 #endif
 
 #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"
 
 #include "wx/docview.h"
 #include "wx/mdi.h"
 


@@ -23,7 +27,7 @@
  * Use this instead of wxMDIParentFrame
  */
 
  * Use this instead of wxMDIParentFrame
  */
 

-class wxDocMDIParentFrame: public wxMDIParentFrame
+class WXDLLEXPORT wxDocMDIParentFrame: public wxMDIParentFrame

 {
   DECLARE_CLASS(wxDocMDIParentFrame)
  public:
 {
   DECLARE_CLASS(wxDocMDIParentFrame)
  public:


@@ -71,6 +75,7 @@ class WXDLLEXPORT wxDocMDIChildFrame: public wxMDIChildFrame
   inline wxView *GetView(void) const { return m_childView; }
   inline void SetDocument(wxDocument *doc) { m_childDocument = doc; }
   inline void SetView(wxView *view) { m_childView = view; }
   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;
  protected:
   wxDocument*       m_childDocument;
   wxView*           m_childView;


@@ -79,5 +84,8 @@ DECLARE_EVENT_TABLE()
 
 };
 
 
 };
 

+#endif
+    // wxUSE_MDI_ARCHITECTURE
+

 #endif
     // _WX_DOCMDI_H_
 #endif
     // _WX_DOCMDI_H_