fix for potential crash when conversion fails

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

diff --git a/samples/docview/docview.h b/samples/docview/docview.h
index b48e4de09c34474f581279cb898789205f397da2..06582fb3544862401ed4213185ea27b7d84c224f 100644 (file)
--- a/samples/docview/docview.h
+++ b/samples/docview/docview.h
@@ -5,14 +5,10 @@
 // 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__
 
@@ -23,14 +19,14 @@ class wxDocManager;
 // Define a new application
 class MyApp: public wxApp
 {
-  public:
+public:
     MyApp(void);
     bool OnInit(void);
     int OnExit(void);
-
+    
     wxFrame *CreateChildFrame(wxDocument *doc, wxView *view, bool isCanvas);
-
-  protected:
+    
+protected:
     wxDocManager* m_docManager;
 };
 
@@ -40,26 +36,26 @@ DECLARE_APP(MyApp)
 class MyCanvas;
 class MyFrame: public wxDocParentFrame
 {
-  DECLARE_CLASS(MyFrame)
- public:
-  wxMenu *editMenu;
-  
-  // This pointer only needed if in single window mode
-  MyCanvas *canvas;
-  
-  MyFrame(wxDocManager *manager, wxFrame *frame, const wxString& title, const wxPoint& pos, const wxSize& size,
-    const long type);
-
-  void OnAbout(wxCommandEvent& event);
-  MyCanvas *CreateCanvas(wxView *view, wxFrame *parent);
-
-DECLARE_EVENT_TABLE()
+    DECLARE_CLASS(MyFrame)
+public:
+    wxMenu *editMenu;
+    
+    // This pointer only needed if in single window mode
+    MyCanvas *canvas;
+    
+    MyFrame(wxDocManager *manager, wxFrame *frame, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size,
+        const long type);
+    
+    void OnAbout(wxCommandEvent& event);
+    MyCanvas *CreateCanvas(wxView *view, wxFrame *parent);
+    
+    DECLARE_EVENT_TABLE()
 };
 
 extern MyFrame *GetMainFrame(void);
 
 #define DOCVIEW_CUT     1
-#define DOCVIEW_ABOUT   2
+#define DOCVIEW_ABOUT   wxID_ABOUT
 
 extern bool singleWindowMode;