Always rearrange wxListBook and send out size event, otherwise scrollbar overlaps...

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

diff --git a/samples/docvwmdi/docview.h b/samples/docvwmdi/docview.h
index 3d0ad4274d3c85ddb937ea403150b486e2c9e673..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$
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
+// Copyright:   (c) Julian Smart

 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-// #pragma interface "docview.h"
-#endif
-

 #ifndef __DOCVIEWSAMPLEH__
 #define __DOCVIEWSAMPLEH__
 
 #ifndef __DOCVIEWSAMPLEH__
 #define __DOCVIEWSAMPLEH__
 

+#include "wx/mdi.h"
+#include "wx/docview.h"

 #include "wx/docmdi.h"
 
 class wxDocManager;
 #include "wx/docmdi.h"
 
 class wxDocManager;


@@ -48,7 +46,7 @@ class MyFrame: public wxDocMDIParentFrame
     long type);
 
   void OnAbout(wxCommandEvent& event);
     long type);
 
   void OnAbout(wxCommandEvent& event);

-  MyCanvas *CreateCanvas(wxView *view, wxFrame *parent);
+  MyCanvas *CreateCanvas(wxView *view, wxMDIChildFrame *parent);

 
 DECLARE_EVENT_TABLE()
 };
 
 DECLARE_EVENT_TABLE()
 };


@@ -56,7 +54,7 @@ DECLARE_EVENT_TABLE()
 extern MyFrame *GetMainFrame(void);
 
 #define DOCVIEW_CUT     1
 extern MyFrame *GetMainFrame(void);
 
 #define DOCVIEW_CUT     1

-#define DOCVIEW_ABOUT   2
+#define DOCVIEW_ABOUT   wxID_ABOUT

 
 extern bool singleWindowMode;
 
 
 extern bool singleWindowMode;