mac cleanup, cgcolor changes

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

diff --git a/samples/docvwmdi/view.h b/samples/docvwmdi/view.h
index f44634985626e2d1372066ada3fd88b9280f11b5..57e4573ae5fd501bc35339a38765febcf9607836 100644 (file)
--- a/samples/docvwmdi/view.h
+++ b/samples/docvwmdi/view.h
@@ -5,14 +5,10 @@
 // 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
-#endif
-

 #ifndef __VIEWSAMPLEH__
 #define __VIEWSAMPLEH__
 
 #ifndef __VIEWSAMPLEH__
 #define __VIEWSAMPLEH__
 


@@ -23,7 +19,7 @@ class MyCanvas: public wxScrolledWindow
 public:
     wxView *view;
     
 public:
     wxView *view;
     

-    MyCanvas(wxView *v, wxFrame *frame, const wxPoint& pos, const wxSize& size, long style);
+    MyCanvas(wxView *v, wxMDIChildFrame *frame, const wxPoint& pos, const wxSize& size, long style);

     virtual void OnDraw(wxDC& dc);
     void OnMouseEvent(wxMouseEvent& event);
 
     virtual void OnDraw(wxDC& dc);
     void OnMouseEvent(wxMouseEvent& event);
 


@@ -36,22 +32,22 @@ class MyTextWindow: public wxTextCtrl
 public:
     wxView *view;
     
 public:
     wxView *view;
     

-    MyTextWindow(wxView *v, wxFrame *frame, const wxPoint& pos, const wxSize& size, long style);
+    MyTextWindow(wxView *v, wxMDIChildFrame *frame, const wxPoint& pos, const wxSize& size, long style);

 };
 
 class DrawingView: public wxView
 {
 public:
 };
 
 class DrawingView: public wxView
 {
 public:

-    wxFrame *frame;
+    wxMDIChildFrame *frame;

     MyCanvas *canvas;
   
     MyCanvas *canvas;
   

-    DrawingView() { canvas = (MyCanvas *) NULL; frame = (wxFrame *) NULL; }
+    DrawingView() { canvas = (MyCanvas *) NULL; frame = (wxMDIChildFrame *) NULL; }

     ~DrawingView() {}
 
     bool OnCreate(wxDocument *doc, long flags);
     void OnDraw(wxDC *dc);
     void OnUpdate(wxView *sender, wxObject *hint = (wxObject *) NULL);
     ~DrawingView() {}
 
     bool OnCreate(wxDocument *doc, long flags);
     void OnDraw(wxDC *dc);
     void OnUpdate(wxView *sender, wxObject *hint = (wxObject *) NULL);

-    bool OnClose(bool deleteWindow = TRUE);
+    bool OnClose(bool deleteWindow = true);

 
     void OnCut(wxCommandEvent& event);
 
 
     void OnCut(wxCommandEvent& event);
 


@@ -63,16 +59,16 @@ private:
 class TextEditView: public wxView
 {
 public:
 class TextEditView: public wxView
 {
 public:

-    wxFrame *frame;
+    wxMDIChildFrame *frame;

     MyTextWindow *textsw;
   
     MyTextWindow *textsw;
   

-    TextEditView(): wxView() { frame = (wxFrame *) NULL; textsw = (MyTextWindow *) NULL; }
+    TextEditView(): wxView() { frame = (wxMDIChildFrame *) NULL; textsw = (MyTextWindow *) NULL; }

     ~TextEditView() {}
 
     bool OnCreate(wxDocument *doc, long flags);
     void OnDraw(wxDC *dc);
     void OnUpdate(wxView *sender, wxObject *hint = (wxObject *) NULL);
     ~TextEditView() {}
 
     bool OnCreate(wxDocument *doc, long flags);
     void OnDraw(wxDC *dc);
     void OnUpdate(wxView *sender, wxObject *hint = (wxObject *) NULL);

-    bool OnClose(bool deleteWindow = TRUE);
+    bool OnClose(bool deleteWindow = true);

     
 private:
   DECLARE_DYNAMIC_CLASS(TextEditView)
     
 private:
   DECLARE_DYNAMIC_CLASS(TextEditView)