Use common book flags (and other minor corrections).

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

diff --git a/samples/docvwmdi/view.h b/samples/docvwmdi/view.h
index e851caf6fe397f9d4337336ab70cd6085e2be0e7..57e4573ae5fd501bc35339a38765febcf9607836 100644 (file)
--- a/samples/docvwmdi/view.h
+++ b/samples/docvwmdi/view.h
@@ -5,14 +5,10 @@
 // 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
-// Licence:    wxWindows license
+// Copyright:   (c) Julian Smart
+// Licence:     wxWindows license

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-// #pragma interface
-#endif
-

 #ifndef __VIEWSAMPLEH__
 #define __VIEWSAMPLEH__
 
 #ifndef __VIEWSAMPLEH__
 #define __VIEWSAMPLEH__
 


@@ -20,60 +16,62 @@
 
 class MyCanvas: public wxScrolledWindow
 {
 
 class MyCanvas: public wxScrolledWindow
 {

-  public:
+public:

     wxView *view;
     
     wxView *view;
     

-    MyCanvas(wxView *v, wxFrame *frame, const wxPoint& pos, const wxSize& size, long style);
+    MyCanvas(wxView *v, wxMDIChildFrame *frame, const wxPoint& pos, const wxSize& size, long style);

     virtual void OnDraw(wxDC& dc);
     void OnMouseEvent(wxMouseEvent& event);
 
     virtual void OnDraw(wxDC& dc);
     void OnMouseEvent(wxMouseEvent& event);
 

-DECLARE_EVENT_TABLE()
+private:
+    DECLARE_EVENT_TABLE()

 };
 
 class MyTextWindow: public wxTextCtrl
 {
 };
 
 class MyTextWindow: public wxTextCtrl
 {

-  public:
+public:

     wxView *view;
     
     wxView *view;
     

-    MyTextWindow(wxView *v, wxFrame *frame, const wxPoint& pos, const wxSize& size, long style);
+    MyTextWindow(wxView *v, wxMDIChildFrame *frame, const wxPoint& pos, const wxSize& size, long style);

 };
 
 class DrawingView: public wxView
 {
 };
 
 class DrawingView: public wxView
 {

-  DECLARE_DYNAMIC_CLASS(DrawingView)
- private:
- public:
-  wxFrame *frame;
-  MyCanvas *canvas;
+public:
+    wxMDIChildFrame *frame;
+    MyCanvas *canvas;

   
   

-  DrawingView(void) { canvas = (MyCanvas *) NULL; frame = (wxFrame *) NULL; };
-  ~DrawingView(void) {};
+    DrawingView() { canvas = (MyCanvas *) NULL; frame = (wxMDIChildFrame *) NULL; }
+    ~DrawingView() {}

 
 

-  bool OnCreate(wxDocument *doc, long flags);
-  void OnDraw(wxDC *dc);
-  void OnUpdate(wxView *sender, wxObject *hint = (wxObject *) NULL);
-  bool OnClose(bool deleteWindow = TRUE);
+    bool OnCreate(wxDocument *doc, long flags);
+    void OnDraw(wxDC *dc);
+    void OnUpdate(wxView *sender, wxObject *hint = (wxObject *) NULL);
+    bool OnClose(bool deleteWindow = true);

 
 

-  void OnCut(wxCommandEvent& event);
+    void OnCut(wxCommandEvent& event);

 
 

-DECLARE_EVENT_TABLE()
+private:
+    DECLARE_DYNAMIC_CLASS(DrawingView)
+    DECLARE_EVENT_TABLE()

 };
 
 class TextEditView: public wxView
 {
 };
 
 class TextEditView: public wxView
 {

-  DECLARE_DYNAMIC_CLASS(TextEditView)
- private:
- public:
-  wxFrame *frame;
-  MyTextWindow *textsw;
+public:
+    wxMDIChildFrame *frame;
+    MyTextWindow *textsw;

   
   

-  TextEditView(wxDocument *doc = (wxDocument *) NULL): wxView(doc) { frame = (wxFrame *) NULL; textsw = (MyTextWindow *) NULL; }
-  ~TextEditView(void) {}
+    TextEditView(): wxView() { frame = (wxMDIChildFrame *) NULL; textsw = (MyTextWindow *) NULL; }
+    ~TextEditView() {}

 
 

-  bool OnCreate(wxDocument *doc, long flags);
-  void OnDraw(wxDC *dc);
-  void OnUpdate(wxView *sender, wxObject *hint = (wxObject *) NULL);
-  bool OnClose(bool deleteWindow = TRUE);
+    bool OnCreate(wxDocument *doc, long flags);
+    void OnDraw(wxDC *dc);
+    void OnUpdate(wxView *sender, wxObject *hint = (wxObject *) NULL);
+    bool OnClose(bool deleteWindow = true);
+    
+private:
+  DECLARE_DYNAMIC_CLASS(TextEditView)

 };
 
 #endif
 };
 
 #endif