fix crash which happened if you called SetAttr(NULL) followed by SetAttr(attr) (...

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

diff --git a/samples/docview/docview.h b/samples/docview/docview.h
index 473e8b526e27f71047db85d3ebf1809f43a6b732..4e60ba1ffaecef20b9d94c4f31b5ee29d7a992e5 100644 (file)
--- a/samples/docview/docview.h
+++ b/samples/docview/docview.h
@@ -5,31 +5,27 @@
 // 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 "docview.h"
-#endif
-
-#ifndef __DOCVIEWSAMPLEH__
-#define __DOCVIEWSAMPLEH__
+#ifndef __DOCVIEW_H__
+#define __DOCVIEW_H__

 
 #include "wx/docview.h"
 
 class wxDocManager;
 
 // Define a new application
 
 #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);
 {
 public:
     MyApp(void);
     bool OnInit(void);
     int OnExit(void);

-    
+

     wxFrame *CreateChildFrame(wxDocument *doc, wxView *view, bool isCanvas);
     wxFrame *CreateChildFrame(wxDocument *doc, wxView *view, bool isCanvas);

-    
+

 protected:
     wxDocManager* m_docManager;
 };
 protected:
     wxDocManager* m_docManager;
 };


@@ -38,28 +34,30 @@ DECLARE_APP(MyApp)
 
 // Define a new frame
 class MyCanvas;
 
 // Define a new frame
 class MyCanvas;

-class MyFrame: public wxDocParentFrame
+class DrawingView;
+class MyFrame : public wxDocParentFrame

 {
     DECLARE_CLASS(MyFrame)
 public:
 {
     DECLARE_CLASS(MyFrame)
 public:

-    wxMenu *editMenu;
-    
+    wxMenu* m_editMenu;
+

     // This pointer only needed if in single window mode
     // 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);
     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);
     void OnAbout(wxCommandEvent& event);

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

     DECLARE_EVENT_TABLE()
 };
 
     DECLARE_EVENT_TABLE()
 };
 

-extern MyFrame *GetMainFrame(void);
+extern MyFrame *GetMainFrame();

 
 #define DOCVIEW_CUT     1
 
 #define DOCVIEW_CUT     1

-#define DOCVIEW_ABOUT   2
+#define DOCVIEW_ABOUT   wxID_ABOUT

 
 extern bool singleWindowMode;
 
 
 extern bool singleWindowMode;