// 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__
class MyCanvas: public wxScrolledWindow
{
- public:
+public:
wxView *view;
- MyCanvas(wxView *v, wxFrame *frame, const wxPoint& pos, const wxSize& size, const long style);
+ MyCanvas(wxView *v, wxMDIChildFrame *frame, const wxPoint& pos, const wxSize& size, long style);
virtual void OnDraw(wxDC& dc);
void OnMouseEvent(wxMouseEvent& event);
-DECLARE_EVENT_TABLE()
+private:
+ DECLARE_EVENT_TABLE()
};
class MyTextWindow: public wxTextCtrl
{
- public:
+public:
wxView *view;
- MyTextWindow(wxView *v, wxFrame *frame, const wxPoint& pos, const wxSize& size, const long style);
+ MyTextWindow(wxView *v, wxMDIChildFrame *frame, const wxPoint& pos, const wxSize& size, long style);
};
class DrawingView: public wxView
{
- DECLARE_DYNAMIC_CLASS(DrawingView)
- private:
- public:
- wxFrame *frame;
- MyCanvas *canvas;
+public:
+ wxMDIChildFrame *frame;
+ MyCanvas *canvas;
- DrawingView(void) { canvas = NULL; frame = NULL; };
- ~DrawingView(void) {};
+ DrawingView() { canvas = (MyCanvas *) NULL; frame = (wxMDIChildFrame *) NULL; }
+ ~DrawingView() {}
- bool OnCreate(wxDocument *doc, long flags);
- void OnDraw(wxDC *dc);
- void OnUpdate(wxView *sender, wxObject *hint = NULL);
- bool OnClose(bool deleteWindow = TRUE);
+ bool OnCreate(wxDocument *doc, long flags);
+ void OnDraw(wxDC *dc);
+ void OnUpdate(wxView *sender, wxObject *hint = (wxObject *) NULL);
+ bool OnClose(bool deleteWindow = TRUE);
- void OnCut(wxCommandEvent& event);
+ void OnCut(wxCommandEvent& event);
-DECLARE_EVENT_TABLE()
+private:
+ DECLARE_DYNAMIC_CLASS(DrawingView)
+ DECLARE_EVENT_TABLE()
};
class TextEditView: public wxView
{
- DECLARE_DYNAMIC_CLASS(TextEditView)
- private:
- public:
- wxFrame *frame;
- MyTextWindow *textsw;
+public:
+ wxMDIChildFrame *frame;
+ MyTextWindow *textsw;
- TextEditView(wxDocument *doc = NULL): wxView(doc) { frame = NULL; textsw = NULL; }
- ~TextEditView(void) {}
+ 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 = NULL);
- bool OnClose(bool deleteWindow = TRUE);
+ bool OnCreate(wxDocument *doc, long flags);
+ void OnDraw(wxDC *dc);
+ void OnUpdate(wxView *sender, wxObject *hint = (wxObject *) NULL);
+ bool OnClose(bool deleteWindow = TRUE);
+
+private:
+ DECLARE_DYNAMIC_CLASS(TextEditView)
};
#endif