Removed very out of date files in docs/msw

[wxWidgets.git] / contrib / samples / ogl / ogledit / doc.cpp

diff --git a/contrib/samples/ogl/ogledit/doc.cpp b/contrib/samples/ogl/ogledit/doc.cpp
index ecda6e4917a2858bc585468b5f1ebd2bf0f0fcf4..833ab5c12acafeb8518ddfdab1804fa164588e66 100644 (file)
--- a/contrib/samples/ogl/ogledit/doc.cpp
+++ b/contrib/samples/ogl/ogledit/doc.cpp
@@ -6,7 +6,7 @@
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -49,14 +49,14 @@ DiagramDocument::~DiagramDocument(void)
 bool DiagramDocument::OnCloseDocument(void)
 {
   diagram.DeleteAllShapes();
 bool DiagramDocument::OnCloseDocument(void)
 {
   diagram.DeleteAllShapes();

-  return TRUE;
+  return true;

 }
 
 #if wxUSE_STD_IOSTREAM
 wxSTD ostream& DiagramDocument::SaveObject(wxSTD ostream& stream)
 {
   wxDocument::SaveObject(stream);
 }
 
 #if wxUSE_STD_IOSTREAM
 wxSTD ostream& DiagramDocument::SaveObject(wxSTD ostream& stream)
 {
   wxDocument::SaveObject(stream);

-  
+

   char buf[400];
   (void) wxGetTempFileName("diag", buf);
 
   char buf[400];
   (void) wxGetTempFileName("diag", buf);
 


@@ -64,7 +64,7 @@ wxSTD ostream& DiagramDocument::SaveObject(wxSTD ostream& stream)
   wxTransferFileToStream(buf, stream);
 
   wxRemoveFile(buf);
   wxTransferFileToStream(buf, stream);
 
   wxRemoveFile(buf);

-  
+

   return stream;
 }
 
   return stream;
 }
 


@@ -130,7 +130,7 @@ wxInputStream& DiagramDocument::LoadObject(wxInputStream& stream)
 
 DiagramCommand::DiagramCommand(const wxString& name, int command, DiagramDocument *ddoc, wxClassInfo *info, double xx, double yy,
   bool sel, wxShape *theShape, wxShape *fs, wxShape *ts):
 
 DiagramCommand::DiagramCommand(const wxString& name, int command, DiagramDocument *ddoc, wxClassInfo *info, double xx, double yy,
   bool sel, wxShape *theShape, wxShape *fs, wxShape *ts):

-  wxCommand(TRUE, name)
+  wxCommand(true, name)

 {
   doc = ddoc;
   cmd = command;
 {
   doc = ddoc;
   cmd = command;


@@ -143,11 +143,11 @@ DiagramCommand::DiagramCommand(const wxString& name, int command, DiagramDocumen
   x = xx;
   y = yy;
   selected = sel;
   x = xx;
   y = yy;
   selected = sel;

-  deleteShape = FALSE;
+  deleteShape = false;

 }
 
 DiagramCommand::DiagramCommand(const wxString& name, int command, DiagramDocument *ddoc, wxBrush *backgroundColour, wxShape *theShape):
 }
 
 DiagramCommand::DiagramCommand(const wxString& name, int command, DiagramDocument *ddoc, wxBrush *backgroundColour, wxShape *theShape):

-  wxCommand(TRUE, name)
+  wxCommand(true, name)

 {
   doc = ddoc;
   cmd = command;
 {
   doc = ddoc;
   cmd = command;


@@ -157,14 +157,14 @@ DiagramCommand::DiagramCommand(const wxString& name, int command, DiagramDocumen
   shapeInfo = NULL;
   x = 0.0;
   y = 0.0;
   shapeInfo = NULL;
   x = 0.0;
   y = 0.0;

-  selected = FALSE;
-  deleteShape = FALSE;
+  selected = false;
+  deleteShape = false;

   shapeBrush = backgroundColour;
   shapePen = NULL;
 }
 
 DiagramCommand::DiagramCommand(const wxString& name, int command, DiagramDocument *ddoc, const wxString& lab, wxShape *theShape):
   shapeBrush = backgroundColour;
   shapePen = NULL;
 }
 
 DiagramCommand::DiagramCommand(const wxString& name, int command, DiagramDocument *ddoc, const wxString& lab, wxShape *theShape):

-  wxCommand(TRUE, name)
+  wxCommand(true, name)

 {
   doc = ddoc;
   cmd = command;
 {
   doc = ddoc;
   cmd = command;


@@ -174,8 +174,8 @@ DiagramCommand::DiagramCommand(const wxString& name, int command, DiagramDocumen
   shapeInfo = NULL;
   x = 0.0;
   y = 0.0;
   shapeInfo = NULL;
   x = 0.0;
   y = 0.0;

-  selected = FALSE;
-  deleteShape = FALSE;
+  selected = false;
+  deleteShape = false;

   shapeBrush = NULL;
   shapePen = NULL;
   shapeLabel = lab;
   shapeBrush = NULL;
   shapePen = NULL;
   shapeLabel = lab;


@@ -194,17 +194,17 @@ bool DiagramCommand::Do(void)
 {
   switch (cmd)
   {
 {
   switch (cmd)
   {

-    case OGLEDIT_CUT:
+    case wxID_CUT:

     {
       if (shape)
       {
     {
       if (shape)
       {

-        deleteShape = TRUE;
-        
-        shape->Select(FALSE);
-        
+        deleteShape = true;
+
+        shape->Select(false);
+

         // Generate commands to explicitly remove each connected line.
         RemoveLines(shape);
         // Generate commands to explicitly remove each connected line.
         RemoveLines(shape);

-        
+

         doc->GetDiagram()->RemoveShape(shape);
         if (shape->IsKindOf(CLASSINFO(wxLineShape)))
         {
         doc->GetDiagram()->RemoveShape(shape);
         if (shape->IsKindOf(CLASSINFO(wxLineShape)))
         {


@@ -213,8 +213,8 @@ bool DiagramCommand::Do(void)
           toShape = lineShape->GetTo();
         }
         shape->Unlink();
           toShape = lineShape->GetTo();
         }
         shape->Unlink();

-        
-        doc->Modify(TRUE);
+
+        doc->Modify(true);

         doc->UpdateAllViews();
       }
 
         doc->UpdateAllViews();
       }
 


@@ -222,7 +222,7 @@ bool DiagramCommand::Do(void)
     }
     case OGLEDIT_ADD_SHAPE:
     {
     }
     case OGLEDIT_ADD_SHAPE:
     {

-      wxShape *theShape = NULL;
+      wxShape *theShape;

       if (shape)
         theShape = shape; // Saved from undoing the shape
       else
       if (shape)
         theShape = shape; // Saved from undoing the shape
       else


@@ -230,30 +230,30 @@ bool DiagramCommand::Do(void)
         theShape = (wxShape *)shapeInfo->CreateObject();
         theShape->AssignNewIds();
         theShape->SetEventHandler(new MyEvtHandler(theShape, theShape, wxEmptyString));
         theShape = (wxShape *)shapeInfo->CreateObject();
         theShape->AssignNewIds();
         theShape->SetEventHandler(new MyEvtHandler(theShape, theShape, wxEmptyString));

-        theShape->SetCentreResize(FALSE);
+        theShape->SetCentreResize(false);

         theShape->SetPen(wxBLACK_PEN);
         theShape->SetBrush(wxCYAN_BRUSH);
         theShape->SetPen(wxBLACK_PEN);
         theShape->SetBrush(wxCYAN_BRUSH);

-      
+

         theShape->SetSize(60, 60);
       }
       doc->GetDiagram()->AddShape(theShape);
         theShape->SetSize(60, 60);
       }
       doc->GetDiagram()->AddShape(theShape);

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

 
       wxClientDC dc(theShape->GetCanvas());
       theShape->GetCanvas()->PrepareDC(dc);
 
       theShape->Move(dc, x, y);
 
       wxClientDC dc(theShape->GetCanvas());
       theShape->GetCanvas()->PrepareDC(dc);
 
       theShape->Move(dc, x, y);

-      
+

       shape = theShape;
       shape = theShape;

-      deleteShape = FALSE;
+      deleteShape = false;

 
 

-      doc->Modify(TRUE);
+      doc->Modify(true);

       doc->UpdateAllViews();
       break;
     }
     case OGLEDIT_ADD_LINE:
     {
       doc->UpdateAllViews();
       break;
     }
     case OGLEDIT_ADD_LINE:
     {

-      wxShape *theShape = NULL;
+      wxShape *theShape;

       if (shape)
         theShape = shape; // Saved from undoing the line
       else
       if (shape)
         theShape = shape; // Saved from undoing the line
       else


@@ -271,12 +271,12 @@ bool DiagramCommand::Do(void)
         lineShape->MakeLineControlPoints(2);
         lineShape->AddArrow(ARROW_ARROW, ARROW_POSITION_END, 10.0, 0.0, _T("Normal arrowhead"));
       }
         lineShape->MakeLineControlPoints(2);
         lineShape->AddArrow(ARROW_ARROW, ARROW_POSITION_END, 10.0, 0.0, _T("Normal arrowhead"));
       }

-      
+

       doc->GetDiagram()->AddShape(theShape);
       doc->GetDiagram()->AddShape(theShape);

-      
+

       fromShape->AddLine((wxLineShape *)theShape, toShape);
       fromShape->AddLine((wxLineShape *)theShape, toShape);

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

 
       wxClientDC dc(theShape->GetCanvas());
       theShape->GetCanvas()->PrepareDC(dc);
 
       wxClientDC dc(theShape->GetCanvas());
       theShape->GetCanvas()->PrepareDC(dc);


@@ -285,11 +285,11 @@ bool DiagramCommand::Do(void)
       // connected images
       fromShape->Move(dc, fromShape->GetX(), fromShape->GetY());
       toShape->Move(dc, toShape->GetX(), toShape->GetY());
       // connected images
       fromShape->Move(dc, fromShape->GetX(), fromShape->GetY());
       toShape->Move(dc, toShape->GetX(), toShape->GetY());

-      
+

       shape = theShape;
       shape = theShape;

-      deleteShape = FALSE;
+      deleteShape = false;

 
 

-      doc->Modify(TRUE);
+      doc->Modify(true);

       doc->UpdateAllViews();
       break;
     }
       doc->UpdateAllViews();
       break;
     }


@@ -304,8 +304,8 @@ bool DiagramCommand::Do(void)
         shape->SetBrush(shapeBrush);
         shapeBrush = oldBrush;
         shape->Draw(dc);
         shape->SetBrush(shapeBrush);
         shapeBrush = oldBrush;
         shape->Draw(dc);

-        
-        doc->Modify(TRUE);
+
+        doc->Modify(true);

         doc->UpdateAllViews();
       }
 
         doc->UpdateAllViews();
       }
 


@@ -325,27 +325,27 @@ bool DiagramCommand::Do(void)
 
         shape->FormatText(dc, /* (char*) (const char*) */ myHandler->label);
         shape->Draw(dc);
 
         shape->FormatText(dc, /* (char*) (const char*) */ myHandler->label);
         shape->Draw(dc);

-        
-        doc->Modify(TRUE);
+
+        doc->Modify(true);

         doc->UpdateAllViews();
       }
 
       break;
     }
   }
         doc->UpdateAllViews();
       }
 
       break;
     }
   }

-  return TRUE;
+  return true;

 }
 
 bool DiagramCommand::Undo(void)
 {
   switch (cmd)
   {
 }
 
 bool DiagramCommand::Undo(void)
 {
   switch (cmd)
   {

-    case OGLEDIT_CUT:
+    case wxID_CUT:

     {
       if (shape)
       {
         doc->GetDiagram()->AddShape(shape);
     {
       if (shape)
       {
         doc->GetDiagram()->AddShape(shape);

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

 
         if (shape->IsKindOf(CLASSINFO(wxLineShape)))
         {
 
         if (shape->IsKindOf(CLASSINFO(wxLineShape)))
         {


@@ -354,11 +354,11 @@ bool DiagramCommand::Undo(void)
           fromShape->AddLine(lineShape, toShape);
         }
         if (selected)
           fromShape->AddLine(lineShape, toShape);
         }
         if (selected)

-          shape->Select(TRUE);
+          shape->Select(true);

 
 

-        deleteShape = FALSE;
+        deleteShape = false;

       }
       }

-      doc->Modify(TRUE);
+      doc->Modify(true);

       doc->UpdateAllViews();
       break;
     }
       doc->UpdateAllViews();
       break;
     }


@@ -370,12 +370,12 @@ bool DiagramCommand::Undo(void)
         wxClientDC dc(shape->GetCanvas());
         shape->GetCanvas()->PrepareDC(dc);
 
         wxClientDC dc(shape->GetCanvas());
         shape->GetCanvas()->PrepareDC(dc);
 

-        shape->Select(FALSE, &dc);
+        shape->Select(false, &dc);

         doc->GetDiagram()->RemoveShape(shape);
         shape->Unlink();
         doc->GetDiagram()->RemoveShape(shape);
         shape->Unlink();

-        deleteShape = TRUE;
+        deleteShape = true;

       }
       }

-      doc->Modify(TRUE);
+      doc->Modify(true);

       doc->UpdateAllViews();
       break;
     }
       doc->UpdateAllViews();
       break;
     }


@@ -390,8 +390,8 @@ bool DiagramCommand::Undo(void)
         shape->SetBrush(shapeBrush);
         shapeBrush = oldBrush;
         shape->Draw(dc);
         shape->SetBrush(shapeBrush);
         shapeBrush = oldBrush;
         shape->Draw(dc);

-        
-        doc->Modify(TRUE);
+
+        doc->Modify(true);

         doc->UpdateAllViews();
       }
       break;
         doc->UpdateAllViews();
       }
       break;


@@ -410,34 +410,34 @@ bool DiagramCommand::Undo(void)
 
         shape->FormatText(dc, /* (char*) (const char*) */ myHandler->label);
         shape->Draw(dc);
 
         shape->FormatText(dc, /* (char*) (const char*) */ myHandler->label);
         shape->Draw(dc);

-        
-        doc->Modify(TRUE);
+
+        doc->Modify(true);

         doc->UpdateAllViews();
       }
 
       break;
     }
   }
         doc->UpdateAllViews();
       }
 
       break;
     }
   }

-  return TRUE;
+  return true;

 }
 
 // Remove each individual line connected to a shape by sending a command.
 void DiagramCommand::RemoveLines(wxShape *shape)
 {
 }
 
 // Remove each individual line connected to a shape by sending a command.
 void DiagramCommand::RemoveLines(wxShape *shape)
 {

-  wxNode *node = shape->GetLines().First();
+  wxObjectList::compatibility_iterator node = shape->GetLines().GetFirst();

   while (node)
   {
   while (node)
   {

-    wxLineShape *line = (wxLineShape *)node->Data();
-    doc->GetCommandProcessor()->Submit(new DiagramCommand(_T("Cut"), OGLEDIT_CUT, doc, NULL, 0.0, 0.0, line->Selected(), line));
-    
-    node = shape->GetLines().First();
+    wxLineShape *line = (wxLineShape *)node->GetData();
+    doc->GetCommandProcessor()->Submit(new DiagramCommand(_T("Cut"), wxID_CUT, doc, NULL, 0.0, 0.0, line->Selected(), line));
+
+    node = shape->GetLines().GetFirst();

   }
 }
 
 /*
  * MyEvtHandler: an event handler class for all shapes
  */
   }
 }
 
 /*
  * MyEvtHandler: an event handler class for all shapes
  */

- 
+

 void MyEvtHandler::OnLeftClick(double WXUNUSED(x), double WXUNUSED(y), int keys, int WXUNUSED(attachment))
 {
   wxClientDC dc(GetShape()->GetCanvas());
 void MyEvtHandler::OnLeftClick(double WXUNUSED(x), double WXUNUSED(y), int keys, int WXUNUSED(attachment))
 {
   wxClientDC dc(GetShape()->GetCanvas());


@@ -448,28 +448,28 @@ void MyEvtHandler::OnLeftClick(double WXUNUSED(x), double WXUNUSED(y), int keys,
     // Selection is a concept the library knows about
     if (GetShape()->Selected())
     {
     // Selection is a concept the library knows about
     if (GetShape()->Selected())
     {

-      GetShape()->Select(FALSE, &dc);
+      GetShape()->Select(false, &dc);

       GetShape()->GetCanvas()->Redraw(dc); // Redraw because bits of objects will be are missing
     }
     else
     {
       // Ensure no other shape is selected, to simplify Undo/Redo code
       GetShape()->GetCanvas()->Redraw(dc); // Redraw because bits of objects will be are missing
     }
     else
     {
       // Ensure no other shape is selected, to simplify Undo/Redo code

-      bool redraw = FALSE;
-      wxNode *node = GetShape()->GetCanvas()->GetDiagram()->GetShapeList()->First();
+      bool redraw = false;
+      wxObjectList::compatibility_iterator node = GetShape()->GetCanvas()->GetDiagram()->GetShapeList()->GetFirst();

       while (node)
       {
       while (node)
       {

-        wxShape *eachShape = (wxShape *)node->Data();
+        wxShape *eachShape = (wxShape *)node->GetData();

         if (eachShape->GetParent() == NULL)
         {
           if (eachShape->Selected())
           {
         if (eachShape->GetParent() == NULL)
         {
           if (eachShape->Selected())
           {

-            eachShape->Select(FALSE, &dc);
-            redraw = TRUE;
+            eachShape->Select(false, &dc);
+            redraw = true;

           }
         }
           }
         }

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

       }
       }

-      GetShape()->Select(TRUE, &dc);
+      GetShape()->Select(true, &dc);

       if (redraw)
         GetShape()->GetCanvas()->Redraw(dc);
     }
       if (redraw)
         GetShape()->GetCanvas()->Redraw(dc);
     }


@@ -480,7 +480,9 @@ void MyEvtHandler::OnLeftClick(double WXUNUSED(x), double WXUNUSED(y), int keys,
   }
   else
   {
   }
   else
   {

+#if wxUSE_STATUSBAR

     wxGetApp().frame->SetStatusText(label);
     wxGetApp().frame->SetStatusText(label);

+#endif // wxUSE_STATUSBAR

   }
 }
 
   }
 }
 


@@ -493,11 +495,11 @@ void MyEvtHandler::OnBeginDragRight(double x, double y, int WXUNUSED(keys), int
   // Force attachment to be zero for now. Eventually we can deal with
   // the actual attachment point, e.g. a rectangle side if attachment mode is on.
   attachment = 0;
   // Force attachment to be zero for now. Eventually we can deal with
   // the actual attachment point, e.g. a rectangle side if attachment mode is on.
   attachment = 0;

-  
+

   wxClientDC dc(GetShape()->GetCanvas());
   GetShape()->GetCanvas()->PrepareDC(dc);
 
   wxClientDC dc(GetShape()->GetCanvas());
   GetShape()->GetCanvas()->PrepareDC(dc);
 

-  wxPen dottedPen(wxColour(0, 0, 0), 1, wxDOT);
+  wxPen dottedPen(*wxBLACK, 1, wxDOT);

   dc.SetLogicalFunction(OGLRBLF);
   dc.SetPen(dottedPen);
   double xp, yp;
   dc.SetLogicalFunction(OGLRBLF);
   dc.SetPen(dottedPen);
   double xp, yp;


@@ -514,7 +516,7 @@ void MyEvtHandler::OnDragRight(bool WXUNUSED(draw), double x, double y, int WXUN
   wxClientDC dc(GetShape()->GetCanvas());
   GetShape()->GetCanvas()->PrepareDC(dc);
 
   wxClientDC dc(GetShape()->GetCanvas());
   GetShape()->GetCanvas()->PrepareDC(dc);
 

-  wxPen dottedPen(wxColour(0, 0, 0), 1, wxDOT);
+  wxPen dottedPen(*wxBLACK, 1, wxDOT);

   dc.SetLogicalFunction(OGLRBLF);
   dc.SetPen(dottedPen);
   double xp, yp;
   dc.SetLogicalFunction(OGLRBLF);
   dc.SetPen(dottedPen);
   double xp, yp;


@@ -530,12 +532,12 @@ void MyEvtHandler::OnEndDragRight(double x, double y, int WXUNUSED(keys), int WX
   // Check if we're on an object
   int new_attachment;
   wxShape *otherShape = canvas->FindFirstSensitiveShape(x, y, &new_attachment, OP_DRAG_RIGHT);
   // Check if we're on an object
   int new_attachment;
   wxShape *otherShape = canvas->FindFirstSensitiveShape(x, y, &new_attachment, OP_DRAG_RIGHT);

-  
+

   if (otherShape && !otherShape->IsKindOf(CLASSINFO(wxLineShape)))
   {
     canvas->view->GetDocument()->GetCommandProcessor()->Submit(
       new DiagramCommand(_T("wxLineShape"), OGLEDIT_ADD_LINE, (DiagramDocument *)canvas->view->GetDocument(), CLASSINFO(wxLineShape),
   if (otherShape && !otherShape->IsKindOf(CLASSINFO(wxLineShape)))
   {
     canvas->view->GetDocument()->GetCommandProcessor()->Submit(
       new DiagramCommand(_T("wxLineShape"), OGLEDIT_ADD_LINE, (DiagramDocument *)canvas->view->GetDocument(), CLASSINFO(wxLineShape),

-      0.0, 0.0, FALSE, NULL, GetShape(), otherShape));
+      0.0, 0.0, false, NULL, GetShape(), otherShape));

   }
 }
 
   }
 }
 


@@ -552,13 +554,13 @@ void MyEvtHandler::OnEndSize(double WXUNUSED(x), double WXUNUSED(y))
  */
 
 #if wxUSE_PROLOGIO
  */
 
 #if wxUSE_PROLOGIO

- 
+

 bool MyDiagram::OnShapeSave(wxExprDatabase& db, wxShape& shape, wxExpr& expr)
 {
   wxDiagram::OnShapeSave(db, shape, expr);
   MyEvtHandler *handler = (MyEvtHandler *)shape.GetEventHandler();
   expr.AddAttributeValueString(_T("label"), handler->label);
 bool MyDiagram::OnShapeSave(wxExprDatabase& db, wxShape& shape, wxExpr& expr)
 {
   wxDiagram::OnShapeSave(db, shape, expr);
   MyEvtHandler *handler = (MyEvtHandler *)shape.GetEventHandler();
   expr.AddAttributeValueString(_T("label"), handler->label);

-  return TRUE;
+  return true;

 }
 
 bool MyDiagram::OnShapeLoad(wxExprDatabase& db, wxShape& shape, wxExpr& expr)
 }
 
 bool MyDiagram::OnShapeLoad(wxExprDatabase& db, wxShape& shape, wxExpr& expr)


@@ -568,10 +570,10 @@ bool MyDiagram::OnShapeLoad(wxExprDatabase& db, wxShape& shape, wxExpr& expr)
   expr.AssignAttributeValue(_T("label"), &label);
   MyEvtHandler *handler = new MyEvtHandler(&shape, &shape, wxString(label));
   shape.SetEventHandler(handler);
   expr.AssignAttributeValue(_T("label"), &label);
   MyEvtHandler *handler = new MyEvtHandler(&shape, &shape, wxString(label));
   shape.SetEventHandler(handler);

-  
+

   if (label)
     delete[] label;
   if (label)
     delete[] label;

-  return TRUE;
+  return true;

 }
 
 #endif
 }
 
 #endif


@@ -600,7 +602,7 @@ wxDiamondShape::wxDiamondShape(double w, double h):
     w = 60.0;
   if (h == 0.0)
     h = 60.0;
     w = 60.0;
   if (h == 0.0)
     h = 60.0;

-    
+

   wxList *thePoints = new wxList;
   wxRealPoint *point = new wxRealPoint(0.0, (-h/2.0));
   thePoints->Append((wxObject*) point);
   wxList *thePoints = new wxList;
   wxRealPoint *point = new wxRealPoint(0.0, (-h/2.0));
   thePoints->Append((wxObject*) point);