X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/354aa1e366a57d896e2cf0943c687b24e8db688c..96aba1e94216ef8c6714a7c6156c7e79d7fac4ef:/samples/docvwmdi/view.cpp?ds=inline

diff --git a/samples/docvwmdi/view.cpp b/samples/docvwmdi/view.cpp
index 5a41fff149..ac439325ff 100644
--- a/samples/docvwmdi/view.cpp
+++ b/samples/docvwmdi/view.cpp
@@ -5,8 +5,8 @@
 // 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__
@@ -47,7 +47,7 @@ END_EVENT_TABLE()
 bool DrawingView::OnCreate(wxDocument *doc, long WXUNUSED(flags) )
 {
     frame = wxGetApp().CreateChildFrame(doc, this, TRUE);
-    frame->SetTitle("DrawingView");
+    frame->SetTitle(_T("DrawingView"));
 
     canvas = GetMainFrame()->CreateCanvas(this, frame);
 #ifdef __X__
@@ -69,12 +69,12 @@ void DrawingView::OnDraw(wxDC *dc)
   dc->SetFont(*wxNORMAL_FONT);
   dc->SetPen(*wxBLACK_PEN);
 
-  wxNode *node = ((DrawingDocument *)GetDocument())->GetDoodleSegments().First();
+  wxNode *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();
   }
 }
 
@@ -129,7 +129,7 @@ bool DrawingView::OnClose(bool deleteWindow)
 void DrawingView::OnCut(wxCommandEvent& WXUNUSED(event) )
 {
     DrawingDocument *doc = (DrawingDocument *)GetDocument();
-    doc->GetCommandProcessor()->Submit(new DrawingCommand((const wxString) "Cut Last Segment", DOODLE_CUT, doc, (DoodleSegment *) NULL));
+    doc->GetCommandProcessor()->Submit(new DrawingCommand(_T("Cut Last Segment"), DOODLE_CUT, doc, (DoodleSegment *) NULL));
 }
 
 IMPLEMENT_DYNAMIC_CLASS(TextEditView, wxView)
@@ -141,7 +141,7 @@ bool TextEditView::OnCreate(wxDocument *doc, long WXUNUSED(flags) )
   int width, height;
   frame->GetClientSize(&width, &height);
   textsw = new MyTextWindow(this, frame, wxPoint(0, 0), wxSize(width, height), wxTE_MULTILINE);
-  frame->SetTitle("TextEditView");
+  frame->SetTitle(_T("TextEditView"));
 
 #ifdef __X__
   // X seems to require a forced resize
@@ -189,7 +189,7 @@ BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
 END_EVENT_TABLE()
 
 // Define a constructor for my canvas
-MyCanvas::MyCanvas(wxView *v, wxFrame *frame, const wxPoint& pos, const wxSize& size, long style):
+MyCanvas::MyCanvas(wxView *v, wxMDIChildFrame *frame, const wxPoint& pos, const wxSize& size, long style):
  wxScrolledWindow(frame, -1, pos, size, style)
 {
   view = v;
@@ -220,7 +220,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;
@@ -230,7 +230,7 @@ void MyCanvas::OnMouseEvent(wxMouseEvent& event)
       // We've got a valid segment on mouse left up, so store it.
       DrawingDocument *doc = (DrawingDocument *)view->GetDocument();
 
-      doc->GetCommandProcessor()->Submit(new DrawingCommand("Add Segment", DOODLE_ADD, doc, currentSegment));
+      doc->GetCommandProcessor()->Submit(new DrawingCommand(_T("Add Segment"), DOODLE_ADD, doc, currentSegment));
 
       view->GetDocument()->Modify(TRUE);
       currentSegment = (DoodleSegment *) NULL;
@@ -256,8 +256,8 @@ void MyCanvas::OnMouseEvent(wxMouseEvent& event)
 }
 
 // Define a constructor for my text subwindow
-MyTextWindow::MyTextWindow(wxView *v, wxFrame *frame, const wxPoint& pos, const wxSize& size, long style):
- wxTextCtrl(frame, -1, "", pos, size, style)
+MyTextWindow::MyTextWindow(wxView *v, wxMDIChildFrame *frame, const wxPoint& pos, const wxSize& size, long style):
+ wxTextCtrl(frame, -1, _T(""), pos, size, style)
 {
   view = v;
 }