wxStaticBitmapBase::DoGetBestSize

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

diff --git a/samples/docview/view.cpp b/samples/docview/view.cpp
index 06e35d3a84dfb26d5ff582df091850d9a06aedb4..b2461fa086f738025a4c3a2752c0546c831b9e43 100644 (file)
--- a/samples/docview/view.cpp
+++ b/samples/docview/view.cpp
@@ -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__


@@ -50,7 +50,7 @@ bool DrawingView::OnCreate(wxDocument *doc, long WXUNUSED(flags) )
     {
         // Multiple windows
         frame = wxGetApp().CreateChildFrame(doc, this, TRUE);
     {
         // Multiple windows
         frame = wxGetApp().CreateChildFrame(doc, this, TRUE);

-        frame->SetTitle("DrawingView");
+        frame->SetTitle(_T("DrawingView"));

         
         canvas = GetMainFrame()->CreateCanvas(this, frame);
 #ifdef __X__
         
         canvas = GetMainFrame()->CreateCanvas(this, frame);
 #ifdef __X__


@@ -90,12 +90,12 @@ void DrawingView::OnDraw(wxDC *dc)
     dc->SetFont(*wxNORMAL_FONT);
     dc->SetPen(*wxBLACK_PEN);
     
     dc->SetFont(*wxNORMAL_FONT);
     dc->SetPen(*wxBLACK_PEN);
     

-    wxNode *node = ((DrawingDocument *)GetDocument())->GetDoodleSegments().First();
+    wxList::compatibility_iterator node = ((DrawingDocument *)GetDocument())->GetDoodleSegments().GetFirst();

     while (node)
     {
     while (node)
     {

-        DoodleSegment *seg = (DoodleSegment *)node->Data();
+        DoodleSegment *seg = (DoodleSegment *)node->GetData();

         seg->Draw(dc);
         seg->Draw(dc);

-        node = node->Next();
+        node = node->GetNext();

     }
 }
 
     }
 }
 


@@ -127,7 +127,7 @@ bool DrawingView::OnClose(bool deleteWindow)
     
     // Clear the canvas in  case we're in single-window mode,
     // and the canvas stays.
     
     // 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;
     
     canvas->view = (wxView *) NULL;
     canvas = (MyCanvas *) NULL;
     


@@ -150,7 +150,7 @@ bool DrawingView::OnClose(bool deleteWindow)
 void DrawingView::OnCut(wxCommandEvent& WXUNUSED(event) )
 {
     DrawingDocument *doc = (DrawingDocument *)GetDocument();
 void DrawingView::OnCut(wxCommandEvent& WXUNUSED(event) )
 {
     DrawingDocument *doc = (DrawingDocument *)GetDocument();

-    doc->GetCommandProcessor()->Submit(new DrawingCommand((char *) "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)
 }
 
 IMPLEMENT_DYNAMIC_CLASS(TextEditView, wxView)


@@ -162,7 +162,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);
     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
     
 #ifdef __X__
     // X seems to require a forced resize


@@ -241,7 +241,7 @@ void MyCanvas::OnMouseEvent(wxMouseEvent& event)
     
     if (currentSegment && event.LeftUp())
     {
     
     if (currentSegment && event.LeftUp())
     {

-        if (currentSegment->lines.Number() == 0)
+        if (currentSegment->lines.GetCount() == 0)

         {
             delete currentSegment;
             currentSegment = (DoodleSegment *) NULL;
         {
             delete currentSegment;
             currentSegment = (DoodleSegment *) NULL;


@@ -251,7 +251,7 @@ void MyCanvas::OnMouseEvent(wxMouseEvent& event)
             // We've got a valid segment on mouse left up, so store it.
             DrawingDocument *doc = (DrawingDocument *)view->GetDocument();
             
             // 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;
             
             view->GetDocument()->Modify(TRUE);
             currentSegment = (DoodleSegment *) NULL;


@@ -278,7 +278,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):
 
 // 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, "", pos, size, style)
+    wxTextCtrl(frame, -1, _T(""), pos, size, style)

 {
     view = v;
 }
 {
     view = v;
 }