X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6aa89a22b8e47000c98bff05c6f545f331f1c353..e5ef1cae0f424be0bffbd651cb10052dfb208396:/samples/docview/docview.h

diff --git a/samples/docview/docview.h b/samples/docview/docview.h
index 08289db1bc..4e60ba1ffa 100644
--- a/samples/docview/docview.h
+++ b/samples/docview/docview.h
@@ -9,27 +9,23 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-// #pragma interface "docview.h"
-#endif
-
-#ifndef __DOCVIEWSAMPLEH__
-#define __DOCVIEWSAMPLEH__
+#ifndef __DOCVIEW_H__
+#define __DOCVIEW_H__
 
 #include "wx/docview.h"
 
 class wxDocManager;
 
 // Define a new application
-class MyApp: public wxApp
+class MyApp : public wxApp
 {
 public:
     MyApp(void);
     bool OnInit(void);
     int OnExit(void);
-    
+
     wxFrame *CreateChildFrame(wxDocument *doc, wxView *view, bool isCanvas);
-    
+
 protected:
     wxDocManager* m_docManager;
 };
@@ -38,28 +34,30 @@ DECLARE_APP(MyApp)
 
 // Define a new frame
 class MyCanvas;
-class MyFrame: public wxDocParentFrame
+class DrawingView;
+class MyFrame : public wxDocParentFrame
 {
     DECLARE_CLASS(MyFrame)
 public:
-    wxMenu *editMenu;
-    
+    wxMenu* m_editMenu;
+
     // This pointer only needed if in single window mode
-    MyCanvas *canvas;
-    
+    MyCanvas* m_canvas;
+
     MyFrame(wxDocManager *manager, wxFrame *frame, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size,
         const long type);
-    
+
+    MyCanvas* CreateCanvas(DrawingView*, wxFrame *parent);
+
+protected:
     void OnAbout(wxCommandEvent& event);
-    MyCanvas *CreateCanvas(wxView *view, wxFrame *parent);
-    
     DECLARE_EVENT_TABLE()
 };
 
-extern MyFrame *GetMainFrame(void);
+extern MyFrame *GetMainFrame();
 
 #define DOCVIEW_CUT     1
-#define DOCVIEW_ABOUT   2
+#define DOCVIEW_ABOUT   wxID_ABOUT
 
 extern bool singleWindowMode;