fixed Union() for the case of this rectangle being empty

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

diff --git a/samples/docview/view.cpp b/samples/docview/view.cpp
index 9c89122f40a12b430721b628a03c1f0df4a29feb..a3b072b381ec57adccae106b76c83b57e0da967d 100644 (file)
--- a/samples/docview/view.cpp
+++ b/samples/docview/view.cpp
@@ -5,7 +5,7 @@
 // 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
+// Copyright:   (c) Julian Smart

 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 


@@ -49,17 +49,17 @@ bool DrawingView::OnCreate(wxDocument *doc, long WXUNUSED(flags) )
     if (!singleWindowMode)
     {
         // Multiple windows
     if (!singleWindowMode)
     {
         // Multiple windows

-        frame = wxGetApp().CreateChildFrame(doc, this, TRUE);
-        frame->SetTitle("DrawingView");
+        frame = wxGetApp().CreateChildFrame(doc, this, true);
+        frame->SetTitle(_T("DrawingView"));

         
         canvas = GetMainFrame()->CreateCanvas(this, frame);
 #ifdef __X__
         // X seems to require a forced resize
         int x, y;
         frame->GetSize(&x, &y);
         
         canvas = GetMainFrame()->CreateCanvas(this, frame);
 #ifdef __X__
         // 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
 #endif

-        frame->Show(TRUE);
+        frame->Show(true);

     }
     else
     {
     }
     else
     {


@@ -73,14 +73,14 @@ bool DrawingView::OnCreate(wxDocument *doc, long WXUNUSED(flags) )
         
         // Make sure the document manager knows that this is the
         // current view.
         
         // 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();
     }
     
         
         // 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
 }
 
 // Sneakily gets used for default print/preview


@@ -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();

     }
 }
 
     }
 }
 


@@ -123,11 +123,11 @@ void DrawingView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint))
 bool DrawingView::OnClose(bool deleteWindow)
 {
     if (!GetDocument()->Close())
 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.
     
     // 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;
     


@@ -137,44 +137,44 @@ bool DrawingView::OnClose(bool deleteWindow)
     
     SetFrame((wxFrame *) NULL);
     
     
     SetFrame((wxFrame *) NULL);
     

-    Activate(FALSE);
+    Activate(false);

     
     if (deleteWindow && !singleWindowMode)
     {
         delete frame;
     
     if (deleteWindow && !singleWindowMode)
     {
         delete frame;

-        return TRUE;
+        return true;

     }
     }

-    return TRUE;
+    return true;

 }
 
 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)
 
 bool TextEditView::OnCreate(wxDocument *doc, long WXUNUSED(flags) )
 {
 }
 
 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);
     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
     int x, y;
     frame->GetSize(&x, &y);
     
 #ifdef __X__
     // 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
     
 #endif
     

-    frame->Show(TRUE);
-    Activate(TRUE);
+    frame->Show(true);
+    Activate(true);

     
     

-    return TRUE;
+    return true;

 }
 
 // Handled by wxTextWindow
 }
 
 // Handled by wxTextWindow


@@ -189,16 +189,16 @@ void TextEditView::OnUpdate(wxView *WXUNUSED(sender), wxObject *WXUNUSED(hint) )
 bool TextEditView::OnClose(bool deleteWindow)
 {
     if (!GetDocument()->Close())
 bool TextEditView::OnClose(bool deleteWindow)
 {
     if (!GetDocument()->Close())

-        return FALSE;
+        return false;

     
     

-    Activate(FALSE);
+    Activate(false);

     
     if (deleteWindow)
     {
         delete frame;
     
     if (deleteWindow)
     {
         delete frame;

-        return TRUE;
+        return true;

     }
     }

-    return TRUE;
+    return true;

 }
 
 /*
 }
 
 /*


@@ -211,7 +211,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):
 
 // 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;
 }
 {
     view = v;
 }


@@ -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,9 +251,9 @@ 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);
+            view->GetDocument()->Modify(true);

             currentSegment = (DoodleSegment *) NULL;
         }
     }
             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, wxID_ANY, _T(""), pos, size, style)

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