Replaced typedef with #define for VC++ 1.5, to prevent 'no constructor' error

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

diff --git a/include/wx/docmdi.h b/include/wx/docmdi.h
index e0e3e6fe6605eff7014444d5d46bd750725fe494..0216cacdd7dd3a5e3cbf1a319a5142cc59bf3d10 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,14 +27,14 @@
  * 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:

-  wxDocMDIParentFrame(wxDocManager *manager, wxFrame *frame, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size,
-    long style, const wxString& name);
+  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 = "frame");

 
 

-  bool OnClose(void);

   // Extend event processing to search the document manager's event table
   virtual bool ProcessEvent(wxEvent& event);
 
   // Extend event processing to search the document manager's event table
   virtual bool ProcessEvent(wxEvent& event);
 


@@ -38,6 +42,7 @@ class wxDocMDIParentFrame: public wxMDIParentFrame
 
   void OnExit(wxCommandEvent& event);
   void OnMRUFile(wxCommandEvent& event);
 
   void OnExit(wxCommandEvent& event);
   void OnMRUFile(wxCommandEvent& event);

+  void OnCloseWindow(wxCloseEvent& event);

 
  protected:
   wxDocManager *m_docManager;
 
  protected:
   wxDocManager *m_docManager;


@@ -55,16 +60,16 @@ class WXDLLEXPORT wxDocMDIChildFrame: public wxMDIChildFrame
   DECLARE_CLASS(wxDocMDIChildFrame)
 
  public:
   DECLARE_CLASS(wxDocMDIChildFrame)
 
  public:

-  wxDocMDIChildFrame(wxDocument *doc, wxView *view, wxMDIParentFrame *frame, wxWindowID id, const wxString& title,
-    const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize,
+  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 = "frame");
   ~wxDocMDIChildFrame(void);
 
     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);
   // 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 wxDocument *GetDocument(void) const { return m_childDocument; }
   inline wxView *GetView(void) const { return m_childView; }


@@ -78,5 +83,8 @@ DECLARE_EVENT_TABLE()
 
 };
 
 
 };
 

+#endif
+    // wxUSE_MDI_ARCHITECTURE
+

 #endif
     // _WX_DOCMDI_H_
 #endif
     // _WX_DOCMDI_H_