use wxDC::GetMultiLineTextExtent() instead of duplicating its code in wxButton::DoGet...

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

diff --git a/samples/docview/view.h b/samples/docview/view.h
index 074d940f0a9e99567f8c72121e01161300830024..02d05cc97cbc5fa855f823e384137145ff22ebc7 100644 (file)
--- a/samples/docview/view.h
+++ b/samples/docview/view.h
@@ -5,8 +5,8 @@
 // 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__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -20,19 +20,19 @@
 
 class MyCanvas: public wxScrolledWindow
 {
 
 class MyCanvas: public wxScrolledWindow
 {

-  public:
+public:

     wxView *view;
     
     MyCanvas(wxView *v, wxFrame *frame, const wxPoint& pos, const wxSize& size, const long style);
     virtual void OnDraw(wxDC& dc);
     void OnMouseEvent(wxMouseEvent& event);
     wxView *view;
     
     MyCanvas(wxView *v, wxFrame *frame, const wxPoint& pos, const wxSize& size, const long style);
     virtual void OnDraw(wxDC& dc);
     void OnMouseEvent(wxMouseEvent& event);

-
-DECLARE_EVENT_TABLE()
+    
+    DECLARE_EVENT_TABLE()

 };
 
 class MyTextWindow: public wxTextCtrl
 {
 };
 
 class MyTextWindow: public wxTextCtrl
 {

-  public:
+public:

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


@@ -40,40 +40,40 @@ class MyTextWindow: public wxTextCtrl
 
 class DrawingView: public wxView
 {
 
 class DrawingView: public wxView
 {

-  DECLARE_DYNAMIC_CLASS(DrawingView)
- private:
- public:
-  wxFrame *frame;
-  MyCanvas *canvas;
-  
-  DrawingView(void) { canvas = NULL; frame = NULL; };
-  ~DrawingView(void) {};
-
-  bool OnCreate(wxDocument *doc, long flags);
-  void OnDraw(wxDC *dc);
-  void OnUpdate(wxView *sender, wxObject *hint = NULL);
-  bool OnClose(bool deleteWindow = TRUE);
-
-  void OnCut(wxCommandEvent& event);
-
-DECLARE_EVENT_TABLE()
+    DECLARE_DYNAMIC_CLASS(DrawingView)
+private:
+public:
+    wxFrame *frame;
+    MyCanvas *canvas;
+    
+    DrawingView(void) { canvas = (MyCanvas *) NULL; frame = (wxFrame *) NULL; };
+    ~DrawingView(void) {};
+    
+    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);
+    
+    DECLARE_EVENT_TABLE()

 };
 
 class TextEditView: public wxView
 {
 };
 
 class TextEditView: public wxView
 {

-  DECLARE_DYNAMIC_CLASS(TextEditView)
- private:
- public:
-  wxFrame *frame;
-  MyTextWindow *textsw;
-  
-  TextEditView(wxDocument *doc = NULL): wxView(doc) { frame = NULL; textsw = NULL; }
-  ~TextEditView(void) {}
-
-  bool OnCreate(wxDocument *doc, long flags);
-  void OnDraw(wxDC *dc);
-  void OnUpdate(wxView *sender, wxObject *hint = NULL);
-  bool OnClose(bool deleteWindow = TRUE);
+    DECLARE_DYNAMIC_CLASS(TextEditView)
+private:
+public:
+    wxFrame *frame;
+    MyTextWindow *textsw;
+    
+    TextEditView(): wxView() { frame = (wxFrame *) NULL; textsw = (MyTextWindow *) NULL; }
+    ~TextEditView(void) {}
+    
+    bool OnCreate(wxDocument *doc, long flags);
+    void OnDraw(wxDC *dc);
+    void OnUpdate(wxView *sender, wxObject *hint = (wxObject *) NULL);
+    bool OnClose(bool deleteWindow = true);

 };
 
 #endif
 };
 
 #endif