don't remove the old tags of different kinds when setting new style, this removes...

[wxWidgets.git] / samples / docvwmdi / docview.h

diff --git a/samples/docvwmdi/docview.h b/samples/docvwmdi/docview.h
index 30bc59fcff3f12f01add104bf0db17893a5139a6..137b5f65fea6153af34c7f5ff19310d8aef79c97 100644 (file)
--- a/samples/docvwmdi/docview.h
+++ b/samples/docvwmdi/docview.h
@@ -5,17 +5,15 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
-// Licence:    wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-// #pragma interface "docview.h"
-#endif
-
 #ifndef __DOCVIEWSAMPLEH__
 #define __DOCVIEWSAMPLEH__
 
+#include "wx/mdi.h"
+#include "wx/docview.h"
 #include "wx/docmdi.h"
 
 class wxDocManager;
@@ -28,7 +26,7 @@ class MyApp: public wxApp
     bool OnInit(void);
     int OnExit(void);
 
-    wxFrame *CreateChildFrame(wxDocument *doc, wxView *view, bool isCanvas);
+    wxMDIChildFrame *CreateChildFrame(wxDocument *doc, wxView *view, bool isCanvas);
 
   protected:
     wxDocManager* m_docManager;
@@ -45,10 +43,10 @@ class MyFrame: public wxDocMDIParentFrame
   wxMenu *editMenu;
   
   MyFrame(wxDocManager *manager, wxFrame *frame, const wxString& title, const wxPoint& pos, const wxSize& size,
-    const long type);
+    long type);
 
   void OnAbout(wxCommandEvent& event);
-  MyCanvas *CreateCanvas(wxView *view, wxFrame *parent);
+  MyCanvas *CreateCanvas(wxView *view, wxMDIChildFrame *parent);
 
 DECLARE_EVENT_TABLE()
 };
@@ -56,7 +54,7 @@ DECLARE_EVENT_TABLE()
 extern MyFrame *GetMainFrame(void);
 
 #define DOCVIEW_CUT     1
-#define DOCVIEW_ABOUT   2
+#define DOCVIEW_ABOUT   wxID_ABOUT
 
 extern bool singleWindowMode;