added wxVListBox::GetItemRect() (#9711)

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

diff --git a/samples/docvwmdi/docview.h b/samples/docvwmdi/docview.h
index ce603abd7256fa72c9d47bfea338d1606760084e..767e9eee87c3d50219a4b15720d9dff374b50e0c 100644 (file)
--- a/samples/docvwmdi/docview.h
+++ b/samples/docvwmdi/docview.h
@@ -9,12 +9,8 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-// #pragma interface "docview.h"
-#endif
-
-#ifndef __DOCVIEWSAMPLEH__
-#define __DOCVIEWSAMPLEH__
+#ifndef __DOCVIEW_H__
+#define __DOCVIEW_H__

 
 #include "wx/mdi.h"
 #include "wx/docview.h"
 
 #include "wx/mdi.h"
 #include "wx/docview.h"


@@ -25,14 +21,14 @@ class wxDocManager;
 // Define a new application
 class MyApp: public wxApp
 {
 // Define a new application
 class MyApp: public wxApp
 {

-  public:
+public:

     MyApp(void);
     MyApp(void);

-    bool OnInit(void);
-    int OnExit(void);
+    virtual bool OnInit();
+    virtual int OnExit();

 
 

-    wxMDIChildFrame *CreateChildFrame(wxDocument *doc, wxView *view, bool isCanvas);
+    wxMDIChildFrame* CreateChildFrame(wxDocument*, wxView*, bool isCanvas);

 
 

-  protected:
+protected:

     wxDocManager* m_docManager;
 };
 
     wxDocManager* m_docManager;
 };
 


@@ -40,25 +36,27 @@ DECLARE_APP(MyApp)
 
 // Define a new frame
 class MyCanvas;
 
 // Define a new frame
 class MyCanvas;

+class DrawingView;

 class MyFrame: public wxDocMDIParentFrame
 {
 class MyFrame: public wxDocMDIParentFrame
 {

-  DECLARE_CLASS(MyFrame)
- public:
-  wxMenu *editMenu;
-  
-  MyFrame(wxDocManager *manager, wxFrame *frame, const wxString& title, const wxPoint& pos, const wxSize& size,
-    long type);
+public:
+    wxMenu* m_editMenu;
+
+    MyFrame(wxDocManager*, wxFrame*, const wxString& title, const wxPoint&, const wxSize&, long type);
+
+    MyCanvas* CreateCanvas(DrawingView*, wxMDIChildFrame*);

 
 

-  void OnAbout(wxCommandEvent& event);
-  MyCanvas *CreateCanvas(wxView *view, wxMDIChildFrame *parent);
+protected:
+    void OnAbout(wxCommandEvent&);

 
 

-DECLARE_EVENT_TABLE()
+    DECLARE_EVENT_TABLE()
+    DECLARE_CLASS(MyFrame)

 };
 
 };
 

-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;