set SMALL_FONT for controls here because InheritAttributes() doesn't do it any longer

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

diff --git a/contrib/src/ogl/constrnt.cpp b/contrib/src/ogl/constrnt.cpp
index ed2562b2ab344c4048770bfac52f0d5277074ed2..ddd736d643f9429aabf65737f5717e9d98f09f9a 100644 (file)
--- a/contrib/src/ogl/constrnt.cpp
+++ b/contrib/src/ogl/constrnt.cpp
@@ -14,7 +14,7 @@
 #endif
 
 // For compilers that support precompilation, includes "wx.h".
 #endif
 
 // For compilers that support precompilation, includes "wx.h".

-#include <wx/wxprec.h>
+#include "wx/wxprec.h"

 
 #ifdef __BORLANDC__
 #pragma hdrstop
 
 #ifdef __BORLANDC__
 #pragma hdrstop


@@ -24,11 +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/constrnt.h>
-#include <wx/ogl/canvas.h>

 
 wxList *wxOGLConstraintTypes = NULL;
 
 
 wxList *wxOGLConstraintTypes = NULL;
 


@@ -58,51 +59,51 @@ void OGLInitializeConstraintTypes()
     wxOGLConstraintTypes = new wxList(wxKEY_INTEGER);
 
     wxOGLConstraintTypes->Append(gyCONSTRAINT_CENTRED_VERTICALLY,
     wxOGLConstraintTypes = new wxList(wxKEY_INTEGER);
 
     wxOGLConstraintTypes->Append(gyCONSTRAINT_CENTRED_VERTICALLY,

-        new wxOGLConstraintType(gyCONSTRAINT_CENTRED_VERTICALLY, "Centre vertically", "centred vertically w.r.t."));
+        new wxOGLConstraintType(gyCONSTRAINT_CENTRED_VERTICALLY, wxT("Centre vertically"), wxT("centred vertically w.r.t.")));

 
     wxOGLConstraintTypes->Append(gyCONSTRAINT_CENTRED_HORIZONTALLY,
 
     wxOGLConstraintTypes->Append(gyCONSTRAINT_CENTRED_HORIZONTALLY,

-        new wxOGLConstraintType(gyCONSTRAINT_CENTRED_HORIZONTALLY, "Centre horizontally", "centred horizontally w.r.t."));
+        new wxOGLConstraintType(gyCONSTRAINT_CENTRED_HORIZONTALLY, wxT("Centre horizontally"), wxT("centred horizontally w.r.t.")));

 
     wxOGLConstraintTypes->Append(gyCONSTRAINT_CENTRED_BOTH,
 
     wxOGLConstraintTypes->Append(gyCONSTRAINT_CENTRED_BOTH,

-        new wxOGLConstraintType(gyCONSTRAINT_CENTRED_BOTH, "Centre", "centred w.r.t."));
+        new wxOGLConstraintType(gyCONSTRAINT_CENTRED_BOTH, wxT("Centre"), wxT("centred w.r.t.")));

 
     wxOGLConstraintTypes->Append(gyCONSTRAINT_LEFT_OF,
 
     wxOGLConstraintTypes->Append(gyCONSTRAINT_LEFT_OF,

-        new wxOGLConstraintType(gyCONSTRAINT_LEFT_OF, "Left of", "left of"));
+        new wxOGLConstraintType(gyCONSTRAINT_LEFT_OF, wxT("Left of"), wxT("left of")));

 
     wxOGLConstraintTypes->Append(gyCONSTRAINT_RIGHT_OF,
 
     wxOGLConstraintTypes->Append(gyCONSTRAINT_RIGHT_OF,

-        new wxOGLConstraintType(gyCONSTRAINT_RIGHT_OF, "Right of", "right of"));
+        new wxOGLConstraintType(gyCONSTRAINT_RIGHT_OF, wxT("Right of"), wxT("right of")));

 
     wxOGLConstraintTypes->Append(gyCONSTRAINT_ABOVE,
 
     wxOGLConstraintTypes->Append(gyCONSTRAINT_ABOVE,

-        new wxOGLConstraintType(gyCONSTRAINT_ABOVE, "Above", "above"));
+        new wxOGLConstraintType(gyCONSTRAINT_ABOVE, wxT("Above"), wxT("above")));

 
     wxOGLConstraintTypes->Append(gyCONSTRAINT_BELOW,
 
     wxOGLConstraintTypes->Append(gyCONSTRAINT_BELOW,

-        new wxOGLConstraintType(gyCONSTRAINT_BELOW, "Below", "below"));
+        new wxOGLConstraintType(gyCONSTRAINT_BELOW, wxT("Below"), wxT("below")));

 
     // Alignment
     wxOGLConstraintTypes->Append(gyCONSTRAINT_ALIGNED_TOP,
 
     // Alignment
     wxOGLConstraintTypes->Append(gyCONSTRAINT_ALIGNED_TOP,

-        new wxOGLConstraintType(gyCONSTRAINT_ALIGNED_TOP, "Top-aligned", "aligned to the top of"));
+        new wxOGLConstraintType(gyCONSTRAINT_ALIGNED_TOP, wxT("Top-aligned"), wxT("aligned to the top of")));

 
     wxOGLConstraintTypes->Append(gyCONSTRAINT_ALIGNED_BOTTOM,
 
     wxOGLConstraintTypes->Append(gyCONSTRAINT_ALIGNED_BOTTOM,

-        new wxOGLConstraintType(gyCONSTRAINT_ALIGNED_BOTTOM, "Bottom-aligned", "aligned to the bottom of"));
+        new wxOGLConstraintType(gyCONSTRAINT_ALIGNED_BOTTOM, wxT("Bottom-aligned"), wxT("aligned to the bottom of")));

 
     wxOGLConstraintTypes->Append(gyCONSTRAINT_ALIGNED_LEFT,
 
     wxOGLConstraintTypes->Append(gyCONSTRAINT_ALIGNED_LEFT,

-        new wxOGLConstraintType(gyCONSTRAINT_ALIGNED_LEFT, "Left-aligned", "aligned to the left of"));
+        new wxOGLConstraintType(gyCONSTRAINT_ALIGNED_LEFT, wxT("Left-aligned"), wxT("aligned to the left of")));

 
     wxOGLConstraintTypes->Append(gyCONSTRAINT_ALIGNED_RIGHT,
 
     wxOGLConstraintTypes->Append(gyCONSTRAINT_ALIGNED_RIGHT,

-        new wxOGLConstraintType(gyCONSTRAINT_ALIGNED_RIGHT, "Right-aligned", "aligned to the right of"));
+        new wxOGLConstraintType(gyCONSTRAINT_ALIGNED_RIGHT, wxT("Right-aligned"), wxT("aligned to the right of")));

 
     // Mid-alignment
     wxOGLConstraintTypes->Append(gyCONSTRAINT_MIDALIGNED_TOP,
 
     // Mid-alignment
     wxOGLConstraintTypes->Append(gyCONSTRAINT_MIDALIGNED_TOP,

-        new wxOGLConstraintType(gyCONSTRAINT_MIDALIGNED_TOP, "Top-midaligned", "centred on the top of"));
+        new wxOGLConstraintType(gyCONSTRAINT_MIDALIGNED_TOP, wxT("Top-midaligned"), wxT("centred on the top of")));

 
     wxOGLConstraintTypes->Append(gyCONSTRAINT_MIDALIGNED_BOTTOM,
 
     wxOGLConstraintTypes->Append(gyCONSTRAINT_MIDALIGNED_BOTTOM,

-        new wxOGLConstraintType(gyCONSTRAINT_MIDALIGNED_BOTTOM, "Bottom-midaligned", "centred on the bottom of"));
+        new wxOGLConstraintType(gyCONSTRAINT_MIDALIGNED_BOTTOM, wxT("Bottom-midaligned"), wxT("centred on the bottom of")));

 
     wxOGLConstraintTypes->Append(gyCONSTRAINT_MIDALIGNED_LEFT,
 
     wxOGLConstraintTypes->Append(gyCONSTRAINT_MIDALIGNED_LEFT,

-        new wxOGLConstraintType(gyCONSTRAINT_MIDALIGNED_LEFT, "Left-midaligned", "centred on the left of"));
+        new wxOGLConstraintType(gyCONSTRAINT_MIDALIGNED_LEFT, wxT("Left-midaligned"), wxT("centred on the left of")));

 
     wxOGLConstraintTypes->Append(gyCONSTRAINT_MIDALIGNED_RIGHT,
 
     wxOGLConstraintTypes->Append(gyCONSTRAINT_MIDALIGNED_RIGHT,

-        new wxOGLConstraintType(gyCONSTRAINT_MIDALIGNED_RIGHT, "Right-midaligned", "centred on the right of"));
+        new wxOGLConstraintType(gyCONSTRAINT_MIDALIGNED_RIGHT, wxT("Right-midaligned"), wxT("centred on the right of")));

 }
 
 void OGLCleanUpConstraintTypes()
 }
 
 void OGLCleanUpConstraintTypes()


@@ -110,12 +111,12 @@ void OGLCleanUpConstraintTypes()
     if (!wxOGLConstraintTypes)
         return;
 
     if (!wxOGLConstraintTypes)
         return;
 

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

     while (node)
     {
     while (node)
     {

-        wxOGLConstraintType* ct = (wxOGLConstraintType*) node->Data();
+        wxOGLConstraintType* ct = (wxOGLConstraintType*) node->GetData();

         delete ct;
         delete ct;

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

     }
     delete wxOGLConstraintTypes;
     wxOGLConstraintTypes = NULL;
     }
     delete wxOGLConstraintTypes;
     wxOGLConstraintTypes = NULL;


@@ -137,13 +138,13 @@ wxOGLConstraint::wxOGLConstraint(int type, wxShape *constraining, wxList& constr
   m_constrainingObject = constraining;
 
   m_constraintId = 0;
   m_constrainingObject = constraining;
 
   m_constraintId = 0;

-  m_constraintName = "noname";
+  m_constraintName = wxT("noname");

 
 

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

   while (node)
   {
   while (node)
   {

-    m_constrainedObjects.Append(node->Data());
-    node = node->Next();
+    m_constrainedObjects.Append(node->GetData());
+    node = node->GetNext();

   }
 }
 
   }
 }
 


@@ -175,17 +176,17 @@ bool wxOGLConstraint::Evaluate()
   {
     case gyCONSTRAINT_CENTRED_VERTICALLY:
     {
   {
     case gyCONSTRAINT_CENTRED_VERTICALLY:
     {

-      int n = m_constrainedObjects.Number();
+      int n = m_constrainedObjects.GetCount();

       double totalObjectHeight = 0.0;
       double totalObjectHeight = 0.0;

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

       while (node)
       {
       while (node)
       {

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

 
         double width2, height2;
         constrainedObject->GetBoundingBoxMax(&width2, &height2);
         totalObjectHeight += height2;
 
         double width2, height2;
         constrainedObject->GetBoundingBoxMax(&width2, &height2);
         totalObjectHeight += height2;

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

       }
       double startY;
       double spacingY;
       }
       double startY;
       double spacingY;


@@ -204,10 +205,10 @@ bool wxOGLConstraint::Evaluate()
 
       // Now position the objects
       bool changed = FALSE;
 
       // Now position the objects
       bool changed = FALSE;

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

       while (node)
       {
       while (node)
       {

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

         double width2, height2;
         constrainedObject->GetBoundingBoxMax(&width2, &height2);
         startY += (double)(spacingY + (height2/2.0));
         double width2, height2;
         constrainedObject->GetBoundingBoxMax(&width2, &height2);
         startY += (double)(spacingY + (height2/2.0));


@@ -217,23 +218,23 @@ bool wxOGLConstraint::Evaluate()
           changed = TRUE;
         }
         startY += (double)(height2/2.0);
           changed = TRUE;
         }
         startY += (double)(height2/2.0);

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

       }
       return changed;
     }
     case gyCONSTRAINT_CENTRED_HORIZONTALLY:
     {
       }
       return changed;
     }
     case gyCONSTRAINT_CENTRED_HORIZONTALLY:
     {

-      int n = m_constrainedObjects.Number();
+      int n = m_constrainedObjects.GetCount();

       double totalObjectWidth = 0.0;
       double totalObjectWidth = 0.0;

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

       while (node)
       {
       while (node)
       {

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

 
         double width2, height2;
         constrainedObject->GetBoundingBoxMax(&width2, &height2);
         totalObjectWidth += width2;
 
         double width2, height2;
         constrainedObject->GetBoundingBoxMax(&width2, &height2);
         totalObjectWidth += width2;

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

       }
       double startX;
       double spacingX;
       }
       double startX;
       double spacingX;


@@ -252,10 +253,10 @@ bool wxOGLConstraint::Evaluate()
 
       // Now position the objects
       bool changed = FALSE;
 
       // Now position the objects
       bool changed = FALSE;

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

       while (node)
       {
       while (node)
       {

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

         double width2, height2;
         constrainedObject->GetBoundingBoxMax(&width2, &height2);
         startX += (double)(spacingX + (width2/2.0));
         double width2, height2;
         constrainedObject->GetBoundingBoxMax(&width2, &height2);
         startX += (double)(spacingX + (width2/2.0));


@@ -265,25 +266,25 @@ bool wxOGLConstraint::Evaluate()
           changed = TRUE;
         }
         startX += (double)(width2/2.0);
           changed = TRUE;
         }
         startX += (double)(width2/2.0);

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

       }
       return changed;
     }
     case gyCONSTRAINT_CENTRED_BOTH:
     {
       }
       return changed;
     }
     case gyCONSTRAINT_CENTRED_BOTH:
     {

-      int n = m_constrainedObjects.Number();
+      int n = m_constrainedObjects.GetCount();

       double totalObjectWidth = 0.0;
       double totalObjectHeight = 0.0;
       double totalObjectWidth = 0.0;
       double totalObjectHeight = 0.0;

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

       while (node)
       {
       while (node)
       {

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

 
         double width2, height2;
         constrainedObject->GetBoundingBoxMax(&width2, &height2);
         totalObjectWidth += width2;
         totalObjectHeight += height2;
 
         double width2, height2;
         constrainedObject->GetBoundingBoxMax(&width2, &height2);
         totalObjectWidth += width2;
         totalObjectHeight += height2;

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

       }
       double startX;
       double spacingX;
       }
       double startX;
       double spacingX;


@@ -318,10 +319,10 @@ bool wxOGLConstraint::Evaluate()
 
       // Now position the objects
       bool changed = FALSE;
 
       // Now position the objects
       bool changed = FALSE;

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

       while (node)
       {
       while (node)
       {

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

         double width2, height2;
         constrainedObject->GetBoundingBoxMax(&width2, &height2);
         startX += (double)(spacingX + (width2/2.0));
         double width2, height2;
         constrainedObject->GetBoundingBoxMax(&width2, &height2);
         startX += (double)(spacingX + (width2/2.0));


@@ -336,7 +337,7 @@ bool wxOGLConstraint::Evaluate()
         startX += (double)(width2/2.0);
         startY += (double)(height2/2.0);
 
         startX += (double)(width2/2.0);
         startY += (double)(height2/2.0);
 

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

       }
       return changed;
     }
       }
       return changed;
     }


@@ -344,10 +345,10 @@ bool wxOGLConstraint::Evaluate()
     {
       bool changed = FALSE;
 
     {
       bool changed = FALSE;
 

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

       while (node)
       {
       while (node)
       {

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

 
         double width2, height2;
         constrainedObject->GetBoundingBoxMax(&width2, &height2);
 
         double width2, height2;
         constrainedObject->GetBoundingBoxMax(&width2, &height2);


@@ -359,7 +360,7 @@ bool wxOGLConstraint::Evaluate()
           constrainedObject->Move(dc, x3, constrainedObject->GetY(), FALSE);
            }
 
           constrainedObject->Move(dc, x3, constrainedObject->GetY(), FALSE);
            }
 

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

       }
       return changed;
     }
       }
       return changed;
     }


@@ -367,10 +368,10 @@ bool wxOGLConstraint::Evaluate()
     {
       bool changed = FALSE;
 
     {
       bool changed = FALSE;
 

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

       while (node)
       {
       while (node)
       {

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

 
         double width2, height2;
         constrainedObject->GetBoundingBoxMax(&width2, &height2);
 
         double width2, height2;
         constrainedObject->GetBoundingBoxMax(&width2, &height2);


@@ -382,20 +383,18 @@ bool wxOGLConstraint::Evaluate()
           constrainedObject->Move(dc, x3, constrainedObject->GetY(), FALSE);
            }
 
           constrainedObject->Move(dc, x3, constrainedObject->GetY(), FALSE);
            }
 

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

       }
       return changed;
       }
       return changed;

-
-      return FALSE;

     }
     case gyCONSTRAINT_ABOVE:
     {
       bool changed = FALSE;
 
     }
     case gyCONSTRAINT_ABOVE:
     {
       bool changed = FALSE;
 

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

       while (node)
       {
       while (node)
       {

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

 
         double width2, height2;
         constrainedObject->GetBoundingBoxMax(&width2, &height2);
 
         double width2, height2;
         constrainedObject->GetBoundingBoxMax(&width2, &height2);


@@ -407,7 +406,7 @@ bool wxOGLConstraint::Evaluate()
           constrainedObject->Move(dc, constrainedObject->GetX(), y3, FALSE);
            }
 
           constrainedObject->Move(dc, constrainedObject->GetX(), y3, FALSE);
            }
 

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

       }
       return changed;
     }
       }
       return changed;
     }


@@ -415,10 +414,10 @@ bool wxOGLConstraint::Evaluate()
     {
       bool changed = FALSE;
 
     {
       bool changed = FALSE;
 

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

       while (node)
       {
       while (node)
       {

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

 
         double width2, height2;
         constrainedObject->GetBoundingBoxMax(&width2, &height2);
 
         double width2, height2;
         constrainedObject->GetBoundingBoxMax(&width2, &height2);


@@ -430,7 +429,7 @@ bool wxOGLConstraint::Evaluate()
           constrainedObject->Move(dc, constrainedObject->GetX(), y3, FALSE);
            }
 
           constrainedObject->Move(dc, constrainedObject->GetX(), y3, FALSE);
            }
 

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

       }
       return changed;
     }
       }
       return changed;
     }


@@ -438,10 +437,10 @@ bool wxOGLConstraint::Evaluate()
     {
       bool changed = FALSE;
 
     {
       bool changed = FALSE;
 

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

       while (node)
       {
       while (node)
       {

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

 
         double width2, height2;
         constrainedObject->GetBoundingBoxMax(&width2, &height2);
 
         double width2, height2;
         constrainedObject->GetBoundingBoxMax(&width2, &height2);


@@ -453,7 +452,7 @@ bool wxOGLConstraint::Evaluate()
           constrainedObject->Move(dc, x3, constrainedObject->GetY(), FALSE);
            }
 
           constrainedObject->Move(dc, x3, constrainedObject->GetY(), FALSE);
            }
 

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

       }
       return changed;
     }
       }
       return changed;
     }


@@ -461,10 +460,10 @@ bool wxOGLConstraint::Evaluate()
     {
       bool changed = FALSE;
 
     {
       bool changed = FALSE;
 

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

       while (node)
       {
       while (node)
       {

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

 
         double width2, height2;
         constrainedObject->GetBoundingBoxMax(&width2, &height2);
 
         double width2, height2;
         constrainedObject->GetBoundingBoxMax(&width2, &height2);


@@ -476,20 +475,22 @@ bool wxOGLConstraint::Evaluate()
           constrainedObject->Move(dc, x3, constrainedObject->GetY(), FALSE);
            }
 
           constrainedObject->Move(dc, x3, constrainedObject->GetY(), FALSE);
            }
 

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

       }
       return changed;
       }
       return changed;

-
+      #if 0
+      // two returned values ?

       return FALSE;
       return FALSE;

+      #endif

     }
     case gyCONSTRAINT_ALIGNED_TOP:
     {
       bool changed = FALSE;
 
     }
     case gyCONSTRAINT_ALIGNED_TOP:
     {
       bool changed = FALSE;
 

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

       while (node)
       {
       while (node)
       {

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

 
         double width2, height2;
         constrainedObject->GetBoundingBoxMax(&width2, &height2);
 
         double width2, height2;
         constrainedObject->GetBoundingBoxMax(&width2, &height2);


@@ -501,7 +502,7 @@ bool wxOGLConstraint::Evaluate()
           constrainedObject->Move(dc, constrainedObject->GetX(), y3, FALSE);
            }
 
           constrainedObject->Move(dc, constrainedObject->GetX(), y3, FALSE);
            }
 

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

       }
       return changed;
     }
       }
       return changed;
     }


@@ -509,10 +510,10 @@ bool wxOGLConstraint::Evaluate()
     {
       bool changed = FALSE;
 
     {
       bool changed = FALSE;
 

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

       while (node)
       {
       while (node)
       {

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

 
         double width2, height2;
         constrainedObject->GetBoundingBoxMax(&width2, &height2);
 
         double width2, height2;
         constrainedObject->GetBoundingBoxMax(&width2, &height2);


@@ -524,7 +525,7 @@ bool wxOGLConstraint::Evaluate()
           constrainedObject->Move(dc, constrainedObject->GetX(), y3, FALSE);
            }
 
           constrainedObject->Move(dc, constrainedObject->GetX(), y3, FALSE);
            }
 

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

       }
       return changed;
     }
       }
       return changed;
     }


@@ -532,10 +533,10 @@ bool wxOGLConstraint::Evaluate()
     {
       bool changed = FALSE;
 
     {
       bool changed = FALSE;
 

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

       while (node)
       {
       while (node)
       {

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

 
         double x3 = (double)(x - (minWidth/2.0));
         if (!Equals(x3, constrainedObject->GetX()))
 
         double x3 = (double)(x - (minWidth/2.0));
         if (!Equals(x3, constrainedObject->GetX()))


@@ -544,7 +545,7 @@ bool wxOGLConstraint::Evaluate()
           constrainedObject->Move(dc, x3, constrainedObject->GetY(), FALSE);
            }
 
           constrainedObject->Move(dc, x3, constrainedObject->GetY(), FALSE);
            }
 

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

       }
       return changed;
     }
       }
       return changed;
     }


@@ -552,10 +553,10 @@ bool wxOGLConstraint::Evaluate()
     {
       bool changed = FALSE;
 
     {
       bool changed = FALSE;
 

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

       while (node)
       {
       while (node)
       {

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

 
         double x3 = (double)(x + (minWidth/2.0));
         if (!Equals(x3, constrainedObject->GetX()))
 
         double x3 = (double)(x + (minWidth/2.0));
         if (!Equals(x3, constrainedObject->GetX()))


@@ -564,20 +565,22 @@ bool wxOGLConstraint::Evaluate()
           constrainedObject->Move(dc, x3, constrainedObject->GetY(), FALSE);
            }
 
           constrainedObject->Move(dc, x3, constrainedObject->GetY(), FALSE);
            }
 

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

       }
       return changed;
       }
       return changed;

-
+      #if 0
+      // two returned values ?

       return FALSE;
       return FALSE;

+      #endif

     }
     case gyCONSTRAINT_MIDALIGNED_TOP:
     {
       bool changed = FALSE;
 
     }
     case gyCONSTRAINT_MIDALIGNED_TOP:
     {
       bool changed = FALSE;
 

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

       while (node)
       {
       while (node)
       {

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

 
         double y3 = (double)(y - (minHeight/2.0));
         if (!Equals(y3, constrainedObject->GetY()))
 
         double y3 = (double)(y - (minHeight/2.0));
         if (!Equals(y3, constrainedObject->GetY()))


@@ -586,7 +589,7 @@ bool wxOGLConstraint::Evaluate()
           constrainedObject->Move(dc, constrainedObject->GetX(), y3, FALSE);
            }
 
           constrainedObject->Move(dc, constrainedObject->GetX(), y3, FALSE);
            }
 

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

       }
       return changed;
     }
       }
       return changed;
     }


@@ -594,10 +597,10 @@ bool wxOGLConstraint::Evaluate()
     {
       bool changed = FALSE;
 
     {
       bool changed = FALSE;
 

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

       while (node)
       {
       while (node)
       {

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

 
         double y3 = (double)(y + (minHeight/2.0));
         if (!Equals(y3, constrainedObject->GetY()))
 
         double y3 = (double)(y + (minHeight/2.0));
         if (!Equals(y3, constrainedObject->GetY()))


@@ -606,13 +609,15 @@ bool wxOGLConstraint::Evaluate()
           constrainedObject->Move(dc, constrainedObject->GetX(), y3, FALSE);
            }
 
           constrainedObject->Move(dc, constrainedObject->GetX(), y3, FALSE);
            }
 

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

       }
       return changed;
     }
       }
       return changed;
     }

-
+    #if 0
+    // default value handled in main function body

     default:
       return FALSE;
     default:
       return FALSE;

+    #endif

   }
   return FALSE;
 }
   }
   return FALSE;
 }