reverted recent VK_OEM_PLUS change, do map it to '+' for now, but added a comment...

[wxWidgets.git] / contrib / samples / ogl / studio / shapes.cpp

diff --git a/contrib/samples/ogl/studio/shapes.cpp b/contrib/samples/ogl/studio/shapes.cpp
index 272b887ba299298fbdc6af09ed3068e8f2e02815..2129895d303e8ea33c429cd91762c444a06e5f2b 100644 (file)
--- a/contrib/samples/ogl/studio/shapes.cpp
+++ b/contrib/samples/ogl/studio/shapes.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__


@@ -130,7 +130,7 @@ void csEvtHandler::OnLeftClick(double WXUNUSED(x), double WXUNUSED(y), int keys,
     // If the shape was selected, deselect it and vice versa.
     bool selected = GetShape()->Selected();
 
     // If the shape was selected, deselect it and vice versa.
     bool selected = GetShape()->Selected();
 

-    view->SelectAll(FALSE);
+    view->SelectAll(false);

 
     selected = !selected;
 
 
     selected = !selected;
 


@@ -143,13 +143,13 @@ void csEvtHandler::OnLeftClick(double WXUNUSED(x), double WXUNUSED(y), int keys,
   {
     if (GetShape()->Selected())
     {
   {
     if (GetShape()->Selected())
     {

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

     }
     else
     {
     }
     else
     {

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

     }
     GetShape()->GetCanvas()->Redraw(dc); // Redraw because bits of objects will be missing
   }
     }
     GetShape()->GetCanvas()->Redraw(dc); // Redraw because bits of objects will be missing
   }


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

+#if wxUSE_STATUSBAR

     ((wxFrame*)wxGetApp().GetTopWindow())->SetStatusText(m_label);
     ((wxFrame*)wxGetApp().GetTopWindow())->SetStatusText(m_label);

+#endif // wxUSE_STATUSBAR

   }
 }
 
   }
 }
 


@@ -299,7 +301,7 @@ void csEvtHandler::OnDragLeft(bool draw, double x, double y, int keys, int attac
   GetShape()->GetEventHandler()->OnDrawOutline(dc, xx, yy, w, h);
 
   // Draw bounding box for other selected shapes
   GetShape()->GetEventHandler()->OnDrawOutline(dc, xx, yy, w, h);
 
   // Draw bounding box for other selected shapes

-  wxNode* node = GetShape()->GetCanvas()->GetDiagram()->GetShapeList()->GetFirst();
+  wxObjectList::compatibility_iterator node = GetShape()->GetCanvas()->GetDiagram()->GetShapeList()->GetFirst();

   while (node)
   {
      wxShape* shape = (wxShape*) node->GetData();
   while (node)
   {
      wxShape* shape = (wxShape*) node->GetData();


@@ -358,7 +360,7 @@ void csEvtHandler::OnBeginDragLeft(double x, double y, int keys, int attachment)
   GetShape()->GetEventHandler()->OnDrawOutline(dc, xx, yy, w, h);
 
   // Draw bounding box for other selected shapes
   GetShape()->GetEventHandler()->OnDrawOutline(dc, xx, yy, w, h);
 
   // Draw bounding box for other selected shapes

-  wxNode* node = GetShape()->GetCanvas()->GetDiagram()->GetShapeList()->GetFirst();
+  wxObjectList::compatibility_iterator node = GetShape()->GetCanvas()->GetDiagram()->GetShapeList()->GetFirst();

   while (node)
   {
      wxShape* shape = (wxShape*) node->GetData();
   while (node)
   {
      wxShape* shape = (wxShape*) node->GetData();


@@ -413,7 +415,7 @@ void csEvtHandler::OnEndDragLeft(double x, double y, int keys, int attachment)
                 new csCommandState(ID_CS_MOVE, newShape, GetShape()));
 
   // Move line points
                 new csCommandState(ID_CS_MOVE, newShape, GetShape()));
 
   // Move line points

-  wxNode* node = GetShape()->GetCanvas()->GetDiagram()->GetShapeList()->GetFirst();
+  wxObjectList::compatibility_iterator node = GetShape()->GetCanvas()->GetDiagram()->GetShapeList()->GetFirst();

   while (node)
   {
      wxShape* shape = (wxShape*) node->GetData();
   while (node)
   {
      wxShape* shape = (wxShape*) node->GetData();


@@ -427,7 +429,7 @@ void csEvtHandler::OnEndDragLeft(double x, double y, int keys, int attachment)
         {
             wxLineShape* newLineShape = (wxLineShape*) lineShape->CreateNewCopy();
 
         {
             wxLineShape* newLineShape = (wxLineShape*) lineShape->CreateNewCopy();
 

-            wxNode *node1 = newLineShape->GetLineControlPoints()->GetFirst();
+            wxObjectList::compatibility_iterator node1 = newLineShape->GetLineControlPoints()->GetFirst();

             while (node1)
             {
                 wxRealPoint *point = (wxRealPoint *)node1->GetData();
             while (node1)
             {
                 wxRealPoint *point = (wxRealPoint *)node1->GetData();


@@ -477,7 +479,7 @@ void csEvtHandler::OnSizingEndDragLeft(wxControlPoint* pt, double x, double y, i
         wxClientDC dc(canvas);
         canvas->PrepareDC(dc);
 
         wxClientDC dc(canvas);
         canvas->PrepareDC(dc);
 

-        shape->SetDisableLabel(FALSE);
+        shape->SetDisableLabel(false);

 
         if (lpt->m_type == CONTROL_POINT_LINE)
         {
 
         if (lpt->m_type == CONTROL_POINT_LINE)
         {


@@ -529,7 +531,7 @@ void csEvtHandler::OnSizingEndDragLeft(wxControlPoint* pt, double x, double y, i
   shape->Recompute();
   shape->ResetControlPoints();
   if (!pt->m_eraseObject)
   shape->Recompute();
   shape->ResetControlPoints();
   if (!pt->m_eraseObject)

-    shape->Show(FALSE);
+    shape->Show(false);

 */
 
   wxShape* newShape = shape->CreateNewCopy();
 */
 
   wxShape* newShape = shape->CreateNewCopy();


@@ -612,7 +614,7 @@ bool csEvtHandler::EditProperties()
 
     // For now, no line property editing
     if (shape->IsKindOf(CLASSINFO(wxLineShape)))
 
     // For now, no line property editing
     if (shape->IsKindOf(CLASSINFO(wxLineShape)))

-        return FALSE;
+        return false;

 
     csDiagramView* view = ((csCanvas*)shape->GetCanvas())->GetView();
 
 
     csDiagramView* view = ((csCanvas*)shape->GetCanvas())->GetView();
 


@@ -677,7 +679,7 @@ bool csEvtHandler::EditProperties()
     else
     {
         wxMessageBox(_T("Unrecognised shape."), _T("Studio"), wxICON_EXCLAMATION);
     else
     {
         wxMessageBox(_T("Unrecognised shape."), _T("Studio"), wxICON_EXCLAMATION);

-        return FALSE;
+        return false;

     }
 
     csShapePropertiesDialog* dialog = new csShapePropertiesDialog(shape->GetCanvas()->GetParent(), title, attributeDialog, attributeDialogName);
     }
 
     csShapePropertiesDialog* dialog = new csShapePropertiesDialog(shape->GetCanvas()->GetParent(), title, attributeDialog, attributeDialogName);


@@ -685,7 +687,7 @@ bool csEvtHandler::EditProperties()
     if (dialog->ShowModal() == wxID_CANCEL)
     {
         dialog->Destroy();
     if (dialog->ShowModal() == wxID_CANCEL)
     {
         dialog->Destroy();

-        return FALSE;
+        return false;

     }
 
     wxString newLabel = dialog->GetGeneralPropertiesDialog()->GetShapeLabel();
     }
 
     wxString newLabel = dialog->GetGeneralPropertiesDialog()->GetShapeLabel();


@@ -699,7 +701,7 @@ bool csEvtHandler::EditProperties()
     view->GetDocument()->GetCommandProcessor()->Submit(new csDiagramCommand(_T("Edit properties"), (csDiagramDocument*) view->GetDocument(),
                 new csCommandState(ID_CS_EDIT_PROPERTIES, newShape, shape)));
 
     view->GetDocument()->GetCommandProcessor()->Submit(new csDiagramCommand(_T("Edit properties"), (csDiagramDocument*) view->GetDocument(),
                 new csCommandState(ID_CS_EDIT_PROPERTIES, newShape, shape)));
 

-    return TRUE;
+    return true;

 }
 
 /*
 }
 
 /*


@@ -711,7 +713,7 @@ bool csDiagram::OnShapeSave(wxExprDatabase& db, wxShape& shape, wxExpr& expr)
   wxDiagram::OnShapeSave(db, shape, expr);
   csEvtHandler *handler = (csEvtHandler *)shape.GetEventHandler();
   expr.AddAttributeValueString(_T("label"), handler->m_label);
   wxDiagram::OnShapeSave(db, shape, expr);
   csEvtHandler *handler = (csEvtHandler *)shape.GetEventHandler();
   expr.AddAttributeValueString(_T("label"), handler->m_label);

-  return TRUE;
+  return true;

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


@@ -722,7 +724,7 @@ bool csDiagram::OnShapeLoad(wxExprDatabase& db, wxShape& shape, wxExpr& expr)
   csEvtHandler *handler = new csEvtHandler(&shape, &shape, label);
   shape.SetEventHandler(handler);
   
   csEvtHandler *handler = new csEvtHandler(&shape, &shape, label);
   shape.SetEventHandler(handler);
   

-  return TRUE;
+  return true;

 }
 
 IMPLEMENT_DYNAMIC_CLASS(csThinRectangleShape, wxDrawnShape)
 }
 
 IMPLEMENT_DYNAMIC_CLASS(csThinRectangleShape, wxDrawnShape)


@@ -741,7 +743,7 @@ csThinRectangleShape::csThinRectangleShape()
 
     SetAttachmentMode(ATTACHMENT_MODE_BRANCHING);
     SetBranchStyle(BRANCHING_ATTACHMENT_NORMAL|BRANCHING_ATTACHMENT_BLOB);
 
     SetAttachmentMode(ATTACHMENT_MODE_BRANCHING);
     SetBranchStyle(BRANCHING_ATTACHMENT_NORMAL|BRANCHING_ATTACHMENT_BLOB);

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

 }
 
 IMPLEMENT_DYNAMIC_CLASS(csWideRectangleShape, wxDrawnShape)
 }
 
 IMPLEMENT_DYNAMIC_CLASS(csWideRectangleShape, wxDrawnShape)


@@ -760,7 +762,7 @@ csWideRectangleShape::csWideRectangleShape()
 
     SetAttachmentMode(ATTACHMENT_MODE_BRANCHING);
     SetBranchStyle(BRANCHING_ATTACHMENT_NORMAL|BRANCHING_ATTACHMENT_BLOB);
 
     SetAttachmentMode(ATTACHMENT_MODE_BRANCHING);
     SetBranchStyle(BRANCHING_ATTACHMENT_NORMAL|BRANCHING_ATTACHMENT_BLOB);

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

 }
 
 IMPLEMENT_DYNAMIC_CLASS(csTriangleShape, wxDrawnShape)
 }
 
 IMPLEMENT_DYNAMIC_CLASS(csTriangleShape, wxDrawnShape)


@@ -814,7 +816,7 @@ csTriangleShape::csTriangleShape()
 
     SetAttachmentMode(ATTACHMENT_MODE_BRANCHING);
     SetBranchStyle(BRANCHING_ATTACHMENT_NORMAL|BRANCHING_ATTACHMENT_BLOB);
 
     SetAttachmentMode(ATTACHMENT_MODE_BRANCHING);
     SetBranchStyle(BRANCHING_ATTACHMENT_NORMAL|BRANCHING_ATTACHMENT_BLOB);

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

 }
 
 IMPLEMENT_DYNAMIC_CLASS(csSemiCircleShape, wxDrawnShape)
 }
 
 IMPLEMENT_DYNAMIC_CLASS(csSemiCircleShape, wxDrawnShape)


@@ -911,7 +913,7 @@ csSemiCircleShape::csSemiCircleShape()
 
     SetAttachmentMode(ATTACHMENT_MODE_BRANCHING);
     SetBranchStyle(BRANCHING_ATTACHMENT_NORMAL|BRANCHING_ATTACHMENT_BLOB);
 
     SetAttachmentMode(ATTACHMENT_MODE_BRANCHING);
     SetBranchStyle(BRANCHING_ATTACHMENT_NORMAL|BRANCHING_ATTACHMENT_BLOB);

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

 }
 
 IMPLEMENT_DYNAMIC_CLASS(csCircleShape, wxCircleShape)
 }
 
 IMPLEMENT_DYNAMIC_CLASS(csCircleShape, wxCircleShape)


@@ -926,7 +928,7 @@ csCircleShape::csCircleShape()
 
     SetAttachmentMode(ATTACHMENT_MODE_BRANCHING);
     SetBranchStyle(BRANCHING_ATTACHMENT_NORMAL|BRANCHING_ATTACHMENT_BLOB);
 
     SetAttachmentMode(ATTACHMENT_MODE_BRANCHING);
     SetBranchStyle(BRANCHING_ATTACHMENT_NORMAL|BRANCHING_ATTACHMENT_BLOB);

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

 }
 
 IMPLEMENT_DYNAMIC_CLASS(csCircleShadowShape, wxCircleShape)
 }
 
 IMPLEMENT_DYNAMIC_CLASS(csCircleShadowShape, wxCircleShape)


@@ -941,7 +943,7 @@ csCircleShadowShape::csCircleShadowShape()
 
     SetAttachmentMode(ATTACHMENT_MODE_BRANCHING);
     SetBranchStyle(BRANCHING_ATTACHMENT_NORMAL|BRANCHING_ATTACHMENT_BLOB);
 
     SetAttachmentMode(ATTACHMENT_MODE_BRANCHING);
     SetBranchStyle(BRANCHING_ATTACHMENT_NORMAL|BRANCHING_ATTACHMENT_BLOB);

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

     SetShadowMode(SHADOW_RIGHT);
 }
 
     SetShadowMode(SHADOW_RIGHT);
 }
 


@@ -971,7 +973,7 @@ csOctagonShape::csOctagonShape()
 
     SetAttachmentMode(ATTACHMENT_MODE_BRANCHING);
     SetBranchStyle(BRANCHING_ATTACHMENT_NORMAL|BRANCHING_ATTACHMENT_BLOB);
 
     SetAttachmentMode(ATTACHMENT_MODE_BRANCHING);
     SetBranchStyle(BRANCHING_ATTACHMENT_NORMAL|BRANCHING_ATTACHMENT_BLOB);

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

 }
 
 // This is a transparent shape for drawing around other shapes.
 }
 
 // This is a transparent shape for drawing around other shapes.


@@ -983,7 +985,7 @@ csGroupShape::csGroupShape()
     SetBrush(wxTRANSPARENT_BRUSH);
 
     SetSize(csSTANDARD_SHAPE_WIDTH, csSTANDARD_SHAPE_WIDTH);
     SetBrush(wxTRANSPARENT_BRUSH);
 
     SetSize(csSTANDARD_SHAPE_WIDTH, csSTANDARD_SHAPE_WIDTH);

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

 }
 
 void csGroupShape::OnDraw(wxDC& dc)
 }
 
 void csGroupShape::OnDraw(wxDC& dc)


@@ -1013,20 +1015,20 @@ bool csGroupShape::HitTest(double x, double y, int* attachment, double* distance
     if (x >= x1 && x <= x2)
     {
         if ((y >= y1 - edgeTolerance) && (y <= y1 + edgeTolerance))
     if (x >= x1 && x <= x2)
     {
         if ((y >= y1 - edgeTolerance) && (y <= y1 + edgeTolerance))

-            return TRUE;
+            return true;

         if ((y <= y2 + edgeTolerance) && (y >= y2 - edgeTolerance))
         if ((y <= y2 + edgeTolerance) && (y >= y2 - edgeTolerance))

-            return TRUE;
+            return true;

     }
     // Left/right edges
     if (y >= y1 && y <= y2)
     {
         if ((x >= x1 - edgeTolerance) && (x <= x1 + edgeTolerance))
     }
     // Left/right edges
     if (y >= y1 && y <= y2)
     {
         if ((x >= x1 - edgeTolerance) && (x <= x1 + edgeTolerance))

-            return TRUE;
+            return true;

         if ((x <= x2 + edgeTolerance) && (x >= x2 - edgeTolerance))
         if ((x <= x2 + edgeTolerance) && (x >= x2 - edgeTolerance))

-            return TRUE;
+            return true;

     }
 
     }
 

-    return FALSE;
+    return false;

 }
 
 IMPLEMENT_DYNAMIC_CLASS(csTextBoxShape, wxRectangleShape)
 }
 
 IMPLEMENT_DYNAMIC_CLASS(csTextBoxShape, wxRectangleShape)


@@ -1040,7 +1042,7 @@ csTextBoxShape::csTextBoxShape()
 
     SetAttachmentMode(ATTACHMENT_MODE_NONE);
     SetBranchStyle(BRANCHING_ATTACHMENT_NORMAL|BRANCHING_ATTACHMENT_BLOB);
 
     SetAttachmentMode(ATTACHMENT_MODE_NONE);
     SetBranchStyle(BRANCHING_ATTACHMENT_NORMAL|BRANCHING_ATTACHMENT_BLOB);

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

 }
 
 IMPLEMENT_DYNAMIC_CLASS(csLineShape, wxLineShape)
 }
 
 IMPLEMENT_DYNAMIC_CLASS(csLineShape, wxLineShape)


@@ -1066,7 +1068,7 @@ bool csLineShape::OnMoveMiddleControlPoint(wxDC& WXUNUSED(dc), wxLineControlPoin
     view->GetDocument()->GetCommandProcessor()->Submit(new csDiagramCommand(_T("Move line point"), (csDiagramDocument*) view->GetDocument(),
                 new csCommandState(ID_CS_MOVE_LINE_POINT, newShape, this)));
 
     view->GetDocument()->GetCommandProcessor()->Submit(new csDiagramCommand(_T("Move line point"), (csDiagramDocument*) view->GetDocument(),
                 new csCommandState(ID_CS_MOVE_LINE_POINT, newShape, this)));
 

-    return TRUE;
+    return true;

 }
 
 wxLabelShape* csLineShape::OnCreateLabelShape(wxLineShape *parent, wxShapeRegion *region, double w, double h)
 }
 
 wxLabelShape* csLineShape::OnCreateLabelShape(wxLineShape *parent, wxShapeRegion *region, double w, double h)


@@ -1085,7 +1087,7 @@ bool csLineShape::OnLabelMovePre(wxDC& dc, wxLabelShape* labelShape, double x, d
 
     view->GetDocument()->GetCommandProcessor()->Submit(new csDiagramCommand("Move label", (csDiagramDocument*) view->GetDocument(),
                 new csCommandState(ID_CS_MOVE_LABEL, newShape, this)));
 
     view->GetDocument()->GetCommandProcessor()->Submit(new csDiagramCommand("Move label", (csDiagramDocument*) view->GetDocument(),
                 new csCommandState(ID_CS_MOVE_LABEL, newShape, this)));

-  return TRUE;
+  return true;

 }
 #endif
 
 }
 #endif