added new files (after library split)

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

diff --git a/contrib/src/ogl/basic2.cpp b/contrib/src/ogl/basic2.cpp
index 5dd361faa49eb84f9e672020e07544c3fae8c230..d5eba292482397d6623927145661fcf69065f4c6 100644 (file)
--- a/contrib/src/ogl/basic2.cpp
+++ b/contrib/src/ogl/basic2.cpp
@@ -24,18 +24,12 @@
 #include <wx/wx.h>
 #endif
 
 #include <wx/wx.h>
 #endif
 

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

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

-#if wxUSE_IOSTREAMH
-#include <iostream.h>
-#else
-#include <iostream>
-#endif
-

 #include <stdio.h>
 #include <ctype.h>
 #include <math.h>
 #include <stdio.h>
 #include <ctype.h>
 #include <math.h>


@@ -77,13 +71,13 @@ void wxPolygonShape::Create(wxList *the_points)
   // Duplicate the list of points
   m_points = new wxList;
 
   // Duplicate the list of points
   m_points = new wxList;
 

-  wxNode *node = the_points->First();
+  wxNode *node = the_points->GetFirst();

   while (node)
   {
   while (node)
   {

-    wxRealPoint *point = (wxRealPoint *)node->Data();
+    wxRealPoint *point = (wxRealPoint *)node->GetData();

     wxRealPoint *new_point = new wxRealPoint(point->x, point->y);
     m_points->Append((wxObject*) new_point);
     wxRealPoint *new_point = new wxRealPoint(point->x, point->y);
     m_points->Append((wxObject*) new_point);

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

   }
   CalculateBoundingBox();
   m_originalWidth = m_boundWidth;
   }
   CalculateBoundingBox();
   m_originalWidth = m_boundWidth;


@@ -100,26 +94,26 @@ void wxPolygonShape::ClearPoints()
 {
   if (m_points)
   {
 {
   if (m_points)
   {

-    wxNode *node = m_points->First();
+    wxNode *node = m_points->GetFirst();

     while (node)
     {
     while (node)
     {

-      wxRealPoint *point = (wxRealPoint *)node->Data();
+      wxRealPoint *point = (wxRealPoint *)node->GetData();

       delete point;
       delete node;
       delete point;
       delete node;

-      node = m_points->First();
+      node = m_points->GetFirst();

     }
     delete m_points;
     m_points = NULL;
   }
   if (m_originalPoints)
   {
     }
     delete m_points;
     m_points = NULL;
   }
   if (m_originalPoints)
   {

-    wxNode *node = m_originalPoints->First();
+    wxNode *node = m_originalPoints->GetFirst();

     while (node)
     {
     while (node)
     {

-      wxRealPoint *point = (wxRealPoint *)node->Data();
+      wxRealPoint *point = (wxRealPoint *)node->GetData();

       delete point;
       delete node;
       delete point;
       delete node;

-      node = m_originalPoints->First();
+      node = m_originalPoints->GetFirst();

     }
     delete m_originalPoints;
     m_originalPoints = NULL;
     }
     delete m_originalPoints;
     m_originalPoints = NULL;


@@ -142,17 +136,17 @@ void wxPolygonShape::CalculateBoundingBox()
   double top = 10000;
   double bottom = -10000;
 
   double top = 10000;
   double bottom = -10000;
 

-  wxNode *node = m_points->First();
+  wxNode *node = m_points->GetFirst();

   while (node)
   {
   while (node)
   {

-    wxRealPoint *point = (wxRealPoint *)node->Data();
+    wxRealPoint *point = (wxRealPoint *)node->GetData();

     if (point->x < left) left = point->x;
     if (point->x > right) right = point->x;
 
     if (point->y < top) top = point->y;
     if (point->y > bottom) bottom = point->y;
 
     if (point->x < left) left = point->x;
     if (point->x > right) right = point->x;
 
     if (point->y < top) top = point->y;
     if (point->y > bottom) bottom = point->y;
 

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

   }
   m_boundWidth = right - left;
   m_boundHeight = bottom - top;
   }
   m_boundWidth = right - left;
   m_boundHeight = bottom - top;


@@ -170,17 +164,17 @@ void wxPolygonShape::CalculatePolygonCentre()
   double top = 10000;
   double bottom = -10000;
 
   double top = 10000;
   double bottom = -10000;
 

-  wxNode *node = m_points->First();
+  wxNode *node = m_points->GetFirst();

   while (node)
   {
   while (node)
   {

-    wxRealPoint *point = (wxRealPoint *)node->Data();
+    wxRealPoint *point = (wxRealPoint *)node->GetData();

     if (point->x < left) left = point->x;
     if (point->x > right) right = point->x;
 
     if (point->y < top) top = point->y;
     if (point->y > bottom) bottom = point->y;
 
     if (point->x < left) left = point->x;
     if (point->x > right) right = point->x;
 
     if (point->y < top) top = point->y;
     if (point->y > bottom) bottom = point->y;
 

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

   }
   double bwidth = right - left;
   double bheight = bottom - top;
   }
   double bwidth = right - left;
   double bheight = bottom - top;


@@ -188,13 +182,13 @@ void wxPolygonShape::CalculatePolygonCentre()
   double newCentreX = (double)(left + (bwidth/2.0));
   double newCentreY = (double)(top + (bheight/2.0));
 
   double newCentreX = (double)(left + (bwidth/2.0));
   double newCentreY = (double)(top + (bheight/2.0));
 

-  node = m_points->First();
+  node = m_points->GetFirst();

   while (node)
   {
   while (node)
   {

-    wxRealPoint *point = (wxRealPoint *)node->Data();
+    wxRealPoint *point = (wxRealPoint *)node->GetData();

     point->x -= newCentreX;
     point->y -= newCentreY;
     point->x -= newCentreX;
     point->y -= newCentreY;

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

   }
   m_xpos += newCentreX;
   m_ypos += newCentreY;
   }
   m_xpos += newCentreX;
   m_ypos += newCentreY;


@@ -266,17 +260,17 @@ bool wxPolygonShape::HitTest(double x, double y, int *attachment, double *distan
   endPointsY[3] = y;
 
   // Store polygon points in an array
   endPointsY[3] = y;
 
   // Store polygon points in an array

-  int np = m_points->Number();
+  int np = m_points->GetCount();

   double *xpoints = new double[np];
   double *ypoints = new double[np];
   double *xpoints = new double[np];
   double *ypoints = new double[np];

-  wxNode *node = m_points->First();
+  wxNode *node = m_points->GetFirst();

   int i = 0;
   while (node)
   {
   int i = 0;
   while (node)
   {

-    wxRealPoint *point = (wxRealPoint *)node->Data();
+    wxRealPoint *point = (wxRealPoint *)node->GetData();

     xpoints[i] = point->x + m_xpos;
     ypoints[i] = point->y + m_ypos;
     xpoints[i] = point->x + m_xpos;
     ypoints[i] = point->y + m_ypos;

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

     i ++;
   }
 
     i ++;
   }
 


@@ -337,18 +331,18 @@ void wxPolygonShape::SetSize(double new_width, double new_height, bool recursive
   double x_proportion = (double)(fabs(new_width/m_originalWidth));
   double y_proportion = (double)(fabs(new_height/m_originalHeight));
 
   double x_proportion = (double)(fabs(new_width/m_originalWidth));
   double y_proportion = (double)(fabs(new_height/m_originalHeight));
 

-  wxNode *node = m_points->First();
-  wxNode *original_node = m_originalPoints->First();
+  wxNode *node = m_points->GetFirst();
+  wxNode *original_node = m_originalPoints->GetFirst();

   while (node && original_node)
   {
   while (node && original_node)
   {

-    wxRealPoint *point = (wxRealPoint *)node->Data();
-    wxRealPoint *original_point = (wxRealPoint *)original_node->Data();
+    wxRealPoint *point = (wxRealPoint *)node->GetData();
+    wxRealPoint *original_point = (wxRealPoint *)original_node->GetData();

 
     point->x = (original_point->x * x_proportion);
     point->y = (original_point->y * y_proportion);
 
 
     point->x = (original_point->x * x_proportion);
     point->y = (original_point->y * y_proportion);
 

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

   }
 
 //  CalculateBoundingBox();
   }
 
 //  CalculateBoundingBox();


@@ -361,25 +355,25 @@ void wxPolygonShape::SetSize(double new_width, double new_height, bool recursive
 void wxPolygonShape::UpdateOriginalPoints()
 {
   if (!m_originalPoints) m_originalPoints = new wxList;
 void wxPolygonShape::UpdateOriginalPoints()
 {
   if (!m_originalPoints) m_originalPoints = new wxList;

-  wxNode *original_node = m_originalPoints->First();
+  wxNode *original_node = m_originalPoints->GetFirst();

   while (original_node)
   {
   while (original_node)
   {

-    wxNode *next_node = original_node->Next();
-    wxRealPoint *original_point = (wxRealPoint *)original_node->Data();
+    wxNode *next_node = original_node->GetNext();
+    wxRealPoint *original_point = (wxRealPoint *)original_node->GetData();

     delete original_point;
     delete original_node;
 
     original_node = next_node;
   }
 
     delete original_point;
     delete original_node;
 
     original_node = next_node;
   }
 

-  wxNode *node = m_points->First();
+  wxNode *node = m_points->GetFirst();

   while (node)
   {
   while (node)
   {

-    wxRealPoint *point = (wxRealPoint *)node->Data();
+    wxRealPoint *point = (wxRealPoint *)node->GetData();

     wxRealPoint *original_point = new wxRealPoint(point->x, point->y);
     m_originalPoints->Append((wxObject*) original_point);
 
     wxRealPoint *original_point = new wxRealPoint(point->x, point->y);
     m_originalPoints->Append((wxObject*) original_point);
 

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

   }
   CalculateBoundingBox();
   m_originalWidth = m_boundWidth;
   }
   CalculateBoundingBox();
   m_originalWidth = m_boundWidth;


@@ -388,19 +382,19 @@ void wxPolygonShape::UpdateOriginalPoints()
 
 void wxPolygonShape::AddPolygonPoint(int pos)
 {
 
 void wxPolygonShape::AddPolygonPoint(int pos)
 {

-  wxNode *node = m_points->Nth(pos);
-  if (!node) node = m_points->First();
-  wxRealPoint *firstPoint = (wxRealPoint *)node->Data();
+  wxNode *node = m_points->Item(pos);
+  if (!node) node = m_points->GetFirst();
+  wxRealPoint *firstPoint = (wxRealPoint *)node->GetData();

 
 

-  wxNode *node2 = m_points->Nth(pos + 1);
-  if (!node2) node2 = m_points->First();
-  wxRealPoint *secondPoint = (wxRealPoint *)node2->Data();
+  wxNode *node2 = m_points->Item(pos + 1);
+  if (!node2) node2 = m_points->GetFirst();
+  wxRealPoint *secondPoint = (wxRealPoint *)node2->GetData();

 
   double x = (double)((secondPoint->x - firstPoint->x)/2.0 + firstPoint->x);
   double y = (double)((secondPoint->y - firstPoint->y)/2.0 + firstPoint->y);
   wxRealPoint *point = new wxRealPoint(x, y);
 
 
   double x = (double)((secondPoint->x - firstPoint->x)/2.0 + firstPoint->x);
   double y = (double)((secondPoint->y - firstPoint->y)/2.0 + firstPoint->y);
   wxRealPoint *point = new wxRealPoint(x, y);
 

-  if (pos >= (m_points->Number() - 1))
+  if (pos >= (m_points->GetCount() - 1))

     m_points->Append((wxObject*) point);
   else
     m_points->Insert(node2, (wxObject*) point);
     m_points->Append((wxObject*) point);
   else
     m_points->Insert(node2, (wxObject*) point);


@@ -416,10 +410,10 @@ void wxPolygonShape::AddPolygonPoint(int pos)
 
 void wxPolygonShape::DeletePolygonPoint(int pos)
 {
 
 void wxPolygonShape::DeletePolygonPoint(int pos)
 {

-  wxNode *node = m_points->Nth(pos);
+  wxNode *node = m_points->Item(pos);

   if (node)
   {
   if (node)
   {

-    wxRealPoint *point = (wxRealPoint *)node->Data();
+    wxRealPoint *point = (wxRealPoint *)node->GetData();

     delete point;
     delete node;
     UpdateOriginalPoints();
     delete point;
     delete node;
     UpdateOriginalPoints();


@@ -436,7 +430,7 @@ bool wxPolygonShape::GetPerimeterPoint(double x1, double y1,
                                      double x2, double y2,
                                      double *x3, double *y3)
 {
                                      double x2, double y2,
                                      double *x3, double *y3)
 {

-  int n = m_points->Number();
+  int n = m_points->GetCount();

 
   // First check for situation where the line is vertical,
   // and we would want to connect to a point on that vertical --
 
   // First check for situation where the line is vertical,
   // and we would want to connect to a point on that vertical --


@@ -446,10 +440,10 @@ bool wxPolygonShape::GetPerimeterPoint(double x1, double y1,
   {
     // Look for the point we'd be connecting to. This is
     // a heuristic...
   {
     // Look for the point we'd be connecting to. This is
     // a heuristic...

-    wxNode *node = m_points->First();
+    wxNode *node = m_points->GetFirst();

     while (node)
     {
     while (node)
     {

-      wxRealPoint *point = (wxRealPoint *)node->Data();
+      wxRealPoint *point = (wxRealPoint *)node->GetData();

       if (point->x == 0.0)
       {
         if ((y2 > y1) && (point->y > 0.0))
       if (point->x == 0.0)
       {
         if ((y2 > y1) && (point->y > 0.0))


@@ -465,21 +459,21 @@ bool wxPolygonShape::GetPerimeterPoint(double x1, double y1,
           return TRUE;
         }
       }
           return TRUE;
         }
       }

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

     }
   }
 
   double *xpoints = new double[n];
   double *ypoints = new double[n];
 
     }
   }
 
   double *xpoints = new double[n];
   double *ypoints = new double[n];
 

-  wxNode *node = m_points->First();
+  wxNode *node = m_points->GetFirst();

   int i = 0;
   while (node)
   {
   int i = 0;
   while (node)
   {

-    wxRealPoint *point = (wxRealPoint *)node->Data();
+    wxRealPoint *point = (wxRealPoint *)node->GetData();

     xpoints[i] = point->x + m_xpos;
     ypoints[i] = point->y + m_ypos;
     xpoints[i] = point->x + m_xpos;
     ypoints[i] = point->y + m_ypos;

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

     i ++;
   }
 
     i ++;
   }
 


@@ -494,12 +488,12 @@ bool wxPolygonShape::GetPerimeterPoint(double x1, double y1,
 
 void wxPolygonShape::OnDraw(wxDC& dc)
 {
 
 void wxPolygonShape::OnDraw(wxDC& dc)
 {

-    int n = m_points->Number();
+    int n = m_points->GetCount();

     wxPoint *intPoints = new wxPoint[n];
     int i;
     for (i = 0; i < n; i++)
     {
     wxPoint *intPoints = new wxPoint[n];
     int i;
     for (i = 0; i < n; i++)
     {

-      wxRealPoint* point = (wxRealPoint*) m_points->Nth(i)->Data();
+      wxRealPoint* point = (wxRealPoint*) m_points->Item(i)->GetData();

       intPoints[i].x = WXROUND(point->x);
       intPoints[i].y = WXROUND(point->y);
     }
       intPoints[i].x = WXROUND(point->x);
       intPoints[i].y = WXROUND(point->y);
     }


@@ -534,12 +528,12 @@ void wxPolygonShape::OnDrawOutline(wxDC& dc, double x, double y, double w, doubl
   double x_proportion = (double)(fabs(w/m_originalWidth));
   double y_proportion = (double)(fabs(h/m_originalHeight));
 
   double x_proportion = (double)(fabs(w/m_originalWidth));
   double y_proportion = (double)(fabs(h/m_originalHeight));
 

-  int n = m_originalPoints->Number();
+  int n = m_originalPoints->GetCount();

   wxPoint *intPoints = new wxPoint[n];
   int i;
   for (i = 0; i < n; i++)
   {
   wxPoint *intPoints = new wxPoint[n];
   int i;
   for (i = 0; i < n; i++)
   {

-    wxRealPoint* point = (wxRealPoint*) m_originalPoints->Nth(i)->Data();
+    wxRealPoint* point = (wxRealPoint*) m_originalPoints->Item(i)->GetData();

     intPoints[i].x = WXROUND(x_proportion * point->x);
     intPoints[i].y = WXROUND(y_proportion * point->y);
   }
     intPoints[i].x = WXROUND(x_proportion * point->x);
     intPoints[i].y = WXROUND(y_proportion * point->y);
   }


@@ -550,38 +544,38 @@ void wxPolygonShape::OnDrawOutline(wxDC& dc, double x, double y, double w, doubl
 // Make as many control points as there are vertices.
 void wxPolygonShape::MakeControlPoints()
 {
 // Make as many control points as there are vertices.
 void wxPolygonShape::MakeControlPoints()
 {

-  wxNode *node = m_points->First();
+  wxNode *node = m_points->GetFirst();

   while (node)
   {
   while (node)
   {

-    wxRealPoint *point = (wxRealPoint *)node->Data();
+    wxRealPoint *point = (wxRealPoint *)node->GetData();

     wxPolygonControlPoint *control = new wxPolygonControlPoint(m_canvas, this, CONTROL_POINT_SIZE,
       point, point->x, point->y);
     m_canvas->AddShape(control);
     m_controlPoints.Append(control);
     wxPolygonControlPoint *control = new wxPolygonControlPoint(m_canvas, this, CONTROL_POINT_SIZE,
       point, point->x, point->y);
     m_canvas->AddShape(control);
     m_controlPoints.Append(control);

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

   }
 }
 
 void wxPolygonShape::ResetControlPoints()
 {
   }
 }
 
 void wxPolygonShape::ResetControlPoints()
 {

-  wxNode *node = m_points->First();
-  wxNode *controlPointNode = m_controlPoints.First();
+  wxNode *node = m_points->GetFirst();
+  wxNode *controlPointNode = m_controlPoints.GetFirst();

   while (node && controlPointNode)
   {
   while (node && controlPointNode)
   {

-    wxRealPoint *point = (wxRealPoint *)node->Data();
-    wxPolygonControlPoint *controlPoint = (wxPolygonControlPoint *)controlPointNode->Data();
+    wxRealPoint *point = (wxRealPoint *)node->GetData();
+    wxPolygonControlPoint *controlPoint = (wxPolygonControlPoint *)controlPointNode->GetData();

 
     controlPoint->m_xoffset = point->x;
     controlPoint->m_yoffset = point->y;
     controlPoint->m_polygonVertex = point;
 
 
     controlPoint->m_xoffset = point->x;
     controlPoint->m_yoffset = point->y;
     controlPoint->m_polygonVertex = point;
 

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

   }
 }
 
 
   }
 }
 
 

-#ifdef PROLOGIO
+#if wxUSE_PROLOGIO

 void wxPolygonShape::WriteAttributes(wxExpr *clause)
 {
   wxShape::WriteAttributes(clause);
 void wxPolygonShape::WriteAttributes(wxExpr *clause)
 {
   wxShape::WriteAttributes(clause);


@@ -591,10 +585,10 @@ void wxPolygonShape::WriteAttributes(wxExpr *clause)
 
   // Make a list of lists for the coordinates
   wxExpr *list = new wxExpr(wxExprList);
 
   // Make a list of lists for the coordinates
   wxExpr *list = new wxExpr(wxExprList);

-  wxNode *node = m_points->First();
+  wxNode *node = m_points->GetFirst();

   while (node)
   {
   while (node)
   {

-    wxRealPoint *point = (wxRealPoint *)node->Data();
+    wxRealPoint *point = (wxRealPoint *)node->GetData();

     wxExpr *point_list = new wxExpr(wxExprList);
     wxExpr *x_expr = new wxExpr((double)point->x);
     wxExpr *y_expr = new wxExpr((double)point->y);
     wxExpr *point_list = new wxExpr(wxExprList);
     wxExpr *x_expr = new wxExpr((double)point->x);
     wxExpr *y_expr = new wxExpr((double)point->y);


@@ -603,16 +597,16 @@ void wxPolygonShape::WriteAttributes(wxExpr *clause)
     point_list->Append(y_expr);
     list->Append(point_list);
 
     point_list->Append(y_expr);
     list->Append(point_list);
 

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

   }
   clause->AddAttributeValue(wxT("points"), list);
 
   // Save the original (unscaled) points
   list = new wxExpr(wxExprList);
   }
   clause->AddAttributeValue(wxT("points"), list);
 
   // Save the original (unscaled) points
   list = new wxExpr(wxExprList);

-  node = m_originalPoints->First();
+  node = m_originalPoints->GetFirst();

   while (node)
   {
   while (node)
   {

-    wxRealPoint *point = (wxRealPoint *)node->Data();
+    wxRealPoint *point = (wxRealPoint *)node->GetData();

     wxExpr *point_list = new wxExpr(wxExprList);
     wxExpr *x_expr = new wxExpr((double) point->x);
     wxExpr *y_expr = new wxExpr((double) point->y);
     wxExpr *point_list = new wxExpr(wxExprList);
     wxExpr *x_expr = new wxExpr((double) point->x);
     wxExpr *y_expr = new wxExpr((double) point->y);


@@ -620,7 +614,7 @@ void wxPolygonShape::WriteAttributes(wxExpr *clause)
     point_list->Append(y_expr);
     list->Append(point_list);
 
     point_list->Append(y_expr);
     list->Append(point_list);
 

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

   }
   clause->AddAttributeValue(wxT("m_originalPoints"), list);
 }
   }
   clause->AddAttributeValue(wxT("m_originalPoints"), list);
 }


@@ -749,21 +743,21 @@ void wxPolygonShape::Copy(wxShape& copy)
   polyCopy.m_points = new wxList;
   polyCopy.m_originalPoints = new wxList;
 
   polyCopy.m_points = new wxList;
   polyCopy.m_originalPoints = new wxList;
 

-  wxNode *node = m_points->First();
+  wxNode *node = m_points->GetFirst();

   while (node)
   {
   while (node)
   {

-    wxRealPoint *point = (wxRealPoint *)node->Data();
+    wxRealPoint *point = (wxRealPoint *)node->GetData();

     wxRealPoint *new_point = new wxRealPoint(point->x, point->y);
     polyCopy.m_points->Append((wxObject*) new_point);
     wxRealPoint *new_point = new wxRealPoint(point->x, point->y);
     polyCopy.m_points->Append((wxObject*) new_point);

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

   }
   }

-  node = m_originalPoints->First();
+  node = m_originalPoints->GetFirst();

   while (node)
   {
   while (node)
   {

-    wxRealPoint *point = (wxRealPoint *)node->Data();
+    wxRealPoint *point = (wxRealPoint *)node->GetData();

     wxRealPoint *new_point = new wxRealPoint(point->x, point->y);
     polyCopy.m_originalPoints->Append((wxObject*) new_point);
     wxRealPoint *new_point = new wxRealPoint(point->x, point->y);
     polyCopy.m_originalPoints->Append((wxObject*) new_point);

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

   }
   polyCopy.m_boundWidth = m_boundWidth;
   polyCopy.m_boundHeight = m_boundHeight;
   }
   polyCopy.m_boundWidth = m_boundWidth;
   polyCopy.m_boundHeight = m_boundHeight;


@@ -773,14 +767,14 @@ void wxPolygonShape::Copy(wxShape& copy)
 
 int wxPolygonShape::GetNumberOfAttachments() const
 {
 
 int wxPolygonShape::GetNumberOfAttachments() const
 {

-  int maxN = (m_points ? (m_points->Number() - 1) : 0);
-  wxNode *node = m_attachmentPoints.First();
+  int maxN = (m_points ? (m_points->GetCount() - 1) : 0);
+  wxNode *node = m_attachmentPoints.GetFirst();

   while (node)
   {
   while (node)
   {

-    wxAttachmentPoint *point = (wxAttachmentPoint *)node->Data();
+    wxAttachmentPoint *point = (wxAttachmentPoint *)node->GetData();

     if (point->m_id > maxN)
       maxN = point->m_id;
     if (point->m_id > maxN)
       maxN = point->m_id;

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

   }
   return maxN+1;;
 }
   }
   return maxN+1;;
 }


@@ -788,9 +782,9 @@ int wxPolygonShape::GetNumberOfAttachments() const
 bool wxPolygonShape::GetAttachmentPosition(int attachment, double *x, double *y,
                                          int nth, int no_arcs, wxLineShape *line)
 {
 bool wxPolygonShape::GetAttachmentPosition(int attachment, double *x, double *y,
                                          int nth, int no_arcs, wxLineShape *line)
 {

-  if ((m_attachmentMode == ATTACHMENT_MODE_EDGE) && m_points && attachment < m_points->Number())
+  if ((m_attachmentMode == ATTACHMENT_MODE_EDGE) && m_points && attachment < m_points->GetCount())

   {
   {

-    wxRealPoint *point = (wxRealPoint *)m_points->Nth(attachment)->Data();
+    wxRealPoint *point = (wxRealPoint *)m_points->Item(attachment)->GetData();

     *x = point->x + m_xpos;
     *y = point->y + m_ypos;
     return TRUE;
     *x = point->x + m_xpos;
     *y = point->y + m_ypos;
     return TRUE;


@@ -799,21 +793,21 @@ bool wxPolygonShape::GetAttachmentPosition(int attachment, double *x, double *y,
   { return wxShape::GetAttachmentPosition(attachment, x, y, nth, no_arcs, line); }
 }
 
   { return wxShape::GetAttachmentPosition(attachment, x, y, nth, no_arcs, line); }
 }
 

-bool wxPolygonShape::AttachmentIsValid(int attachment)
+bool wxPolygonShape::AttachmentIsValid(int attachment) const

 {
   if (!m_points)
     return FALSE;
 
 {
   if (!m_points)
     return FALSE;
 

-  if ((attachment >= 0) && (attachment < m_points->Number()))
+  if ((attachment >= 0) && (attachment < m_points->GetCount()))

     return TRUE;
 
     return TRUE;
 

-  wxNode *node = m_attachmentPoints.First();
+  wxNode *node = m_attachmentPoints.GetFirst();

   while (node)
   {
   while (node)
   {

-    wxAttachmentPoint *point = (wxAttachmentPoint *)node->Data();
+    wxAttachmentPoint *point = (wxAttachmentPoint *)node->GetData();

     if (point->m_id == attachment)
       return TRUE;
     if (point->m_id == attachment)
       return TRUE;

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

   }
   return FALSE;
 }
   }
   return FALSE;
 }


@@ -826,36 +820,36 @@ void wxPolygonShape::Rotate(double x, double y, double theta)
     // Rotate attachment points
     double sinTheta = (double)sin(actualTheta);
     double cosTheta = (double)cos(actualTheta);
     // Rotate attachment points
     double sinTheta = (double)sin(actualTheta);
     double cosTheta = (double)cos(actualTheta);

-    wxNode *node = m_attachmentPoints.First();
+    wxNode *node = m_attachmentPoints.GetFirst();

     while (node)
     {
     while (node)
     {

-        wxAttachmentPoint *point = (wxAttachmentPoint *)node->Data();
+        wxAttachmentPoint *point = (wxAttachmentPoint *)node->GetData();

         double x1 = point->m_x;
         double y1 = point->m_y;
         point->m_x = x1*cosTheta - y1*sinTheta + x*(1.0 - cosTheta) + y*sinTheta;
         point->m_y = x1*sinTheta + y1*cosTheta + y*(1.0 - cosTheta) + x*sinTheta;
         double x1 = point->m_x;
         double y1 = point->m_y;
         point->m_x = x1*cosTheta - y1*sinTheta + x*(1.0 - cosTheta) + y*sinTheta;
         point->m_y = x1*sinTheta + y1*cosTheta + y*(1.0 - cosTheta) + x*sinTheta;

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

     }
 
     }
 

-    node = m_points->First();
+    node = m_points->GetFirst();

     while (node)
     {
     while (node)
     {

-        wxRealPoint *point = (wxRealPoint *)node->Data();
+        wxRealPoint *point = (wxRealPoint *)node->GetData();

         double x1 = point->x;
         double y1 = point->y;
         point->x = x1*cosTheta - y1*sinTheta + x*(1.0 - cosTheta) + y*sinTheta;
         point->y = x1*sinTheta + y1*cosTheta + y*(1.0 - cosTheta) + x*sinTheta;
         double x1 = point->x;
         double y1 = point->y;
         point->x = x1*cosTheta - y1*sinTheta + x*(1.0 - cosTheta) + y*sinTheta;
         point->y = x1*sinTheta + y1*cosTheta + y*(1.0 - cosTheta) + x*sinTheta;

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

     }
     }

-    node = m_originalPoints->First();
+    node = m_originalPoints->GetFirst();

     while (node)
     {
     while (node)
     {

-        wxRealPoint *point = (wxRealPoint *)node->Data();
+        wxRealPoint *point = (wxRealPoint *)node->GetData();

         double x1 = point->x;
         double y1 = point->y;
         point->x = x1*cosTheta - y1*sinTheta + x*(1.0 - cosTheta) + y*sinTheta;
         point->y = x1*sinTheta + y1*cosTheta + y*(1.0 - cosTheta) + x*sinTheta;
         double x1 = point->x;
         double y1 = point->y;
         point->x = x1*cosTheta - y1*sinTheta + x*(1.0 - cosTheta) + y*sinTheta;
         point->y = x1*sinTheta + y1*cosTheta + y*(1.0 - cosTheta) + x*sinTheta;

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

     }
 
     m_rotation = theta;
     }
 
     m_rotation = theta;


@@ -940,7 +934,7 @@ bool wxRectangleShape::GetPerimeterPoint(double x1, double y1,
   return TRUE;
 }
 
   return TRUE;
 }
 

-#ifdef PROLOGIO
+#if wxUSE_PROLOGIO

 void wxRectangleShape::WriteAttributes(wxExpr *clause)
 {
   wxShape::WriteAttributes(clause);
 void wxRectangleShape::WriteAttributes(wxExpr *clause)
 {
   wxShape::WriteAttributes(clause);


@@ -961,9 +955,9 @@ void wxRectangleShape::ReadAttributes(wxExpr *clause)
   clause->AssignAttributeValue(wxT("corner"), &m_cornerRadius);
 
   // In case we're reading an old file, set the region's size
   clause->AssignAttributeValue(wxT("corner"), &m_cornerRadius);
 
   // In case we're reading an old file, set the region's size

-  if (m_regions.Number() == 1)
+  if (m_regions.GetCount() == 1)

   {
   {

-    wxShapeRegion *region = (wxShapeRegion *)m_regions.First()->Data();
+    wxShapeRegion *region = (wxShapeRegion *)m_regions.GetFirst()->GetData();

     region->SetSize(m_width, m_height);
   }
 }
     region->SetSize(m_width, m_height);
   }
 }


@@ -1013,7 +1007,7 @@ void wxTextShape::Copy(wxShape& copy)
   wxRectangleShape::Copy(copy);
 }
 
   wxRectangleShape::Copy(copy);
 }
 

-#ifdef PROLOGIO
+#if wxUSE_PROLOGIO

 void wxTextShape::WriteAttributes(wxExpr *clause)
 {
   wxRectangleShape::WriteAttributes(clause);
 void wxTextShape::WriteAttributes(wxExpr *clause)
 {
   wxRectangleShape::WriteAttributes(clause);


@@ -1080,7 +1074,7 @@ void wxEllipseShape::SetSize(double x, double y, bool recursive)
   SetDefaultRegionSize();
 }
 
   SetDefaultRegionSize();
 }
 

-#ifdef PROLOGIO
+#if wxUSE_PROLOGIO

 void wxEllipseShape::WriteAttributes(wxExpr *clause)
 {
   wxShape::WriteAttributes(clause);
 void wxEllipseShape::WriteAttributes(wxExpr *clause)
 {
   wxShape::WriteAttributes(clause);


@@ -1098,9 +1092,9 @@ void wxEllipseShape::ReadAttributes(wxExpr *clause)
   clause->AssignAttributeValue(wxT("height"), &m_height);
 
   // In case we're reading an old file, set the region's size
   clause->AssignAttributeValue(wxT("height"), &m_height);
 
   // In case we're reading an old file, set the region's size

-  if (m_regions.Number() == 1)
+  if (m_regions.GetCount() == 1)

   {
   {

-    wxShapeRegion *region = (wxShapeRegion *)m_regions.First()->Data();
+    wxShapeRegion *region = (wxShapeRegion *)m_regions.GetFirst()->GetData();

     region->SetSize(m_width, m_height);
   }
 }
     region->SetSize(m_width, m_height);
   }
 }


@@ -1572,7 +1566,7 @@ void wxShape::OnSizingEndDragLeft(wxControlPoint* pt, double x, double y, int ke
 */
 
   // Recursively redraw links if we have a composite.
 */
 
   // Recursively redraw links if we have a composite.

-  if (theObject->GetChildren().Number() > 0)
+  if (theObject->GetChildren().GetCount() > 0)

     theObject->DrawLinks(dc, -1, TRUE);
 
   double width, height;
     theObject->DrawLinks(dc, -1, TRUE);
 
   double width, height;


@@ -1761,7 +1755,7 @@ IMPLEMENT_DYNAMIC_CLASS(wxShapeRegion, wxObject)
 
 wxShapeRegion::wxShapeRegion()
 {
 
 wxShapeRegion::wxShapeRegion()
 {

-  m_regionText = "";
+  m_regionText = wxEmptyString;

   m_font = g_oglNormalFont;
   m_minHeight = 5.0;
   m_minWidth = 5.0;
   m_font = g_oglNormalFont;
   m_minHeight = 5.0;
   m_minWidth = 5.0;


@@ -1773,9 +1767,9 @@ wxShapeRegion::wxShapeRegion()
   m_regionProportionX = -1.0;
   m_regionProportionY = -1.0;
   m_formatMode = FORMAT_CENTRE_HORIZ | FORMAT_CENTRE_VERT;
   m_regionProportionX = -1.0;
   m_regionProportionY = -1.0;
   m_formatMode = FORMAT_CENTRE_HORIZ | FORMAT_CENTRE_VERT;

-  m_regionName = "";
-  m_textColour = "BLACK";
-  m_penColour = "BLACK";
+  m_regionName = wxEmptyString;
+  m_textColour = wxT("BLACK");
+  m_penColour = wxT("BLACK");

   m_penStyle = wxSOLID;
   m_actualColourObject = NULL;
   m_actualPenObject = NULL;
   m_penStyle = wxSOLID;
   m_actualColourObject = NULL;
   m_actualPenObject = NULL;


@@ -1804,14 +1798,14 @@ wxShapeRegion::wxShapeRegion(wxShapeRegion& region)
   m_penColour = region.m_penColour;
 
   ClearText();
   m_penColour = region.m_penColour;
 
   ClearText();

-  wxNode *node = region.m_formattedText.First();
+  wxNode *node = region.m_formattedText.GetFirst();

   while (node)
   {
   while (node)
   {

-    wxShapeTextLine *line = (wxShapeTextLine *)node->Data();
+    wxShapeTextLine *line = (wxShapeTextLine *)node->GetData();

     wxShapeTextLine *new_line =
       new wxShapeTextLine(line->GetX(), line->GetY(), line->GetText());
     m_formattedText.Append(new_line);
     wxShapeTextLine *new_line =
       new wxShapeTextLine(line->GetX(), line->GetY(), line->GetText());
     m_formattedText.Append(new_line);

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

   }
 }
 
   }
 }
 


@@ -1822,11 +1816,11 @@ wxShapeRegion::~wxShapeRegion()
 
 void wxShapeRegion::ClearText()
 {
 
 void wxShapeRegion::ClearText()
 {

-  wxNode *node = m_formattedText.First();
+  wxNode *node = m_formattedText.GetFirst();

   while (node)
   {
   while (node)
   {

-    wxShapeTextLine *line = (wxShapeTextLine *)node->Data();
-    wxNode *next = node->Next();
+    wxShapeTextLine *line = (wxShapeTextLine *)node->GetData();
+    wxNode *next = node->GetNext();

     delete line;
     delete node;
     node = next;
     delete line;
     delete node;
     node = next;


@@ -1897,7 +1891,7 @@ wxPen *wxShapeRegion::GetActualPen()
     return m_actualPenObject;
 
   if (!m_penColour) return NULL;
     return m_actualPenObject;
 
   if (!m_penColour) return NULL;

-  if (m_penColour == "Invisible")
+  if (m_penColour == wxT("Invisible"))

     return NULL;
   m_actualPenObject = wxThePenList->FindOrCreatePen(m_penColour, 1, m_penStyle);
   return m_actualPenObject;
     return NULL;
   m_actualPenObject = wxThePenList->FindOrCreatePen(m_penColour, 1, m_penStyle);
   return m_actualPenObject;