X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3996031094e28a6936ca1df2d289c9d3baecb27d..05ae668ce491600cd568edbe15618693e63d619c:/samples/docview/view.cpp?ds=sidebyside

diff --git a/samples/docview/view.cpp b/samples/docview/view.cpp
index 73a6097ec4..957aff4018 100644
--- a/samples/docview/view.cpp
+++ b/samples/docview/view.cpp
@@ -5,14 +5,10 @@
 // Modified by:
 // Created:     04/01/98
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
+// Copyright:   (c) Julian Smart
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-// #pragma implementation
-#endif
-
 // For compilers that support precompilation, includes "wx/wx.h".
 #include "wx/wxprec.h"
 
@@ -49,7 +45,7 @@ bool DrawingView::OnCreate(wxDocument *doc, long WXUNUSED(flags) )
     if (!singleWindowMode)
     {
         // Multiple windows
-        frame = wxGetApp().CreateChildFrame(doc, this, TRUE);
+        frame = wxGetApp().CreateChildFrame(doc, this, true);
         frame->SetTitle(_T("DrawingView"));
         
         canvas = GetMainFrame()->CreateCanvas(this, frame);
@@ -57,9 +53,9 @@ bool DrawingView::OnCreate(wxDocument *doc, long WXUNUSED(flags) )
         // X seems to require a forced resize
         int x, y;
         frame->GetSize(&x, &y);
-        frame->SetSize(-1, -1, x, y);
+        frame->SetSize(wxDefaultCoord, wxDefaultCoord, x, y);
 #endif
-        frame->Show(TRUE);
+        frame->Show(true);
     }
     else
     {
@@ -73,14 +69,14 @@ bool DrawingView::OnCreate(wxDocument *doc, long WXUNUSED(flags) )
         
         // Make sure the document manager knows that this is the
         // current view.
-        Activate(TRUE);
+        Activate(true);
         
         // Initialize the edit menu Undo and Redo items
         doc->GetCommandProcessor()->SetEditMenu(((MyFrame *)frame)->editMenu);
         doc->GetCommandProcessor()->Initialize();
     }
     
-    return TRUE;
+    return true;
 }
 
 // Sneakily gets used for default print/preview
@@ -90,12 +86,12 @@ void DrawingView::OnDraw(wxDC *dc)
     dc->SetFont(*wxNORMAL_FONT);
     dc->SetPen(*wxBLACK_PEN);
     
-    wxNode *node = ((DrawingDocument *)GetDocument())->GetDoodleSegments().First();
+    wxList::compatibility_iterator node = ((DrawingDocument *)GetDocument())->GetDoodleSegments().GetFirst();
     while (node)
     {
-        DoodleSegment *seg = (DoodleSegment *)node->Data();
+        DoodleSegment *seg = (DoodleSegment *)node->GetData();
         seg->Draw(dc);
-        node = node->Next();
+        node = node->GetNext();
     }
 }
 
@@ -123,11 +119,11 @@ void DrawingView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint))
 bool DrawingView::OnClose(bool deleteWindow)
 {
     if (!GetDocument()->Close())
-        return FALSE;
+        return false;
     
     // Clear the canvas in  case we're in single-window mode,
     // and the canvas stays.
-    canvas->Clear();
+    canvas->ClearBackground();
     canvas->view = (wxView *) NULL;
     canvas = (MyCanvas *) NULL;
     
@@ -137,14 +133,14 @@ bool DrawingView::OnClose(bool deleteWindow)
     
     SetFrame((wxFrame *) NULL);
     
-    Activate(FALSE);
+    Activate(false);
     
     if (deleteWindow && !singleWindowMode)
     {
         delete frame;
-        return TRUE;
+        return true;
     }
-    return TRUE;
+    return true;
 }
 
 void DrawingView::OnCut(wxCommandEvent& WXUNUSED(event) )
@@ -157,7 +153,7 @@ IMPLEMENT_DYNAMIC_CLASS(TextEditView, wxView)
 
 bool TextEditView::OnCreate(wxDocument *doc, long WXUNUSED(flags) )
 {
-    frame = wxGetApp().CreateChildFrame(doc, this, FALSE);
+    frame = wxGetApp().CreateChildFrame(doc, this, false);
     
     int width, height;
     frame->GetClientSize(&width, &height);
@@ -168,13 +164,13 @@ bool TextEditView::OnCreate(wxDocument *doc, long WXUNUSED(flags) )
     // X seems to require a forced resize
     int x, y;
     frame->GetSize(&x, &y);
-    frame->SetSize(-1, -1, x, y);
+    frame->SetSize(wxDefaultCoord, wxDefaultCoord, x, y);
 #endif
     
-    frame->Show(TRUE);
-    Activate(TRUE);
+    frame->Show(true);
+    Activate(true);
     
-    return TRUE;
+    return true;
 }
 
 // Handled by wxTextWindow
@@ -189,16 +185,16 @@ void TextEditView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) )
 bool TextEditView::OnClose(bool deleteWindow)
 {
     if (!GetDocument()->Close())
-        return FALSE;
+        return false;
     
-    Activate(FALSE);
+    Activate(false);
     
     if (deleteWindow)
     {
         delete frame;
-        return TRUE;
+        return true;
     }
-    return TRUE;
+    return true;
 }
 
 /*
@@ -211,7 +207,7 @@ END_EVENT_TABLE()
 
 // Define a constructor for my canvas
 MyCanvas::MyCanvas(wxView *v, wxFrame *frame, const wxPoint& pos, const wxSize& size, const long style):
-    wxScrolledWindow(frame, -1, pos, size, style)
+    wxScrolledWindow(frame, wxID_ANY, pos, size, style)
 {
     view = v;
 }
@@ -241,7 +237,7 @@ void MyCanvas::OnMouseEvent(wxMouseEvent& event)
     
     if (currentSegment && event.LeftUp())
     {
-        if (currentSegment->lines.Number() == 0)
+        if (currentSegment->lines.GetCount() == 0)
         {
             delete currentSegment;
             currentSegment = (DoodleSegment *) NULL;
@@ -253,7 +249,7 @@ void MyCanvas::OnMouseEvent(wxMouseEvent& event)
             
             doc->GetCommandProcessor()->Submit(new DrawingCommand(_T("Add Segment"), DOODLE_ADD, doc, currentSegment));
             
-            view->GetDocument()->Modify(TRUE);
+            view->GetDocument()->Modify(true);
             currentSegment = (DoodleSegment *) NULL;
         }
     }
@@ -278,7 +274,7 @@ void MyCanvas::OnMouseEvent(wxMouseEvent& event)
 
 // Define a constructor for my text subwindow
 MyTextWindow::MyTextWindow(wxView *v, wxFrame *frame, const wxPoint& pos, const wxSize& size, const long style):
-    wxTextCtrl(frame, -1, _T(""), pos, size, style)
+    wxTextCtrl(frame, wxID_ANY, _T(""), pos, size, style)
 {
     view = v;
 }