Make expat's configure detect if -ext o is needed (MW) so tests work correctly.

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

diff --git a/samples/docvwmdi/view.cpp b/samples/docvwmdi/view.cpp
index 7da43c504bca9294a08eace55c4a75e12740624b..a598fbc1321a19557f82c28bf9ed6d57d04e0c4a 100644 (file)
--- a/samples/docvwmdi/view.cpp
+++ b/samples/docvwmdi/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__


@@ -25,7 +25,7 @@
 #endif
 
 #if !wxUSE_DOC_VIEW_ARCHITECTURE
 #endif
 
 #if !wxUSE_DOC_VIEW_ARCHITECTURE

-#error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in wx_setup.h!
+#error You must set wxUSE_DOC_VIEW_ARCHITECTURE to 1 in setup.h!

 #endif
 
 #include "docview.h"
 #endif
 
 #include "docview.h"


@@ -46,19 +46,20 @@ END_EVENT_TABLE()
 // windows for displaying the view.
 bool DrawingView::OnCreate(wxDocument *doc, long WXUNUSED(flags) )
 {
 // windows for displaying the view.
 bool DrawingView::OnCreate(wxDocument *doc, long WXUNUSED(flags) )
 {

-    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(x, y);
+    frame->SetSize(wxDefaultCoord, wxDefaultCoord, x, y);

 #endif
 #endif

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

 
 

-    return TRUE;
+    return true;

 }
 
 // Sneakily gets used for default print/preview
 }
 
 // Sneakily gets used for default print/preview


@@ -68,12 +69,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();

   }
 }
 
   }
 }
 


@@ -101,11 +102,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;
 


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

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

   if (deleteWindow)
   {
     delete frame;
   if (deleteWindow)
   {
     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((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)
 
 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(x, y);
+  frame->SetSize(wxDefaultCoord, wxDefaultCoord, x, y);

 #endif
 
 #endif
 

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

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


@@ -167,16 +168,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;
-    
-  Activate(FALSE);
+    return false;
+
+  Activate(false);

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

-    return TRUE;
+    return true;

   }
   }

-  return TRUE;
+  return true;

 }
 
 /*
 }
 
 /*


@@ -188,8 +189,8 @@ BEGIN_EVENT_TABLE(MyCanvas, wxScrolledWindow)
 END_EVENT_TABLE()
 
 // Define a constructor for my canvas
 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)
+MyCanvas::MyCanvas(wxView *v, wxMDIChildFrame *frame, const wxPoint& pos, const wxSize& size, long style):
+ wxScrolledWindow(frame, wxID_ANY, pos, size, style)

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


@@ -207,7 +208,7 @@ void MyCanvas::OnMouseEvent(wxMouseEvent& event)
 {
   if (!view)
     return;
 {
   if (!view)
     return;

-    
+

   static DoodleSegment *currentSegment = (DoodleSegment *) NULL;
 
   wxClientDC dc(this);
   static DoodleSegment *currentSegment = (DoodleSegment *) NULL;
 
   wxClientDC dc(this);


@@ -219,7 +220,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;


@@ -229,25 +230,25 @@ 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;
     }
   }

-  
+

   if (xpos > -1 && ypos > -1 && event.Dragging())
   {
     if (!currentSegment)
       currentSegment = new DoodleSegment;
 
     DoodleLine *newLine = new DoodleLine;
   if (xpos > -1 && ypos > -1 && event.Dragging())
   {
     if (!currentSegment)
       currentSegment = new DoodleSegment;
 
     DoodleLine *newLine = new DoodleLine;

-    newLine->x1 = (long)xpos; 
+    newLine->x1 = (long)xpos;

     newLine->y1 = (long)ypos;
     newLine->y1 = (long)ypos;

-    newLine->x2 = pt.x; 
+    newLine->x2 = pt.x;

     newLine->y2 = pt.y;
     currentSegment->lines.Append(newLine);
     newLine->y2 = pt.y;
     currentSegment->lines.Append(newLine);

-    
+

     dc.DrawLine( (long)xpos, (long)ypos, pt.x, pt.y);
   }
   xpos = pt.x;
     dc.DrawLine( (long)xpos, (long)ypos, pt.x, pt.y);
   }
   xpos = pt.x;


@@ -255,8 +256,8 @@ void MyCanvas::OnMouseEvent(wxMouseEvent& event)
 }
 
 // Define a constructor for my text subwindow
 }
 
 // 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)
+MyTextWindow::MyTextWindow(wxView *v, wxMDIChildFrame *frame, const wxPoint& pos, const wxSize& size, long style):
+ wxTextCtrl(frame, wxID_ANY, _T(""), pos, size, style)

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