no changes, just some cleanup (patch 1918720)

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

diff --git a/samples/docvwmdi/view.h b/samples/docvwmdi/view.h
index 57e4573ae5fd501bc35339a38765febcf9607836..d146d8cff4225de9c6deb566ba3786b3b5b0ef2c 100644 (file)
--- a/samples/docvwmdi/view.h
+++ b/samples/docvwmdi/view.h
@@ -9,69 +9,70 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-#ifndef __VIEWSAMPLEH__
-#define __VIEWSAMPLEH__
+#ifndef __VIEW_H__
+#define __VIEW_H__
 
 #include "wx/docview.h"
 
-class MyCanvas: public wxScrolledWindow
+class DrawingView;
+class MyCanvas : public wxScrolledWindow
 {
 public:
-    wxView *view;
-    
-    MyCanvas(wxView *v, wxMDIChildFrame *frame, const wxPoint& pos, const wxSize& size, long style);
-    virtual void OnDraw(wxDC& dc);
-    void OnMouseEvent(wxMouseEvent& event);
+    DrawingView* m_view;
 
-private:
+    MyCanvas(DrawingView*, wxMDIChildFrame*, const wxPoint&, const wxSize&, long style);
+    virtual void OnDraw(wxDC&);
+protected:
+    void OnMouseEvent(wxMouseEvent&);
     DECLARE_EVENT_TABLE()
 };
 
 class MyTextWindow: public wxTextCtrl
 {
 public:
-    wxView *view;
-    
-    MyTextWindow(wxView *v, wxMDIChildFrame *frame, const wxPoint& pos, const wxSize& size, long style);
+    wxView* m_view;
+
+    MyTextWindow(wxView*, wxMDIChildFrame*, const wxPoint&, const wxSize&, long style);
 };
 
-class DrawingView: public wxView
+class DrawingDocument;
+class DrawingView : public wxView
 {
+    DECLARE_DYNAMIC_CLASS(DrawingView)
 public:
-    wxMDIChildFrame *frame;
-    MyCanvas *canvas;
-  
-    DrawingView() { canvas = (MyCanvas *) NULL; frame = (wxMDIChildFrame *) NULL; }
-    ~DrawingView() {}
+    wxMDIChildFrame* m_frame;
+    MyCanvas* m_canvas;
 
-    bool OnCreate(wxDocument *doc, long flags);
-    void OnDraw(wxDC *dc);
-    void OnUpdate(wxView *sender, wxObject *hint = (wxObject *) NULL);
-    bool OnClose(bool deleteWindow = true);
+    DrawingView() { m_canvas = NULL; m_frame = NULL; }
+    virtual ~DrawingView() {}
 
-    void OnCut(wxCommandEvent& event);
+    virtual bool OnCreate(wxDocument *doc, long flags);
+    virtual void OnDraw(wxDC *dc);
+    virtual void OnUpdate(wxView *sender, wxObject *hint = NULL);
+    virtual bool OnClose(bool deleteWindow = true);
 
-private:
-    DECLARE_DYNAMIC_CLASS(DrawingView)
+    DrawingDocument* GetDocument();
+
+protected:
+    void OnCut(wxCommandEvent& event);
     DECLARE_EVENT_TABLE()
 };
 
 class TextEditView: public wxView
 {
+    DECLARE_DYNAMIC_CLASS(TextEditView)
 public:
-    wxMDIChildFrame *frame;
-    MyTextWindow *textsw;
-  
-    TextEditView(): wxView() { frame = (wxMDIChildFrame *) NULL; textsw = (MyTextWindow *) NULL; }
-    ~TextEditView() {}
+    wxMDIChildFrame* m_frame;
+    MyTextWindow* m_textsw;
+
+    TextEditView() : wxView() { m_frame = NULL; m_textsw = NULL; }
+    virtual ~TextEditView() {}
 
-    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)
+    virtual bool OnCreate(wxDocument*, long flags);
+    virtual void OnDraw(wxDC* dc);
+    virtual void OnUpdate(wxView *sender, wxObject *hint = NULL);
+    virtual bool OnClose(bool deleteWindow = true);
+    virtual bool ProcessEvent(wxEvent&);
 };
 
 #endif