Rework modal dialog code to not depend on now obsolete wxDIALOG_MODAL flag.

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

diff --git a/contrib/src/ogl/composit.cpp b/contrib/src/ogl/composit.cpp
index 7834012aaf448779dbe3164e8a6bcb149acf546f..05eeefd2a3f1b2f0931a8c352a28094cc1470edd 100644 (file)
--- a/contrib/src/ogl/composit.cpp
+++ b/contrib/src/ogl/composit.cpp
@@ -24,14 +24,12 @@
 #include <wx/wx.h>
 #endif
 
 #include <wx/wx.h>
 #endif
 

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

 
 

-#include <wx/ogl/basic.h>
-#include <wx/ogl/basicp.h>
-#include <wx/ogl/constrnt.h>
-#include <wx/ogl/composit.h>
-#include <wx/ogl/misc.h>
-#include <wx/ogl/canvas.h>

 
 #if wxUSE_PROLOGIO
 // Sometimes, objects need to access the whole database to
 
 #if wxUSE_PROLOGIO
 // Sometimes, objects need to access the whole database to


@@ -74,18 +72,18 @@ wxCompositeShape::wxCompositeShape(): wxRectangleShape(10.0, 10.0)
 
 wxCompositeShape::~wxCompositeShape()
 {
 
 wxCompositeShape::~wxCompositeShape()
 {

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

   while (node)
   {
   while (node)
   {

-    wxOGLConstraint *constraint = (wxOGLConstraint *)node->Data();
+    wxOGLConstraint *constraint = (wxOGLConstraint *)node->GetData();

     delete constraint;
     delete constraint;

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

   }
   }

-  node = m_children.First();
+  node = m_children.GetFirst();

   while (node)
   {
   while (node)
   {

-    wxShape *object = (wxShape *)node->Data();
-    wxNode *next = node->Next();
+    wxShape *object = (wxShape *)node->GetData();
+    wxNode *next = node->GetNext();

     object->Unlink();
     delete object;
     node = next;
     object->Unlink();
     delete object;
     node = next;


@@ -113,13 +111,13 @@ void wxCompositeShape::OnDraw(wxDC& dc)
 
 void wxCompositeShape::OnDrawContents(wxDC& dc)
 {
 
 void wxCompositeShape::OnDrawContents(wxDC& dc)
 {

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

   while (node)
   {
   while (node)
   {

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

     object->Draw(dc);
     object->DrawLinks(dc);
     object->Draw(dc);
     object->DrawLinks(dc);

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

   }
   wxShape::OnDrawContents(dc);
 }
   }
   wxShape::OnDrawContents(dc);
 }


@@ -128,15 +126,15 @@ bool wxCompositeShape::OnMovePre(wxDC& dc, double x, double y, double oldx, doub
 {
   double diffX = x - oldx;
   double diffY = y - oldy;
 {
   double diffX = x - oldx;
   double diffY = y - oldy;

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

   while (node)
   {
   while (node)
   {

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

 
     object->Erase(dc);
     object->Move(dc, object->GetX() + diffX, object->GetY() + diffY, display);
 
 
     object->Erase(dc);
     object->Move(dc, object->GetX() + diffX, object->GetY() + diffY, display);
 

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

   }
   return TRUE;
 }
   }
   return TRUE;
 }


@@ -144,19 +142,19 @@ bool wxCompositeShape::OnMovePre(wxDC& dc, double x, double y, double oldx, doub
 void wxCompositeShape::OnErase(wxDC& dc)
 {
   wxRectangleShape::OnErase(dc);
 void wxCompositeShape::OnErase(wxDC& dc)
 {
   wxRectangleShape::OnErase(dc);

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

   while (node)
   {
   while (node)
   {

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

     object->Erase(dc);
     object->Erase(dc);

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

   }
 }
 
 static double objectStartX = 0.0;
 static double objectStartY = 0.0;
 
   }
 }
 
 static double objectStartX = 0.0;
 static double objectStartY = 0.0;
 

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

 {
   double xx = x;
   double yy = y;
 {
   double xx = x;
   double yy = y;


@@ -176,7 +174,7 @@ void wxCompositeShape::OnDragLeft(bool draw, double x, double y, int keys, int a
 //  wxShape::OnDragLeft(draw, x, y, keys, attachment);
 }
 
 //  wxShape::OnDragLeft(draw, x, y, keys, attachment);
 }
 

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

 {
   objectStartX = x;
   objectStartY = y;
 {
   objectStartX = x;
   objectStartY = y;


@@ -204,7 +202,7 @@ void wxCompositeShape::OnBeginDragLeft(double x, double y, int keys, int attachm
 //  wxShape::OnBeginDragLeft(x, y, keys, attachment);
 }
 
 //  wxShape::OnBeginDragLeft(x, y, keys, attachment);
 }
 

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

 {
 //  wxShape::OnEndDragLeft(x, y, keys, attachment);
 
 {
 //  wxShape::OnEndDragLeft(x, y, keys, attachment);
 


@@ -231,17 +229,17 @@ void wxCompositeShape::OnEndDragLeft(double x, double y, int keys, int attachmen
   if (m_canvas && !m_canvas->GetQuickEditMode()) m_canvas->Redraw(dc);
 }
 
   if (m_canvas && !m_canvas->GetQuickEditMode()) m_canvas->Redraw(dc);
 }
 

-void wxCompositeShape::OnRightClick(double x, double y, int keys, int attachment)
+void wxCompositeShape::OnRightClick(double x, double y, int keys, int WXUNUSED(attachment))

 {
   // If we get a ctrl-right click, this means send the message to
   // the division, so we can invoke a user interface for dealing with regions.
   if (keys & KEY_CTRL)
   {
 {
   // If we get a ctrl-right click, this means send the message to
   // the division, so we can invoke a user interface for dealing with regions.
   if (keys & KEY_CTRL)
   {

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

     while (node)
     {
     while (node)
     {

-      wxDivisionShape *division = (wxDivisionShape *)node->Data();
-      wxNode *next = node->Next();
+      wxDivisionShape *division = (wxDivisionShape *)node->GetData();
+      wxNode *next = node->GetNext();

       int attach = 0;
       double dist = 0.0;
       if (division->HitTest(x, y, &attach, &dist))
       int attach = 0;
       double dist = 0.0;
       if (division->HitTest(x, y, &attach, &dist))


@@ -267,7 +265,7 @@ void wxCompositeShape::SetSize(double w, double h, bool recursive)
 
   if (!recursive) return;
 
 
   if (!recursive) return;
 

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

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


@@ -275,7 +273,7 @@ void wxCompositeShape::SetSize(double w, double h, bool recursive)
   double xBound, yBound;
   while (node)
   {
   double xBound, yBound;
   while (node)
   {

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

 
     // Scale the position first
     double newX = (double)(((object->GetX() - GetX())*xScale) + GetX());
 
     // Scale the position first
     double newX = (double)(((object->GetX() - GetX())*xScale) + GetX());


@@ -289,7 +287,7 @@ void wxCompositeShape::SetSize(double w, double h, bool recursive)
     object->SetSize(object->GetFixedWidth() ? xBound : xScale*xBound,
                     object->GetFixedHeight() ? yBound : yScale*yBound);
 
     object->SetSize(object->GetFixedWidth() ? xBound : xScale*xBound,
                     object->GetFixedHeight() ? yBound : yScale*yBound);
 

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

   }
   SetDefaultRegionSize();
 }
   }
   SetDefaultRegionSize();
 }


@@ -317,11 +315,11 @@ void wxCompositeShape::RemoveChild(wxShape *child)
 
 void wxCompositeShape::DeleteConstraintsInvolvingChild(wxShape *child)
 {
 
 void wxCompositeShape::DeleteConstraintsInvolvingChild(wxShape *child)
 {

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

   while (node)
   {
   while (node)
   {

-    wxOGLConstraint *constraint = (wxOGLConstraint *)node->Data();
-    wxNode *nextNode = node->Next();
+    wxOGLConstraint *constraint = (wxOGLConstraint *)node->GetData();
+    wxNode *nextNode = node->GetNext();

 
     if ((constraint->m_constrainingObject == child) ||
         constraint->m_constrainedObjects.Member(child))
 
     if ((constraint->m_constrainingObject == child) ||
         constraint->m_constrainedObjects.Member(child))


@@ -335,11 +333,11 @@ void wxCompositeShape::DeleteConstraintsInvolvingChild(wxShape *child)
 
 void wxCompositeShape::RemoveChildFromConstraints(wxShape *child)
 {
 
 void wxCompositeShape::RemoveChildFromConstraints(wxShape *child)
 {

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

   while (node)
   {
   while (node)
   {

-    wxOGLConstraint *constraint = (wxOGLConstraint *)node->Data();
-    wxNode *nextNode = node->Next();
+    wxOGLConstraint *constraint = (wxOGLConstraint *)node->GetData();
+    wxNode *nextNode = node->GetNext();

 
     if (constraint->m_constrainedObjects.Member(child))
       constraint->m_constrainedObjects.DeleteObject(child);
 
     if (constraint->m_constrainedObjects.Member(child))
       constraint->m_constrainedObjects.DeleteObject(child);


@@ -369,10 +367,10 @@ void wxCompositeShape::Copy(wxShape& copy)
   oglObjectCopyMapping.Append((long)this, &compositeCopy);
 
   // Copy the children
   oglObjectCopyMapping.Append((long)this, &compositeCopy);
 
   // Copy the children

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

   while (node)
   {
   while (node)
   {

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

     wxShape *newObject = object->CreateNewCopy(FALSE, FALSE);
     if (newObject->GetId() == 0)
       newObject->SetId(wxNewId());
     wxShape *newObject = object->CreateNewCopy(FALSE, FALSE);
     if (newObject->GetId() == 0)
       newObject->SetId(wxNewId());


@@ -386,25 +384,25 @@ void wxCompositeShape::Copy(wxShape& copy)
 
     oglObjectCopyMapping.Append((long)object, newObject);
 
 
     oglObjectCopyMapping.Append((long)object, newObject);
 

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

   }
 
   // Copy the constraints
   }
 
   // Copy the constraints

-  node = m_constraints.First();
+  node = m_constraints.GetFirst();

   while (node)
   {
   while (node)
   {

-    wxOGLConstraint *constraint = (wxOGLConstraint *)node->Data();
+    wxOGLConstraint *constraint = (wxOGLConstraint *)node->GetData();

 
 

-    wxShape *newConstraining = (wxShape *)(oglObjectCopyMapping.Find((long)constraint->m_constrainingObject)->Data());
+    wxShape *newConstraining = (wxShape *)(oglObjectCopyMapping.Find((long)constraint->m_constrainingObject)->GetData());

 
     wxList newConstrainedList;
 
     wxList newConstrainedList;

-    wxNode *node2 = constraint->m_constrainedObjects.First();
+    wxNode *node2 = constraint->m_constrainedObjects.GetFirst();

     while (node2)
     {
     while (node2)
     {

-      wxShape *constrainedObject = (wxShape *)node2->Data();
-      wxShape *newConstrained = (wxShape *)(oglObjectCopyMapping.Find((long)constrainedObject)->Data());
+      wxShape *constrainedObject = (wxShape *)node2->GetData();
+      wxShape *newConstrained = (wxShape *)(oglObjectCopyMapping.Find((long)constrainedObject)->GetData());

       newConstrainedList.Append(newConstrained);
       newConstrainedList.Append(newConstrained);

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

     }
 
     wxOGLConstraint *newConstraint = new wxOGLConstraint(constraint->m_constraintType, newConstraining,
     }
 
     wxOGLConstraint *newConstraint = new wxOGLConstraint(constraint->m_constraintType, newConstraining,


@@ -417,14 +415,14 @@ void wxCompositeShape::Copy(wxShape& copy)
     newConstraint->SetSpacing(constraint->m_xSpacing, constraint->m_ySpacing);
     compositeCopy.m_constraints.Append(newConstraint);
 
     newConstraint->SetSpacing(constraint->m_xSpacing, constraint->m_ySpacing);
     compositeCopy.m_constraints.Append(newConstraint);
 

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

   }
 
   // Now compositeCopy the division geometry
   }
 
   // Now compositeCopy the division geometry

-  node = m_divisions.First();
+  node = m_divisions.GetFirst();

   while (node)
   {
   while (node)
   {

-    wxDivisionShape *division = (wxDivisionShape *)node->Data();
+    wxDivisionShape *division = (wxDivisionShape *)node->GetData();

     wxNode *node1 = oglObjectCopyMapping.Find((long)division);
     wxNode *leftNode = NULL;
     wxNode *topNode = NULL;
     wxNode *node1 = oglObjectCopyMapping.Find((long)division);
     wxNode *leftNode = NULL;
     wxNode *topNode = NULL;


@@ -440,17 +438,17 @@ void wxCompositeShape::Copy(wxShape& copy)
       bottomNode = oglObjectCopyMapping.Find((long)division->GetBottomSide());
     if (node1)
     {
       bottomNode = oglObjectCopyMapping.Find((long)division->GetBottomSide());
     if (node1)
     {

-      wxDivisionShape *newDivision = (wxDivisionShape *)node1->Data();
+      wxDivisionShape *newDivision = (wxDivisionShape *)node1->GetData();

       if (leftNode)
       if (leftNode)

-        newDivision->SetLeftSide((wxDivisionShape *)leftNode->Data());
+        newDivision->SetLeftSide((wxDivisionShape *)leftNode->GetData());

       if (topNode)
       if (topNode)

-        newDivision->SetTopSide((wxDivisionShape *)topNode->Data());
+        newDivision->SetTopSide((wxDivisionShape *)topNode->GetData());

       if (rightNode)
       if (rightNode)

-        newDivision->SetRightSide((wxDivisionShape *)rightNode->Data());
+        newDivision->SetRightSide((wxDivisionShape *)rightNode->GetData());

       if (bottomNode)
       if (bottomNode)

-        newDivision->SetBottomSide((wxDivisionShape *)bottomNode->Data());
+        newDivision->SetBottomSide((wxDivisionShape *)bottomNode->GetData());

     }
     }

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

   }
 }
 
   }
 }
 


@@ -484,23 +482,23 @@ wxOGLConstraint *wxCompositeShape::AddConstraint(int type, wxShape *constraining
 
 wxOGLConstraint *wxCompositeShape::FindConstraint(long cId, wxCompositeShape **actualComposite)
 {
 
 wxOGLConstraint *wxCompositeShape::FindConstraint(long cId, wxCompositeShape **actualComposite)
 {

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

   while (node)
   {
   while (node)
   {

-    wxOGLConstraint *constraint = (wxOGLConstraint *)node->Data();
+    wxOGLConstraint *constraint = (wxOGLConstraint *)node->GetData();

     if (constraint->m_constraintId == cId)
     {
       if (actualComposite)
         *actualComposite = this;
       return constraint;
     }
     if (constraint->m_constraintId == cId)
     {
       if (actualComposite)
         *actualComposite = this;
       return constraint;
     }

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

   }
   // If not found, try children.
   }
   // If not found, try children.

-  node = m_children.First();
+  node = m_children.GetFirst();

   while (node)
   {
   while (node)
   {

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

     if (child->IsKindOf(CLASSINFO(wxCompositeShape)))
     {
       wxOGLConstraint *constraint = ((wxCompositeShape *)child)->FindConstraint(cId, actualComposite);
     if (child->IsKindOf(CLASSINFO(wxCompositeShape)))
     {
       wxOGLConstraint *constraint = ((wxCompositeShape *)child)->FindConstraint(cId, actualComposite);


@@ -511,7 +509,7 @@ wxOGLConstraint *wxCompositeShape::FindConstraint(long cId, wxCompositeShape **a
         return constraint;
       }
     }
         return constraint;
       }
     }

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

   }
   return NULL;
 }
   }
   return NULL;
 }


@@ -530,10 +528,10 @@ void wxCompositeShape::CalculateSize()
   double minY = (double)  999999.9;
 
   double w, h;
   double minY = (double)  999999.9;
 
   double w, h;

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

   while (node)
   {
   while (node)
   {

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

 
     // Recalculate size of composite objects because may not conform
     // to size it was set to - depends on the children.
 
     // Recalculate size of composite objects because may not conform
     // to size it was set to - depends on the children.


@@ -549,7 +547,7 @@ void wxCompositeShape::CalculateSize()
     if ((object->GetY() - (h/2.0)) < minY)
       minY = (double)(object->GetY() - (h/2.0));
 
     if ((object->GetY() - (h/2.0)) < minY)
       minY = (double)(object->GetY() - (h/2.0));
 

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

   }
   m_width = maxX - minX;
   m_height = maxY - minY;
   }
   m_width = maxX - minX;
   m_height = maxY - minY;


@@ -580,21 +578,21 @@ bool wxCompositeShape::Constrain()
   CalculateSize();
 
   bool changed = FALSE;
   CalculateSize();
 
   bool changed = FALSE;

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

   while (node)
   {
   while (node)
   {

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

     if (object->Constrain())
       changed = TRUE;
     if (object->Constrain())
       changed = TRUE;

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

   }
 
   }
 

-  node = m_constraints.First();
+  node = m_constraints.GetFirst();

   while (node)
   {
   while (node)
   {

-    wxOGLConstraint *constraint = (wxOGLConstraint *)node->Data();
+    wxOGLConstraint *constraint = (wxOGLConstraint *)node->GetData();

     if (constraint->Evaluate()) changed = TRUE;
     if (constraint->Evaluate()) changed = TRUE;

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

   }
   return changed;
 }
   }
   return changed;
 }


@@ -608,12 +606,12 @@ void wxCompositeShape::WriteAttributes(wxExpr *clause)
 
   // Output constraints as constraint1 = (...), constraint2 = (...), etc.
   int constraintNo = 1;
 
   // Output constraints as constraint1 = (...), constraint2 = (...), etc.
   int constraintNo = 1;

-  char m_constraintNameBuf[20];
-  wxNode *node = m_constraints.First();
+  wxChar m_constraintNameBuf[20];
+  wxNode *node = m_constraints.GetFirst();

   while (node)
   {
   while (node)
   {

-    wxOGLConstraint *constraint = (wxOGLConstraint *)node->Data();
-    sprintf(m_constraintNameBuf, "constraint%d", constraintNo);
+    wxOGLConstraint *constraint = (wxOGLConstraint *)node->GetData();
+    wxSprintf(m_constraintNameBuf, _T("constraint%d"), constraintNo);

 
     // Each constraint is stored in the form
     // (type name id xspacing yspacing m_constrainingObjectId constrainedObjectIdList)
 
     // Each constraint is stored in the form
     // (type name id xspacing yspacing m_constrainingObjectId constrainedObjectIdList)


@@ -626,44 +624,44 @@ void wxCompositeShape::WriteAttributes(wxExpr *clause)
     constraintExpr->Append(new wxExpr(constraint->m_constrainingObject->GetId()));
 
     wxExpr *objectList = new wxExpr(wxExprList);
     constraintExpr->Append(new wxExpr(constraint->m_constrainingObject->GetId()));
 
     wxExpr *objectList = new wxExpr(wxExprList);

-    wxNode *node1 = constraint->m_constrainedObjects.First();
+    wxNode *node1 = constraint->m_constrainedObjects.GetFirst();

     while (node1)
     {
     while (node1)
     {

-      wxShape *obj = (wxShape *)node1->Data();
+      wxShape *obj = (wxShape *)node1->GetData();

       objectList->Append(new wxExpr(obj->GetId()));
       objectList->Append(new wxExpr(obj->GetId()));

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

     }
     constraintExpr->Append(objectList);
 
     clause->AddAttributeValue(m_constraintNameBuf, constraintExpr);
 
     }
     constraintExpr->Append(objectList);
 
     clause->AddAttributeValue(m_constraintNameBuf, constraintExpr);
 

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

     constraintNo ++;
   }
 
   // Write the ids of all the child images
   wxExpr *childrenExpr = new wxExpr(wxExprList);
     constraintNo ++;
   }
 
   // Write the ids of all the child images
   wxExpr *childrenExpr = new wxExpr(wxExprList);

-  node = m_children.First();
+  node = m_children.GetFirst();

   while (node)
   {
   while (node)
   {

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

     childrenExpr->Append(new wxExpr(child->GetId()));
     childrenExpr->Append(new wxExpr(child->GetId()));

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

   }
   }

-  clause->AddAttributeValue("children", childrenExpr);
+  clause->AddAttributeValue(_T("children"), childrenExpr);

 
   // Write the ids of all the division images
 
   // Write the ids of all the division images

-  if (m_divisions.Number() > 0)
+  if (m_divisions.GetCount() > 0)

   {
     wxExpr *divisionsExpr = new wxExpr(wxExprList);
   {
     wxExpr *divisionsExpr = new wxExpr(wxExprList);

-    node = m_divisions.First();
+    node = m_divisions.GetFirst();

     while (node)
     {
     while (node)
     {

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

       divisionsExpr->Append(new wxExpr(child->GetId()));
       divisionsExpr->Append(new wxExpr(child->GetId()));

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

     }
     }

-    clause->AddAttributeValue("divisions", divisionsExpr);
+    clause->AddAttributeValue(_T("divisions"), divisionsExpr);

   }
 }
 
   }
 }
 


@@ -682,12 +680,12 @@ void wxCompositeShape::ReadConstraints(wxExpr *clause, wxExprDatabase *database)
 {
   // Constraints are output as constraint1 = (...), constraint2 = (...), etc.
   int constraintNo = 1;
 {
   // Constraints are output as constraint1 = (...), constraint2 = (...), etc.
   int constraintNo = 1;

-  char m_constraintNameBuf[20];
+  wxChar m_constraintNameBuf[20];

   bool haveConstraints = TRUE;
 
   while (haveConstraints)
   {
   bool haveConstraints = TRUE;
 
   while (haveConstraints)
   {

-    sprintf(m_constraintNameBuf, "constraint%d", constraintNo);
+    wxSprintf(m_constraintNameBuf, _T("constraint%d"), constraintNo);

     wxExpr *constraintExpr = NULL;
     clause->GetAttributeValue(m_constraintNameBuf, &constraintExpr);
     if (!constraintExpr)
     wxExpr *constraintExpr = NULL;
     clause->GetAttributeValue(m_constraintNameBuf, &constraintExpr);
     if (!constraintExpr)


@@ -695,11 +693,7 @@ void wxCompositeShape::ReadConstraints(wxExpr *clause, wxExprDatabase *database)
       haveConstraints = FALSE;
       break;
     }
       haveConstraints = FALSE;
       break;
     }

-    int cType = 0;
-    double cXSpacing = 0.0;
-    double cYSpacing = 0.0;
-    wxString cName("");
-    long cId = 0;
+    wxString cName = wxEmptyString;

     wxShape *m_constrainingObject = NULL;
     wxList m_constrainedObjects;
 
     wxShape *m_constrainingObject = NULL;
     wxList m_constrainedObjects;
 


@@ -714,13 +708,13 @@ void wxCompositeShape::ReadConstraints(wxExpr *clause, wxExprDatabase *database)
     wxExpr *constrainingExpr = constraintExpr->Nth(5);
     wxExpr *constrainedExpr = constraintExpr->Nth(6);
 
     wxExpr *constrainingExpr = constraintExpr->Nth(5);
     wxExpr *constrainedExpr = constraintExpr->Nth(6);
 

-    cType = (int)typeExpr->IntegerValue();
-    cXSpacing = xExpr->RealValue();
-    cYSpacing = yExpr->RealValue();
+    int cType = (int)typeExpr->IntegerValue();
+    double cXSpacing = xExpr->RealValue();
+    double cYSpacing = yExpr->RealValue();

     cName = nameExpr->StringValue();
     cName = nameExpr->StringValue();

-    cId = idExpr->IntegerValue();
+    long cId = idExpr->IntegerValue();

 
 

-    wxExpr *objExpr1 = database->HashFind("node_image", constrainingExpr->IntegerValue());
+    wxExpr *objExpr1 = database->HashFind(_T("node_image"), constrainingExpr->IntegerValue());

     if (objExpr1 && objExpr1->GetClientData())
       m_constrainingObject = (wxShape *)objExpr1->GetClientData();
     else
     if (objExpr1 && objExpr1->GetClientData())
       m_constrainingObject = (wxShape *)objExpr1->GetClientData();
     else


@@ -731,7 +725,7 @@ void wxCompositeShape::ReadConstraints(wxExpr *clause, wxExprDatabase *database)
     while (currentIdExpr)
     {
       long currentId = currentIdExpr->IntegerValue();
     while (currentIdExpr)
     {
       long currentId = currentIdExpr->IntegerValue();

-      wxExpr *objExpr2 = database->HashFind("node_image", currentId);
+      wxExpr *objExpr2 = database->HashFind(_T("node_image"), currentId);

       if (objExpr2 && objExpr2->GetClientData())
       {
         m_constrainedObjects.Append((wxShape *)objExpr2->GetClientData());
       if (objExpr2 && objExpr2->GetClientData())
       {
         m_constrainedObjects.Append((wxShape *)objExpr2->GetClientData());


@@ -777,13 +771,13 @@ wxDivisionShape *wxCompositeShape::OnCreateDivision()
 
 wxShape *wxCompositeShape::FindContainerImage()
 {
 
 wxShape *wxCompositeShape::FindContainerImage()
 {

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

   while (node)
   {
   while (node)
   {

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

     if (!m_divisions.Member(child))
       return child;
     if (!m_divisions.Member(child))
       return child;

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

   }
   return NULL;
 }
   }
   return NULL;
 }


@@ -793,17 +787,17 @@ bool wxCompositeShape::ContainsDivision(wxDivisionShape *division)
 {
   if (m_divisions.Member(division))
     return TRUE;
 {
   if (m_divisions.Member(division))
     return TRUE;

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

   while (node)
   {
   while (node)
   {

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

     if (child->IsKindOf(CLASSINFO(wxCompositeShape)))
     {
       bool ans = ((wxCompositeShape *)child)->ContainsDivision(division);
       if (ans)
         return TRUE;
     }
     if (child->IsKindOf(CLASSINFO(wxCompositeShape)))
     {
       bool ans = ((wxCompositeShape *)child)->ContainsDivision(division);
       if (ans)
         return TRUE;
     }

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

   }
   return FALSE;
 }
   }
   return FALSE;
 }


@@ -879,13 +873,13 @@ bool wxDivisionShape::OnMovePre(wxDC& dc, double x, double y, double oldx, doubl
 {
   double diffX = x - oldx;
   double diffY = y - oldy;
 {
   double diffX = x - oldx;
   double diffY = y - oldy;

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

   while (node)
   {
   while (node)
   {

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

     object->Erase(dc);
     object->Move(dc, object->GetX() + diffX, object->GetY() + diffY, display);
     object->Erase(dc);
     object->Move(dc, object->GetX() + diffX, object->GetY() + diffY, display);

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

   }
   return TRUE;
 }
   }
   return TRUE;
 }


@@ -991,30 +985,30 @@ void wxDivisionShape::WriteAttributes(wxExpr *clause)
   wxCompositeShape::WriteAttributes(clause);
 
   if (m_leftSide)
   wxCompositeShape::WriteAttributes(clause);
 
   if (m_leftSide)

-    clause->AddAttributeValue("left_side", (long)m_leftSide->GetId());
+    clause->AddAttributeValue(_T("left_side"), (long)m_leftSide->GetId());

   if (m_topSide)
   if (m_topSide)

-    clause->AddAttributeValue("top_side", (long)m_topSide->GetId());
+    clause->AddAttributeValue(_T("top_side"), (long)m_topSide->GetId());

   if (m_rightSide)
   if (m_rightSide)

-    clause->AddAttributeValue("right_side", (long)m_rightSide->GetId());
+    clause->AddAttributeValue(_T("right_side"), (long)m_rightSide->GetId());

   if (m_bottomSide)
   if (m_bottomSide)

-    clause->AddAttributeValue("bottom_side", (long)m_bottomSide->GetId());
+    clause->AddAttributeValue(_T("bottom_side"), (long)m_bottomSide->GetId());

 
 

-  clause->AddAttributeValue("handle_side", (long)m_handleSide);
-  clause->AddAttributeValueString("left_colour", m_leftSideColour);
-  clause->AddAttributeValueString("top_colour", m_topSideColour);
-  clause->AddAttributeValueString("left_style", m_leftSideStyle);
-  clause->AddAttributeValueString("top_style", m_topSideStyle);
+  clause->AddAttributeValue(_T("handle_side"), (long)m_handleSide);
+  clause->AddAttributeValueString(_T("left_colour"), m_leftSideColour);
+  clause->AddAttributeValueString(_T("top_colour"), m_topSideColour);
+  clause->AddAttributeValueString(_T("left_style"), m_leftSideStyle);
+  clause->AddAttributeValueString(_T("top_style"), m_topSideStyle);

 }
 
 void wxDivisionShape::ReadAttributes(wxExpr *clause)
 {
   wxCompositeShape::ReadAttributes(clause);
 
 }
 
 void wxDivisionShape::ReadAttributes(wxExpr *clause)
 {
   wxCompositeShape::ReadAttributes(clause);
 

-  clause->GetAttributeValue("handle_side", m_handleSide);
-  clause->GetAttributeValue("left_colour", m_leftSideColour);
-  clause->GetAttributeValue("top_colour", m_topSideColour);
-  clause->GetAttributeValue("left_style", m_leftSideStyle);
-  clause->GetAttributeValue("top_style", m_topSideStyle);
+  clause->GetAttributeValue(_T("handle_side"), m_handleSide);
+  clause->GetAttributeValue(_T("left_colour"), m_leftSideColour);
+  clause->GetAttributeValue(_T("top_colour"), m_topSideColour);
+  clause->GetAttributeValue(_T("left_style"), m_leftSideStyle);
+  clause->GetAttributeValue(_T("top_style"), m_topSideStyle);

 }
 #endif
 
 }
 #endif
 


@@ -1084,13 +1078,13 @@ bool wxDivisionShape::Divide(int direction)
 
     // Anything adjoining the bottom of this division now adjoins the
     // bottom of the new division.
 
     // Anything adjoining the bottom of this division now adjoins the
     // bottom of the new division.

-    wxNode *node = compositeParent->GetDivisions().First();
+    wxNode *node = compositeParent->GetDivisions().GetFirst();

     while (node)
     {
     while (node)
     {

-      wxDivisionShape *obj = (wxDivisionShape *)node->Data();
+      wxDivisionShape *obj = (wxDivisionShape *)node->GetData();

       if (obj->GetTopSide() == this)
         obj->SetTopSide(newDivision);
       if (obj->GetTopSide() == this)
         obj->SetTopSide(newDivision);

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

     }
     newDivision->SetTopSide(this);
     newDivision->SetBottomSide(m_bottomSide);
     }
     newDivision->SetTopSide(this);
     newDivision->SetBottomSide(m_bottomSide);


@@ -1135,13 +1129,13 @@ bool wxDivisionShape::Divide(int direction)
 
     // Anything adjoining the left of this division now adjoins the
     // left of the new division.
 
     // Anything adjoining the left of this division now adjoins the
     // left of the new division.

-    wxNode *node = compositeParent->GetDivisions().First();
+    wxNode *node = compositeParent->GetDivisions().GetFirst();

     while (node)
     {
     while (node)
     {

-      wxDivisionShape *obj = (wxDivisionShape *)node->Data();
+      wxDivisionShape *obj = (wxDivisionShape *)node->GetData();

       if (obj->GetLeftSide() == this)
         obj->SetLeftSide(newDivision);
       if (obj->GetLeftSide() == this)
         obj->SetLeftSide(newDivision);

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

     }
     newDivision->SetTopSide(m_topSide);
     newDivision->SetBottomSide(m_bottomSide);
     }
     newDivision->SetTopSide(m_topSide);
     newDivision->SetBottomSide(m_bottomSide);


@@ -1182,8 +1176,8 @@ void wxDivisionShape::MakeMandatoryControlPoints()
   double maxX, maxY;
 
   GetBoundingBoxMax(&maxX, &maxY);
   double maxX, maxY;
 
   GetBoundingBoxMax(&maxX, &maxY);

-  double x, y;
-  int direction;
+  double x = 0.0 , y = 0.0;
+  int direction = 0;

 /*
   if (m_leftSide)
   {
 /*
   if (m_leftSide)
   {


@@ -1253,17 +1247,17 @@ void wxDivisionShape::ResetControlPoints()
 
 void wxDivisionShape::ResetMandatoryControlPoints()
 {
 
 void wxDivisionShape::ResetMandatoryControlPoints()
 {

-  if (m_controlPoints.Number() < 1)
+  if (m_controlPoints.GetCount() < 1)

     return;
 
   double maxX, maxY;
 
   GetBoundingBoxMax(&maxX, &maxY);
 /*
     return;
 
   double maxX, maxY;
 
   GetBoundingBoxMax(&maxX, &maxY);
 /*

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

   while (node)
   {
   while (node)
   {

-    wxDivisionControlPoint *control = (wxDivisionControlPoint *)node->Data();
+    wxDivisionControlPoint *control = (wxDivisionControlPoint *)node->GetData();

     if (control->type == CONTROL_POINT_HORIZONTAL)
     {
       control->xoffset = (double)(-maxX/2.0); control->m_yoffset = 0.0;
     if (control->type == CONTROL_POINT_HORIZONTAL)
     {
       control->xoffset = (double)(-maxX/2.0); control->m_yoffset = 0.0;


@@ -1272,31 +1266,31 @@ void wxDivisionShape::ResetMandatoryControlPoints()
     {
       control->xoffset = 0.0; control->m_yoffset = (double)(-maxY/2.0);
     }
     {
       control->xoffset = 0.0; control->m_yoffset = (double)(-maxY/2.0);
     }

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

   }
 */
   }
 */

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

   if ((m_handleSide == DIVISION_SIDE_LEFT) && node)
   {
   if ((m_handleSide == DIVISION_SIDE_LEFT) && node)
   {

-    wxDivisionControlPoint *control = (wxDivisionControlPoint *)node->Data();
+    wxDivisionControlPoint *control = (wxDivisionControlPoint *)node->GetData();

     control->m_xoffset = (double)(-maxX/2.0); control->m_yoffset = 0.0;
   }
 
   if ((m_handleSide == DIVISION_SIDE_TOP) && node)
   {
     control->m_xoffset = (double)(-maxX/2.0); control->m_yoffset = 0.0;
   }
 
   if ((m_handleSide == DIVISION_SIDE_TOP) && node)
   {

-    wxDivisionControlPoint *control = (wxDivisionControlPoint *)node->Data();
+    wxDivisionControlPoint *control = (wxDivisionControlPoint *)node->GetData();

     control->m_xoffset = 0.0; control->m_yoffset = (double)(-maxY/2.0);
   }
 
   if ((m_handleSide == DIVISION_SIDE_RIGHT) && node)
   {
     control->m_xoffset = 0.0; control->m_yoffset = (double)(-maxY/2.0);
   }
 
   if ((m_handleSide == DIVISION_SIDE_RIGHT) && node)
   {

-    wxDivisionControlPoint *control = (wxDivisionControlPoint *)node->Data();
+    wxDivisionControlPoint *control = (wxDivisionControlPoint *)node->GetData();

     control->m_xoffset = (double)(maxX/2.0); control->m_yoffset = 0.0;
   }
 
   if ((m_handleSide == DIVISION_SIDE_BOTTOM) && node)
   {
     control->m_xoffset = (double)(maxX/2.0); control->m_yoffset = 0.0;
   }
 
   if ((m_handleSide == DIVISION_SIDE_BOTTOM) && node)
   {

-    wxDivisionControlPoint *control = (wxDivisionControlPoint *)node->Data();
+    wxDivisionControlPoint *control = (wxDivisionControlPoint *)node->GetData();

     control->m_xoffset = 0.0; control->m_yoffset = (double)(maxY/2.0);
   }
 }
     control->m_xoffset = 0.0; control->m_yoffset = (double)(maxY/2.0);
   }
 }


@@ -1512,10 +1506,10 @@ void wxDivisionControlPoint::OnEndDragLeft(double x, double y, int keys, int att
 bool wxDivisionShape::ResizeAdjoining(int side, double newPos, bool test)
 {
   wxCompositeShape *divisionParent = (wxCompositeShape *)GetParent();
 bool wxDivisionShape::ResizeAdjoining(int side, double newPos, bool test)
 {
   wxCompositeShape *divisionParent = (wxCompositeShape *)GetParent();

-  wxNode *node = divisionParent->GetDivisions().First();
+  wxNode *node = divisionParent->GetDivisions().GetFirst();

   while (node)
   {
   while (node)
   {

-    wxDivisionShape *division = (wxDivisionShape *)node->Data();
+    wxDivisionShape *division = (wxDivisionShape *)node->GetData();

     switch (side)
     {
       case DIVISION_SIDE_LEFT:
     switch (side)
     {
       case DIVISION_SIDE_LEFT:


@@ -1561,7 +1555,7 @@ bool wxDivisionShape::ResizeAdjoining(int side, double newPos, bool test)
       default:
         break;
     }
       default:
         break;
     }

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

   }
 
   return TRUE;
   }
 
   return TRUE;


@@ -1587,8 +1581,7 @@ public:
 };
 
 BEGIN_EVENT_TABLE(OGLPopupDivisionMenu, wxMenu)
 };
 
 BEGIN_EVENT_TABLE(OGLPopupDivisionMenu, wxMenu)

-    EVT_CUSTOM_RANGE(wxEVT_COMMAND_MENU_SELECTED,
-                     DIVISION_MENU_SPLIT_HORIZONTALLY,
+    EVT_MENU_RANGE(DIVISION_MENU_SPLIT_HORIZONTALLY,

                      DIVISION_MENU_EDIT_BOTTOM_EDGE,
                      OGLPopupDivisionMenu::OnMenu)
 END_EVENT_TABLE()
                      DIVISION_MENU_EDIT_BOTTOM_EDGE,
                      OGLPopupDivisionMenu::OnMenu)
 END_EVENT_TABLE()


@@ -1624,7 +1617,7 @@ void OGLPopupDivisionMenu::OnMenu(wxCommandEvent& event)
   }
 }
 
   }
 }
 

-void wxDivisionShape::EditEdge(int side)
+void wxDivisionShape::EditEdge(int WXUNUSED(side))

 {
   wxMessageBox(wxT("EditEdge() not implemented"), wxT("OGL"), wxOK);
 
 {
   wxMessageBox(wxT("EditEdge() not implemented"), wxT("OGL"), wxOK);