compilation fix for gcc (closes bug 996701)

[wxWidgets.git] / contrib / src / ogl / lines.cpp

diff --git a/contrib/src/ogl/lines.cpp b/contrib/src/ogl/lines.cpp
index 045202c68b4732629b487cf593f69ec0f06e02fa..c9f63ba16db864f5887e60d4087d610f4bd96d9e 100644 (file)
--- a/contrib/src/ogl/lines.cpp
+++ b/contrib/src/ogl/lines.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__


@@ -25,7 +25,9 @@
 #include <wx/wx.h>
 #endif
 
 #include <wx/wx.h>
 #endif
 

-#include <wx/wxexpr.h>
+#if wxUSE_PROLOGIO
+#include <wx/deprecated/wxexpr.h>
+#endif

 
 #ifdef new
 #undef new
 
 #ifdef new
 #undef new


@@ -34,13 +36,8 @@
 #include <ctype.h>
 #include <math.h>
 
 #include <ctype.h>
 #include <math.h>
 

-#include <wx/ogl/basic.h>
-#include <wx/ogl/basicp.h>
-#include <wx/ogl/lines.h>
-#include <wx/ogl/linesp.h>
-#include <wx/ogl/drawn.h>
-#include <wx/ogl/misc.h>
-#include <wx/ogl/canvas.h>
+#include "wx/ogl/ogl.h"
+

 
 // Line shape
 IMPLEMENT_DYNAMIC_CLASS(wxLineShape, wxShape)
 
 // Line shape
 IMPLEMENT_DYNAMIC_CLASS(wxLineShape, wxShape)


@@ -48,7 +45,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxLineShape, wxShape)
 wxLineShape::wxLineShape()
 {
   m_sensitivity = OP_CLICK_LEFT | OP_CLICK_RIGHT;
 wxLineShape::wxLineShape()
 {
   m_sensitivity = OP_CLICK_LEFT | OP_CLICK_RIGHT;

-  m_draggable = FALSE;
+  m_draggable = false;

   m_attachmentTo = 0;
   m_attachmentFrom = 0;
 /*
   m_attachmentTo = 0;
   m_attachmentFrom = 0;
 /*


@@ -57,11 +54,11 @@ wxLineShape::wxLineShape()
 */
   m_from = NULL;
   m_to = NULL;
 */
   m_from = NULL;
   m_to = NULL;

-  m_erasing = FALSE;
+  m_erasing = false;

   m_arrowSpacing = 5.0; // For the moment, don't bother saving this to file.
   m_arrowSpacing = 5.0; // For the moment, don't bother saving this to file.

-  m_ignoreArrowOffsets = FALSE;
-  m_isSpline = FALSE;
-  m_maintainStraightLines = FALSE;
+  m_ignoreArrowOffsets = false;
+  m_isSpline = false;
+  m_maintainStraightLines = false;

   m_alignmentStart = 0;
   m_alignmentEnd = 0;
 
   m_alignmentStart = 0;
   m_alignmentEnd = 0;
 


@@ -100,7 +97,7 @@ wxLineShape::~wxLineShape()
   {
     if (m_labelObjects[i])
     {
   {
     if (m_labelObjects[i])
     {

-      m_labelObjects[i]->Select(FALSE);
+      m_labelObjects[i]->Select(false);

       m_labelObjects[i]->RemoveFromCanvas(m_canvas);
       delete m_labelObjects[i];
       m_labelObjects[i] = NULL;
       m_labelObjects[i]->RemoveFromCanvas(m_canvas);
       delete m_labelObjects[i];
       m_labelObjects[i] = NULL;


@@ -118,8 +115,7 @@ void wxLineShape::MakeLineControlPoints(int n)
   }
   m_lineControlPoints = new wxList;
 
   }
   m_lineControlPoints = new wxList;
 

-  int i = 0;
-  for (i = 0; i < n; i++)
+  for (int i = 0; i < n; i++)

   {
     wxRealPoint *point = new wxRealPoint(-999, -999);
     m_lineControlPoints->Append((wxObject*) point);
   {
     wxRealPoint *point = new wxRealPoint(-999, -999);
     m_lineControlPoints->Append((wxObject*) point);


@@ -148,7 +144,7 @@ wxNode *wxLineShape::InsertLineControlPoint(wxDC* dc)
 bool wxLineShape::DeleteLineControlPoint()
 {
   if (m_lineControlPoints->GetCount() < 3)
 bool wxLineShape::DeleteLineControlPoint()
 {
   if (m_lineControlPoints->GetCount() < 3)

-    return FALSE;
+    return false;

 
   wxNode *last = m_lineControlPoints->GetLast();
   wxNode *second_last = last->GetPrevious();
 
   wxNode *last = m_lineControlPoints->GetLast();
   wxNode *second_last = last->GetPrevious();


@@ -157,7 +153,7 @@ bool wxLineShape::DeleteLineControlPoint()
   delete second_last_point;
   delete second_last;
 
   delete second_last_point;
   delete second_last;
 

-  return TRUE;
+  return true;

 }
 
 void wxLineShape::Initialise()
 }
 
 void wxLineShape::Initialise()


@@ -246,7 +242,7 @@ void wxLineShape::FormatText(wxDC& dc, const wxString& s, int i)
       EraseRegion(dc, region, xx, yy);
       if (m_labelObjects[i])
       {
       EraseRegion(dc, region, xx, yy);
       if (m_labelObjects[i])
       {

-        m_labelObjects[i]->Select(FALSE, &dc);
+        m_labelObjects[i]->Select(false, &dc);

         m_labelObjects[i]->Erase(dc);
         m_labelObjects[i]->SetSize(actualW, actualH);
       }
         m_labelObjects[i]->Erase(dc);
         m_labelObjects[i]->SetSize(actualW, actualH);
       }


@@ -255,13 +251,13 @@ void wxLineShape::FormatText(wxDC& dc, const wxString& s, int i)
 
       if (m_labelObjects[i])
       {
 
       if (m_labelObjects[i])
       {

-        m_labelObjects[i]->Select(TRUE, & dc);
+        m_labelObjects[i]->Select(true, & dc);

         m_labelObjects[i]->Draw(dc);
       }
     }
   }
   oglCentreText(dc, &(region->GetFormattedText()), m_xpos, m_ypos, actualW, actualH, region->GetFormatMode());
         m_labelObjects[i]->Draw(dc);
       }
     }
   }
   oglCentreText(dc, &(region->GetFormattedText()), m_xpos, m_ypos, actualW, actualH, region->GetFormatMode());

-  m_formatted = TRUE;
+  m_formatted = true;

 }
 
 void wxLineShape::DrawRegion(wxDC& dc, wxShapeRegion *region, double x, double y)
 }
 
 void wxLineShape::DrawRegion(wxDC& dc, wxShapeRegion *region, double x, double y)


@@ -291,7 +287,7 @@ void wxLineShape::DrawRegion(wxDC& dc, wxShapeRegion *region, double x, double y
       dc.DrawRectangle((long)(xp - w/2.0), (long)(yp - h/2.0), (long)w, (long)h);
 
       if (m_pen) dc.SetPen(* m_pen);
       dc.DrawRectangle((long)(xp - w/2.0), (long)(yp - h/2.0), (long)w, (long)h);
 
       if (m_pen) dc.SetPen(* m_pen);

-      dc.SetTextForeground(* region->GetActualColourObject());
+      dc.SetTextForeground(region->GetActualColourObject());

 
 #ifdef __WXMSW__
       dc.SetTextBackground(GetBackgroundBrush().GetColour());
 
 #ifdef __WXMSW__
       dc.SetTextBackground(GetBackgroundBrush().GetColour());


@@ -468,10 +464,10 @@ void wxLineShape::SetAttachments(int from_attach, int to_attach)
 bool wxLineShape::HitTest(double x, double y, int *attachment, double *distance)
 {
   if (!m_lineControlPoints)
 bool wxLineShape::HitTest(double x, double y, int *attachment, double *distance)
 {
   if (!m_lineControlPoints)

-    return FALSE;
+    return false;

 
   // Look at label regions in case mouse is over a label
 
   // Look at label regions in case mouse is over a label

-  bool inLabelRegion = FALSE;
+  bool inLabelRegion = false;

   for (int i = 0; i < 3; i ++)
   {
     wxNode *regionNode = m_regions.Item(i);
   for (int i = 0; i < 3; i ++)
   {
     wxNode *regionNode = m_regions.Item(i);


@@ -493,7 +489,7 @@ bool wxLineShape::HitTest(double x, double y, int *attachment, double *distance)
         double rBottom = (double)(cy + (ch/2.0));
         if (x > rLeft && x < rRight && y > rTop && y < rBottom)
         {
         double rBottom = (double)(cy + (ch/2.0));
         if (x > rLeft && x < rRight && y > rTop && y < rBottom)
         {

-          inLabelRegion = TRUE;
+          inLabelRegion = true;

           i = 3;
         }
       }
           i = 3;
         }
       }


@@ -507,28 +503,29 @@ bool wxLineShape::HitTest(double x, double y, int *attachment, double *distance)
     wxRealPoint *point1 = (wxRealPoint *)node->GetData();
     wxRealPoint *point2 = (wxRealPoint *)node->GetNext()->GetData();
 
     wxRealPoint *point1 = (wxRealPoint *)node->GetData();
     wxRealPoint *point2 = (wxRealPoint *)node->GetNext()->GetData();
 

-    // Allow for inaccurate mousing or vert/horiz lines
+    // For inaccurate mousing allow 8 pixel corridor

     int extra = 4;
     int extra = 4;

-    double left = wxMin(point1->x, point2->x) - extra;
-    double right = wxMax(point1->x, point2->x) + extra;
-
-    double bottom = wxMin(point1->y, point2->y) - extra;
-    double top = wxMax(point1->y, point2->y) + extra;

 
 

-    if ((x > left && x < right && y > bottom && y < top) || inLabelRegion)
+    double dx = point2->x - point1->x;
+    double dy = point2->y - point1->y;
+    double seg_len = sqrt(dx*dx+dy*dy);
+    double distance_from_seg =
+      seg_len*((x-point1->x)*dy-(y-point1->y)*dx)/(dy*dy+dx*dx);
+    double distance_from_prev =
+      seg_len*((y-point1->y)*dy+(x-point1->x)*dx)/(dy*dy+dx*dx);
+
+    if ((fabs(distance_from_seg) < extra &&
+         distance_from_prev >= 0 && distance_from_prev <= seg_len)
+        || inLabelRegion)

     {
     {

-      // Work out distance from centre of line
-      double centre_x = (double)(left + (right - left)/2.0);
-      double centre_y = (double)(bottom + (top - bottom)/2.0);
-

       *attachment = 0;
       *attachment = 0;

-      *distance = (double)sqrt((centre_x - x)*(centre_x - x) + (centre_y - y)*(centre_y - y));
-      return TRUE;
+      *distance = distance_from_seg;
+      return true;

     }
 
     node = node->GetNext();
   }
     }
 
     node = node->GetNext();
   }

-  return FALSE;
+  return false;

 }
 
 void wxLineShape::DrawArrows(wxDC& dc)
 }
 
 void wxLineShape::DrawArrows(wxDC& dc)


@@ -548,10 +545,10 @@ void wxLineShape::DrawArrows(wxDC& dc)
       {
         if ((arrow->GetXOffset() != 0.0) && !m_ignoreArrowOffsets)
           // If specified, x offset is proportional to line length
       {
         if ((arrow->GetXOffset() != 0.0) && !m_ignoreArrowOffsets)
           // If specified, x offset is proportional to line length

-          DrawArrow(dc, arrow, arrow->GetXOffset(), TRUE);
+          DrawArrow(dc, arrow, arrow->GetXOffset(), true);

         else
         {
         else
         {

-          DrawArrow(dc, arrow, startArrowPos, FALSE);      // Absolute distance
+          DrawArrow(dc, arrow, startArrowPos, false);      // Absolute distance

           startArrowPos += arrow->GetSize() + arrow->GetSpacing();
         }
         break;
           startArrowPos += arrow->GetSize() + arrow->GetSpacing();
         }
         break;


@@ -559,10 +556,10 @@ void wxLineShape::DrawArrows(wxDC& dc)
       case ARROW_POSITION_END:
       {
         if ((arrow->GetXOffset() != 0.0) && !m_ignoreArrowOffsets)
       case ARROW_POSITION_END:
       {
         if ((arrow->GetXOffset() != 0.0) && !m_ignoreArrowOffsets)

-          DrawArrow(dc, arrow, arrow->GetXOffset(), TRUE);
+          DrawArrow(dc, arrow, arrow->GetXOffset(), true);

         else
         {
         else
         {

-          DrawArrow(dc, arrow, endArrowPos, FALSE);
+          DrawArrow(dc, arrow, endArrowPos, false);

           endArrowPos += arrow->GetSize() + arrow->GetSpacing();
         }
         break;
           endArrowPos += arrow->GetSize() + arrow->GetSpacing();
         }
         break;


@@ -571,10 +568,10 @@ void wxLineShape::DrawArrows(wxDC& dc)
       {
         arrow->SetXOffset(middleArrowPos);
         if ((arrow->GetXOffset() != 0.0) && !m_ignoreArrowOffsets)
       {
         arrow->SetXOffset(middleArrowPos);
         if ((arrow->GetXOffset() != 0.0) && !m_ignoreArrowOffsets)

-          DrawArrow(dc, arrow, arrow->GetXOffset(), TRUE);
+          DrawArrow(dc, arrow, arrow->GetXOffset(), true);

         else
         {
         else
         {

-          DrawArrow(dc, arrow, middleArrowPos, FALSE);
+          DrawArrow(dc, arrow, middleArrowPos, false);

           middleArrowPos += arrow->GetSize() + arrow->GetSpacing();
         }
         break;
           middleArrowPos += arrow->GetSize() + arrow->GetSpacing();
         }
         break;


@@ -597,10 +594,10 @@ void wxLineShape::DrawArrow(wxDC& dc, wxArrowHead *arrow, double xOffset, bool p
   wxRealPoint *second_last_line_point = (wxRealPoint *)second_last_line_node->GetData();
 
   // Position where we want to start drawing
   wxRealPoint *second_last_line_point = (wxRealPoint *)second_last_line_node->GetData();
 
   // Position where we want to start drawing

-  double positionOnLineX, positionOnLineY;
+  double positionOnLineX = 0.0, positionOnLineY = 0.0;

 
   // Position of start point of line, at the end of which we draw the arrow.
 
   // Position of start point of line, at the end of which we draw the arrow.

-  double startPositionX, startPositionY;
+  double startPositionX = 0.0 , startPositionY = 0.0;

 
   switch (arrow->GetPosition())
   {
 
   switch (arrow->GetPosition())
   {


@@ -693,7 +690,7 @@ void wxLineShape::DrawArrow(wxDC& dc, wxArrowHead *arrow, double xOffset, bool p
      double y3 = positionOnLineY;
      double d = -arrow->GetYOffset(); // Negate so +offset is above line
 
      double y3 = positionOnLineY;
      double d = -arrow->GetYOffset(); // Negate so +offset is above line
 

-     double theta = 0.0;
+     double theta;

      if (x3 == x1)
        theta = (double)(myPi/2.0);
      else
      if (x3 == x1)
        theta = (double)(myPi/2.0);
      else


@@ -748,7 +745,7 @@ void wxLineShape::DrawArrow(wxDC& dc, wxArrowHead *arrow, double xOffset, bool p
 
       dc.SetPen(* m_pen);
       if (arrow->_GetType() == ARROW_HOLLOW_CIRCLE)
 
       dc.SetPen(* m_pen);
       if (arrow->_GetType() == ARROW_HOLLOW_CIRCLE)

-        dc.SetBrush(* g_oglWhiteBackgroundBrush);
+        dc.SetBrush(GetBackgroundBrush());

       else
         dc.SetBrush(* m_brush);
 
       else
         dc.SetBrush(* m_brush);
 


@@ -882,10 +879,10 @@ void wxLineShape::OnErase(wxDC& dc)
     }
     else
     {
     }
     else
     {

-      m_erasing = TRUE;
+      m_erasing = true;

       GetEventHandler()->OnDraw(dc);
       GetEventHandler()->OnEraseControlPoints(dc);
       GetEventHandler()->OnDraw(dc);
       GetEventHandler()->OnEraseControlPoints(dc);

-      m_erasing = FALSE;
+      m_erasing = false;

     }
 
     if (old_pen) SetPen(old_pen);
     }
 
     if (old_pen) SetPen(old_pen);


@@ -964,7 +961,7 @@ void wxLineShape::FindNth(wxShape *image, int *nth, int *no_arcs, bool incoming)
   *no_arcs = num;
 }
 
   *no_arcs = num;
 }
 

-void wxLineShape::OnDrawOutline(wxDC& dc, double x, double y, double w, double h)
+void wxLineShape::OnDrawOutline(wxDC& dc, double WXUNUSED(x), double WXUNUSED(y), double WXUNUSED(w), double WXUNUSED(h))

 {
   wxPen *old_pen = m_pen;
   wxBrush *old_brush = m_brush;
 {
   wxPen *old_pen = m_pen;
   wxBrush *old_brush = m_brush;


@@ -981,7 +978,7 @@ void wxLineShape::OnDrawOutline(wxDC& dc, double x, double y, double w, double h
   else SetBrush(NULL);
 }
 
   else SetBrush(NULL);
 }
 

-bool wxLineShape::OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool display)
+bool wxLineShape::OnMovePre(wxDC& dc, double x, double y, double old_x, double old_y, bool WXUNUSED(display))

 {
   double x_offset = x - old_x;
   double y_offset = y - old_y;
 {
   double x_offset = x - old_x;
   double y_offset = y - old_y;


@@ -1021,7 +1018,7 @@ bool wxLineShape::OnMovePre(wxDC& dc, double x, double y, double old_x, double o
       m_labelObjects[i]->Move(dc, xp+xr, yp+yr);
     }
   }
       m_labelObjects[i]->Move(dc, xp+xr, yp+yr);
     }
   }

-  return TRUE;
+  return true;

 }
 
 void wxLineShape::OnMoveLink(wxDC& dc, bool moveControlPoints)
 }
 
 void wxLineShape::OnMoveLink(wxDC& dc, bool moveControlPoints)


@@ -1040,9 +1037,9 @@ void wxLineShape::OnMoveLink(wxDC& dc, bool moveControlPoints)
     FindLineEndPoints(&end_x, &end_y, &other_end_x, &other_end_y);
 
     wxNode *first = m_lineControlPoints->GetFirst();
     FindLineEndPoints(&end_x, &end_y, &other_end_x, &other_end_y);
 
     wxNode *first = m_lineControlPoints->GetFirst();

-    wxRealPoint *first_point = (wxRealPoint *)first->GetData();
+    /* wxRealPoint *first_point = */ (wxRealPoint *)first->GetData();

     wxNode *last = m_lineControlPoints->GetLast();
     wxNode *last = m_lineControlPoints->GetLast();

-    wxRealPoint *last_point = (wxRealPoint *)last->GetData();
+    /* wxRealPoint *last_point = */ (wxRealPoint *)last->GetData();

 
 /* This is redundant, surely? Done by SetEnds.
     first_point->x = end_x; first_point->y = end_y;
 
 /* This is redundant, surely? Done by SetEnds.
     first_point->x = end_x; first_point->y = end_y;


@@ -1093,13 +1090,13 @@ void wxLineShape::FindLineEndPoints(double *fromX, double *fromY, double *toX, d
 
   // Do each end - nothing in the middle. User has to move other points
   // manually if necessary.
 
   // Do each end - nothing in the middle. User has to move other points
   // manually if necessary.

-  double end_x, end_y;
-  double other_end_x, other_end_y;
+  double end_x = 0.0, end_y = 0.0;
+  double other_end_x = 0.0, other_end_y = 0.0;

 
   wxNode *first = m_lineControlPoints->GetFirst();
 
   wxNode *first = m_lineControlPoints->GetFirst();

-  wxRealPoint *first_point = (wxRealPoint *)first->GetData();
+  /* wxRealPoint *first_point = */ (wxRealPoint *)first->GetData();

   wxNode *last = m_lineControlPoints->GetLast();
   wxNode *last = m_lineControlPoints->GetLast();

-  wxRealPoint *last_point = (wxRealPoint *)last->GetData();
+  /* wxRealPoint *last_point = */ (wxRealPoint *)last->GetData();

 
   wxNode *second = first->GetNext();
   wxRealPoint *second_point = (wxRealPoint *)second->GetData();
 
   wxNode *second = first->GetNext();
   wxRealPoint *second_point = (wxRealPoint *)second->GetData();


@@ -1112,7 +1109,7 @@ void wxLineShape::FindLineEndPoints(double *fromX, double *fromY, double *toX, d
     if (m_from->GetAttachmentMode() != ATTACHMENT_MODE_NONE)
     {
       int nth, no_arcs;
     if (m_from->GetAttachmentMode() != ATTACHMENT_MODE_NONE)
     {
       int nth, no_arcs;

-      FindNth(m_from, &nth, &no_arcs, FALSE); // Not incoming
+      FindNth(m_from, &nth, &no_arcs, false); // Not incoming

       m_from->GetAttachmentPosition(m_attachmentFrom, &end_x, &end_y, nth, no_arcs, this);
     }
     else
       m_from->GetAttachmentPosition(m_attachmentFrom, &end_x, &end_y, nth, no_arcs, this);
     }
     else


@@ -1123,7 +1120,7 @@ void wxLineShape::FindLineEndPoints(double *fromX, double *fromY, double *toX, d
     if (m_to->GetAttachmentMode() != ATTACHMENT_MODE_NONE)
     {
       int nth, no_arcs;
     if (m_to->GetAttachmentMode() != ATTACHMENT_MODE_NONE)
     {
       int nth, no_arcs;

-      FindNth(m_to, &nth, &no_arcs, TRUE); // Incoming
+      FindNth(m_to, &nth, &no_arcs, true); // Incoming

       m_to->GetAttachmentPosition(m_attachmentTo, &other_end_x, &other_end_y, nth, no_arcs, this);
     }
     else
       m_to->GetAttachmentPosition(m_attachmentTo, &other_end_x, &other_end_y, nth, no_arcs, this);
     }
     else


@@ -1141,7 +1138,7 @@ void wxLineShape::FindLineEndPoints(double *fromX, double *fromY, double *toX, d
     if (m_from->GetAttachmentMode() != ATTACHMENT_MODE_NONE)
     {
       int nth, no_arcs;
     if (m_from->GetAttachmentMode() != ATTACHMENT_MODE_NONE)
     {
       int nth, no_arcs;

-      FindNth(m_from, &nth, &no_arcs, FALSE);
+      FindNth(m_from, &nth, &no_arcs, false);

       m_from->GetAttachmentPosition(m_attachmentFrom, &end_x, &end_y, nth, no_arcs, this);
       fromX = end_x;
       fromY = end_y;
       m_from->GetAttachmentPosition(m_attachmentFrom, &end_x, &end_y, nth, no_arcs, this);
       fromX = end_x;
       fromY = end_y;


@@ -1150,7 +1147,7 @@ void wxLineShape::FindLineEndPoints(double *fromX, double *fromY, double *toX, d
     if (m_to->GetAttachmentMode() != ATTACHMENT_MODE_NONE)
     {
       int nth, no_arcs;
     if (m_to->GetAttachmentMode() != ATTACHMENT_MODE_NONE)
     {
       int nth, no_arcs;

-      FindNth(m_to, &nth, &no_arcs, TRUE);
+      FindNth(m_to, &nth, &no_arcs, true);

       m_to->GetAttachmentPosition(m_attachmentTo, &other_end_x, &other_end_y, nth, no_arcs, this);
       toX = other_end_x;
       toY = other_end_y;
       m_to->GetAttachmentPosition(m_attachmentTo, &other_end_x, &other_end_y, nth, no_arcs, this);
       toX = other_end_x;
       toY = other_end_y;


@@ -1242,15 +1239,15 @@ void wxLineShape::OnEraseControlPoints(wxDC& dc)
   wxShape::OnEraseControlPoints(dc);
 }
 
   wxShape::OnEraseControlPoints(dc);
 }
 

-void wxLineShape::OnDragLeft(bool draw, double x, double y, int keys, int attachment)
+void wxLineShape::OnDragLeft(bool WXUNUSED(draw), double WXUNUSED(x), double WXUNUSED(y), int WXUNUSED(keys), int WXUNUSED(attachment))

 {
 }
 
 {
 }
 

-void wxLineShape::OnBeginDragLeft(double x, double y, int keys, int attachment)
+void wxLineShape::OnBeginDragLeft(double WXUNUSED(x), double WXUNUSED(y), int WXUNUSED(keys), int WXUNUSED(attachment))

 {
 }
 
 {
 }
 

-void wxLineShape::OnEndDragLeft(double x, double y, int keys, int attachment)
+void wxLineShape::OnEndDragLeft(double WXUNUSED(x), double WXUNUSED(y), int WXUNUSED(keys), int WXUNUSED(attachment))

 {
 }
 
 {
 }
 


@@ -1373,23 +1370,23 @@ void wxLineShape::WriteAttributes(wxExpr *clause)
   wxShape::WriteAttributes(clause);
 
   if (m_from)
   wxShape::WriteAttributes(clause);
 
   if (m_from)

-    clause->AddAttributeValue("from", m_from->GetId());
+    clause->AddAttributeValue(_T("from"), m_from->GetId());

   if (m_to)
   if (m_to)

-    clause->AddAttributeValue("to", m_to->GetId());
+    clause->AddAttributeValue(_T("to"), m_to->GetId());

 
   if (m_attachmentTo != 0)
 
   if (m_attachmentTo != 0)

-    clause->AddAttributeValue("attachment_to", (long)m_attachmentTo);
+    clause->AddAttributeValue(_T("attachment_to"), (long)m_attachmentTo);

   if (m_attachmentFrom != 0)
   if (m_attachmentFrom != 0)

-    clause->AddAttributeValue("attachment_from", (long)m_attachmentFrom);
+    clause->AddAttributeValue(_T("attachment_from"), (long)m_attachmentFrom);

 
   if (m_alignmentStart != 0)
 
   if (m_alignmentStart != 0)

-    clause->AddAttributeValue("align_start", (long)m_alignmentStart);
+    clause->AddAttributeValue(_T("align_start"), (long)m_alignmentStart);

   if (m_alignmentEnd != 0)
   if (m_alignmentEnd != 0)

-    clause->AddAttributeValue("align_end", (long)m_alignmentEnd);
+    clause->AddAttributeValue(_T("align_end"), (long)m_alignmentEnd);

 
 

-  clause->AddAttributeValue("is_spline", (long)m_isSpline);
+  clause->AddAttributeValue(_T("is_spline"), (long)m_isSpline);

   if (m_maintainStraightLines)
   if (m_maintainStraightLines)

-    clause->AddAttributeValue("keep_lines_straight", (long)m_maintainStraightLines);
+    clause->AddAttributeValue(_T("keep_lines_straight"), (long)m_maintainStraightLines);

 
   // Make a list of lists for the (sp)line controls
   wxExpr *list = new wxExpr(wxExprList);
 
   // Make a list of lists for the (sp)line controls
   wxExpr *list = new wxExpr(wxExprList);


@@ -1406,7 +1403,7 @@ void wxLineShape::WriteAttributes(wxExpr *clause)
 
     node = node->GetNext();
   }
 
     node = node->GetNext();
   }

-  clause->AddAttributeValue("controls", list);
+  clause->AddAttributeValue(_T("controls"), list);

 
   // Write arc arrows in new OGL format, if there are any.
   // This is a list of lists. Each sublist comprises:
 
   // Write arc arrows in new OGL format, if there are any.
   // This is a list of lists. Each sublist comprises:


@@ -1434,7 +1431,7 @@ void wxLineShape::WriteAttributes(wxExpr *clause)
 
       node = node->GetNext();
     }
 
       node = node->GetNext();
     }

-    clause->AddAttributeValue("arrows", arrow_list);
+    clause->AddAttributeValue(_T("arrows"), arrow_list);

   }
 }
 
   }
 }
 


@@ -1457,7 +1454,7 @@ void wxLineShape::ReadAttributes(wxExpr *clause)
   if (m_regions.GetCount() == 0)
   {
     wxShapeRegion *newRegion = new wxShapeRegion;
   if (m_regions.GetCount() == 0)
   {
     wxShapeRegion *newRegion = new wxShapeRegion;

-    newRegion->SetName("Middle");
+    newRegion->SetName(_T("Middle"));

     newRegion->SetSize(150, 50);
     m_regions.Append((wxObject *)newRegion);
     if (m_text.GetCount() > 0)
     newRegion->SetSize(150, 50);
     m_regions.Append((wxObject *)newRegion);
     if (m_text.GetCount() > 0)


@@ -1541,16 +1538,16 @@ void wxLineShape::ReadAttributes(wxExpr *clause)
       wxString arrowName;
       long arrowId = -1;
 
       wxString arrowName;
       long arrowId = -1;
 

-      wxExpr *type_expr = node->Item(0);
-      wxExpr *end_expr = node->Item(1);
-      wxExpr *dist_expr = node->Item(2);
-      wxExpr *size_expr = node->Item(3);
-      wxExpr *name_expr = node->Item(4);
-      wxExpr *id_expr = node->Item(5);
+      wxExpr *type_expr = node->Nth(0);
+      wxExpr *end_expr = node->Nth(1);
+      wxExpr *dist_expr = node->Nth(2);
+      wxExpr *size_expr = node->Nth(3);
+      wxExpr *name_expr = node->Nth(4);
+      wxExpr *id_expr = node->Nth(5);

 
       // New members of wxArrowHead
 
       // New members of wxArrowHead

-      wxExpr *yOffsetExpr = node->Item(6);
-      wxExpr *spacingExpr = node->Item(7);
+      wxExpr *yOffsetExpr = node->Nth(6);
+      wxExpr *spacingExpr = node->Nth(7);

 
       if (type_expr)
         arrowType = (int)type_expr->IntegerValue();
 
       if (type_expr)
         arrowType = (int)type_expr->IntegerValue();


@@ -1655,16 +1652,16 @@ void wxLineShape::Select(bool select, wxDC* dc)
           GetLabelPosition(i, &xx, &yy);
           if (m_labelObjects[i])
           {
           GetLabelPosition(i, &xx, &yy);
           if (m_labelObjects[i])
           {

-            m_labelObjects[i]->Select(FALSE);
+            m_labelObjects[i]->Select(false);

             m_labelObjects[i]->RemoveFromCanvas(m_canvas);
             delete m_labelObjects[i];
           }
           m_labelObjects[i] = OnCreateLabelShape(this, region, w, h);
           m_labelObjects[i]->AddToCanvas(m_canvas);
             m_labelObjects[i]->RemoveFromCanvas(m_canvas);
             delete m_labelObjects[i];
           }
           m_labelObjects[i] = OnCreateLabelShape(this, region, w, h);
           m_labelObjects[i]->AddToCanvas(m_canvas);

-          m_labelObjects[i]->Show(TRUE);
+          m_labelObjects[i]->Show(true);

           if (dc)
             m_labelObjects[i]->Move(*dc, (double)(x + xx), (double)(y + yy));
           if (dc)
             m_labelObjects[i]->Move(*dc, (double)(x + xx), (double)(y + yy));

-          m_labelObjects[i]->Select(TRUE, dc);
+          m_labelObjects[i]->Select(true, dc);

         }
       }
     }
         }
       }
     }


@@ -1675,7 +1672,7 @@ void wxLineShape::Select(bool select, wxDC* dc)
     {
       if (m_labelObjects[i])
       {
     {
       if (m_labelObjects[i])
       {

-        m_labelObjects[i]->Select(FALSE, dc);
+        m_labelObjects[i]->Select(false, dc);

         m_labelObjects[i]->Erase(*dc);
         m_labelObjects[i]->RemoveFromCanvas(m_canvas);
         delete m_labelObjects[i];
         m_labelObjects[i]->Erase(*dc);
         m_labelObjects[i]->RemoveFromCanvas(m_canvas);
         delete m_labelObjects[i];


@@ -1728,7 +1725,7 @@ void wxLineControlPoint::OnEndDragLeft(double x, double y, int keys, int attachm
 
 // Control points ('handles') redirect control to the actual shape, to make it easier
 // to override sizing behaviour.
 
 // Control points ('handles') redirect control to the actual shape, to make it easier
 // to override sizing behaviour.

-void wxLineShape::OnSizingDragLeft(wxControlPoint* pt, bool draw, double x, double y, int keys, int attachment)
+void wxLineShape::OnSizingDragLeft(wxControlPoint* pt, bool WXUNUSED(draw), double x, double y, int WXUNUSED(keys), int WXUNUSED(attachment))

 {
   wxLineControlPoint* lpt = (wxLineControlPoint*) pt;
 
 {
   wxLineControlPoint* lpt = (wxLineControlPoint*) pt;
 


@@ -1757,7 +1754,7 @@ void wxLineShape::OnSizingDragLeft(wxControlPoint* pt, bool draw, double x, doub
     lineShape->SetPen(& dottedPen);
     lineShape->SetBrush(wxTRANSPARENT_BRUSH);
 
     lineShape->SetPen(& dottedPen);
     lineShape->SetBrush(wxTRANSPARENT_BRUSH);
 

-    lineShape->GetEventHandler()->OnMoveLink(dc, FALSE);
+    lineShape->GetEventHandler()->OnMoveLink(dc, false);

 
     lineShape->SetPen(old_pen);
     lineShape->SetBrush(old_brush);
 
     lineShape->SetPen(old_pen);
     lineShape->SetBrush(old_brush);


@@ -1770,7 +1767,7 @@ void wxLineShape::OnSizingDragLeft(wxControlPoint* pt, bool draw, double x, doub
 
 }
 
 
 }
 

-void wxLineShape::OnSizingBeginDragLeft(wxControlPoint* pt, double x, double y, int keys, int attachment)
+void wxLineShape::OnSizingBeginDragLeft(wxControlPoint* pt, double x, double y, int WXUNUSED(keys), int WXUNUSED(attachment))

 {
   wxLineControlPoint* lpt = (wxLineControlPoint*) pt;
 
 {
   wxLineControlPoint* lpt = (wxLineControlPoint*) pt;
 


@@ -1792,7 +1789,7 @@ void wxLineShape::OnSizingBeginDragLeft(wxControlPoint* pt, double x, double y,
     lineShape->GetTo()->OnDraw(dc);
     lineShape->GetTo()->OnDrawContents(dc);
 
     lineShape->GetTo()->OnDraw(dc);
     lineShape->GetTo()->OnDrawContents(dc);
 

-    this->SetDisableLabel(TRUE);
+    this->SetDisableLabel(true);

     dc.SetLogicalFunction(OGLRBLF);
 
     lpt->m_xpos = x; lpt->m_ypos = y;
     dc.SetLogicalFunction(OGLRBLF);
 
     lpt->m_xpos = x; lpt->m_ypos = y;


@@ -1805,7 +1802,7 @@ void wxLineShape::OnSizingBeginDragLeft(wxControlPoint* pt, double x, double y,
     lineShape->SetPen(& dottedPen);
     lineShape->SetBrush(wxTRANSPARENT_BRUSH);
 
     lineShape->SetPen(& dottedPen);
     lineShape->SetBrush(wxTRANSPARENT_BRUSH);
 

-    lineShape->GetEventHandler()->OnMoveLink(dc, FALSE);
+    lineShape->GetEventHandler()->OnMoveLink(dc, false);

 
     lineShape->SetPen(old_pen);
     lineShape->SetBrush(old_brush);
 
     lineShape->SetPen(old_pen);
     lineShape->SetBrush(old_brush);


@@ -1818,14 +1815,14 @@ void wxLineShape::OnSizingBeginDragLeft(wxControlPoint* pt, double x, double y,
   }
 }
 
   }
 }
 

-void wxLineShape::OnSizingEndDragLeft(wxControlPoint* pt, double x, double y, int keys, int attachment)
+void wxLineShape::OnSizingEndDragLeft(wxControlPoint* pt, double x, double y, int WXUNUSED(keys), int WXUNUSED(attachment))

 {
   wxLineControlPoint* lpt = (wxLineControlPoint*) pt;
 
   wxClientDC dc(GetCanvas());
   GetCanvas()->PrepareDC(dc);
 
 {
   wxLineControlPoint* lpt = (wxLineControlPoint*) pt;
 
   wxClientDC dc(GetCanvas());
   GetCanvas()->PrepareDC(dc);
 

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

   wxLineShape *lineShape = (wxLineShape *)this;
 
   if (lpt->m_type == CONTROL_POINT_LINE)
   wxLineShape *lineShape = (wxLineShape *)this;
 
   if (lpt->m_type == CONTROL_POINT_LINE)


@@ -1894,7 +1891,7 @@ bool wxLineShape::OnMoveMiddleControlPoint(wxDC& dc, wxLineControlPoint* lpt, co
 
     GetEventHandler()->OnMoveLink(dc);
 
 
     GetEventHandler()->OnMoveLink(dc);
 

-    return TRUE;
+    return true;

 }
 
 // Implement movement of endpoint to a new attachment
 }
 
 // Implement movement of endpoint to a new attachment


@@ -2026,7 +2023,7 @@ bool wxLineShape::AddArrowOrdered(wxArrowHead *arrow, wxList& referenceList, int
   wxNode *refNode = referenceList.GetFirst();
   wxNode *currNode = m_arcArrows.GetFirst();
   wxString targetName(arrow->GetName());
   wxNode *refNode = referenceList.GetFirst();
   wxNode *currNode = m_arcArrows.GetFirst();
   wxString targetName(arrow->GetName());

-  if (!refNode) return FALSE;
+  if (!refNode) return false;

 
   // First check whether we need to insert in front of list,
   // because this arrowhead is the first in the reference
 
   // First check whether we need to insert in front of list,
   // because this arrowhead is the first in the reference


@@ -2035,12 +2032,12 @@ bool wxLineShape::AddArrowOrdered(wxArrowHead *arrow, wxList& referenceList, int
   if (refArrow->GetName() == targetName)
   {
     m_arcArrows.Insert(arrow);
   if (refArrow->GetName() == targetName)
   {
     m_arcArrows.Insert(arrow);

-    return TRUE;
+    return true;

   }
 
   }
 

+  wxArrowHead *currArrow = (wxArrowHead *)currNode->GetData();

   while (refNode && currNode)
   {
   while (refNode && currNode)
   {

-    wxArrowHead *currArrow = (wxArrowHead *)currNode->GetData();

     refArrow = (wxArrowHead *)refNode->GetData();
 
     // Matching: advance current arrow pointer
     refArrow = (wxArrowHead *)refNode->GetData();
 
     // Matching: advance current arrow pointer


@@ -2060,12 +2057,12 @@ bool wxLineShape::AddArrowOrdered(wxArrowHead *arrow, wxList& referenceList, int
         m_arcArrows.Insert(currNode, arrow);
       else
         m_arcArrows.Append(arrow);
         m_arcArrows.Insert(currNode, arrow);
       else
         m_arcArrows.Append(arrow);

-      return TRUE;
+      return true;

     }
     refNode = refNode->GetNext();
   }
   m_arcArrows.Append(arrow);
     }
     refNode = refNode->GetNext();
   }
   m_arcArrows.Append(arrow);

-  return TRUE;
+  return true;

 }
 
 void wxLineShape::ClearArrowsAtPosition(int end)
 }
 
 void wxLineShape::ClearArrowsAtPosition(int end)


@@ -2125,11 +2122,11 @@ bool wxLineShape::ClearArrow(const wxString& name)
     {
       delete arrow;
       delete node;
     {
       delete arrow;
       delete node;

-      return TRUE;
+      return true;

     }
     node = node->GetNext();
   }
     }
     node = node->GetNext();
   }

-  return FALSE;
+  return false;

 }
 
 /*
 }
 
 /*


@@ -2180,11 +2177,11 @@ bool wxLineShape::DeleteArrowHead(int position, const wxString& name)
     {
       delete arrow;
       delete node;
     {
       delete arrow;
       delete node;

-      return TRUE;
+      return true;

     }
     node = node->GetNext();
   }
     }
     node = node->GetNext();
   }

-  return FALSE;
+  return false;

 }
 
 // Overloaded DeleteArrowHead: pass arrowhead id.
 }
 
 // Overloaded DeleteArrowHead: pass arrowhead id.


@@ -2198,11 +2195,11 @@ bool wxLineShape::DeleteArrowHead(long id)
     {
       delete arrow;
       delete node;
     {
       delete arrow;
       delete node;

-      return TRUE;
+      return true;

     }
     node = node->GetNext();
   }
     }
     node = node->GetNext();
   }

-  return FALSE;
+  return false;

 }
 
 /*
 }
 
 /*


@@ -2320,7 +2317,7 @@ int wxLineShape::GetAlignmentType(bool isEnd)
 wxRealPoint *wxLineShape::GetNextControlPoint(wxShape *nodeObject)
 {
   int n = m_lineControlPoints->GetCount();
 wxRealPoint *wxLineShape::GetNextControlPoint(wxShape *nodeObject)
 {
   int n = m_lineControlPoints->GetCount();

-  int nn = 0;
+  int nn;

   if (m_to == nodeObject)
   {
     // Must be END of line, so we want (n - 1)th control point.
   if (m_to == nodeObject)
   {
     // Must be END of line, so we want (n - 1)th control point.


@@ -2334,7 +2331,7 @@ wxRealPoint *wxLineShape::GetNextControlPoint(wxShape *nodeObject)
     return (wxRealPoint *)node->GetData();
   }
   else
     return (wxRealPoint *)node->GetData();
   }
   else

-    return FALSE;
+    return NULL;

 }
 
 /*
 }
 
 /*


@@ -2441,7 +2438,7 @@ void wxLabelShape::OnDraw(wxDC& dc)
       dc.DrawRectangle(WXROUND(x1), WXROUND(y1), WXROUND(m_width), WXROUND(m_height));
 }
 
       dc.DrawRectangle(WXROUND(x1), WXROUND(y1), WXROUND(m_width), WXROUND(m_height));
 }
 

-void wxLabelShape::OnDrawContents(wxDC& dc)
+void wxLabelShape::OnDrawContents(wxDC& WXUNUSED(dc))

 {
 }
 
 {
 }
 


@@ -2465,7 +2462,7 @@ bool wxLabelShape::OnMovePre(wxDC& dc, double x, double y, double old_x, double
     return m_lineShape->OnLabelMovePre(dc, this, x, y, old_x, old_y, display);
 }
 
     return m_lineShape->OnLabelMovePre(dc, this, x, y, old_x, old_y, display);
 }
 

-bool wxLineShape::OnLabelMovePre(wxDC& dc, wxLabelShape* labelShape, double x, double y, double old_x, double old_y, bool display)
+bool wxLineShape::OnLabelMovePre(wxDC& dc, wxLabelShape* labelShape, double x, double y, double WXUNUSED(old_x), double WXUNUSED(old_y), bool WXUNUSED(display))

 {
   labelShape->m_shapeRegion->SetSize(labelShape->GetWidth(), labelShape->GetHeight());
 
 {
   labelShape->m_shapeRegion->SetSize(labelShape->GetWidth(), labelShape->GetHeight());
 


@@ -2499,7 +2496,7 @@ bool wxLineShape::OnLabelMovePre(wxDC& dc, wxLabelShape* labelShape, double x, d
     labelShape->FormatText(dc, s, i);
     DrawRegion(dc, labelShape->m_shapeRegion, xx, yy);
   }
     labelShape->FormatText(dc, s, i);
     DrawRegion(dc, labelShape->m_shapeRegion, xx, yy);
   }

-  return TRUE;
+  return true;

 }
 
 // Divert left and right clicks to line object
 }
 
 // Divert left and right clicks to line object