Removed ambiguity between deprecated and new constructor.

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

diff --git a/contrib/src/ogl/constrnt.cpp b/contrib/src/ogl/constrnt.cpp
index 98e9e6ffde46e5e3105f955c8e4eb67bf6c5c28e..6d5268bec487476900d9d0071c4d2e891e80d5c1 100644 (file)
--- a/contrib/src/ogl/constrnt.cpp
+++ b/contrib/src/ogl/constrnt.cpp
@@ -6,7 +6,7 @@
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
@@ -24,11 +24,12 @@
 #include <wx/wx.h>
 #endif
 
+#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;
 
@@ -159,7 +160,7 @@ bool wxOGLConstraint::Equals(double a, double b)
   return eq;
 }
 
-// Return TRUE if anything changed
+// Return true if anything changed
 bool wxOGLConstraint::Evaluate()
 {
   double maxWidth, maxHeight, minWidth, minHeight, x, y;
@@ -203,7 +204,7 @@ bool wxOGLConstraint::Evaluate()
       }
 
       // Now position the objects
-      bool changed = FALSE;
+      bool changed = false;
       node = m_constrainedObjects.GetFirst();
       while (node)
       {
@@ -213,8 +214,8 @@ bool wxOGLConstraint::Evaluate()
         startY += (double)(spacingY + (height2/2.0));
         if (!Equals(startY, constrainedObject->GetY()))
         {
-          constrainedObject->Move(dc, constrainedObject->GetX(), startY, FALSE);
-          changed = TRUE;
+          constrainedObject->Move(dc, constrainedObject->GetX(), startY, false);
+          changed = true;
         }
         startY += (double)(height2/2.0);
         node = node->GetNext();
@@ -251,7 +252,7 @@ bool wxOGLConstraint::Evaluate()
       }
 
       // Now position the objects
-      bool changed = FALSE;
+      bool changed = false;
       node = m_constrainedObjects.GetFirst();
       while (node)
       {
@@ -261,8 +262,8 @@ bool wxOGLConstraint::Evaluate()
         startX += (double)(spacingX + (width2/2.0));
         if (!Equals(startX, constrainedObject->GetX()))
         {
-          constrainedObject->Move(dc, startX, constrainedObject->GetY(), FALSE);
-          changed = TRUE;
+          constrainedObject->Move(dc, startX, constrainedObject->GetY(), false);
+          changed = true;
         }
         startX += (double)(width2/2.0);
         node = node->GetNext();
@@ -317,7 +318,7 @@ bool wxOGLConstraint::Evaluate()
       }
 
       // Now position the objects
-      bool changed = FALSE;
+      bool changed = false;
       node = m_constrainedObjects.GetFirst();
       while (node)
       {
@@ -328,10 +329,10 @@ bool wxOGLConstraint::Evaluate()
         startY += (double)(spacingY + (height2/2.0));
 
         if ((!Equals(startX, constrainedObject->GetX())) || (!Equals(startY, constrainedObject->GetY())))
-           {
-          constrainedObject->Move(dc, startX, startY, FALSE);
-          changed = TRUE;
-           }
+        {
+          constrainedObject->Move(dc, startX, startY, false);
+          changed = true;
+        }
 
         startX += (double)(width2/2.0);
         startY += (double)(height2/2.0);
@@ -342,7 +343,7 @@ bool wxOGLConstraint::Evaluate()
     }
     case gyCONSTRAINT_LEFT_OF:
     {
-      bool changed = FALSE;
+      bool changed = false;
 
       wxNode *node = m_constrainedObjects.GetFirst();
       while (node)
@@ -354,10 +355,10 @@ bool wxOGLConstraint::Evaluate()
 
         double x3 = (double)(x - (minWidth/2.0) - (width2/2.0) - m_xSpacing);
         if (!Equals(x3, constrainedObject->GetX()))
-           {
-          changed = TRUE;
-          constrainedObject->Move(dc, x3, constrainedObject->GetY(), FALSE);
-           }
+        {
+          changed = true;
+          constrainedObject->Move(dc, x3, constrainedObject->GetY(), false);
+        }
 
         node = node->GetNext();
       }
@@ -365,7 +366,7 @@ bool wxOGLConstraint::Evaluate()
     }
     case gyCONSTRAINT_RIGHT_OF:
     {
-      bool changed = FALSE;
+      bool changed = false;
 
       wxNode *node = m_constrainedObjects.GetFirst();
       while (node)
@@ -377,20 +378,18 @@ bool wxOGLConstraint::Evaluate()
 
         double x3 = (double)(x + (minWidth/2.0) + (width2/2.0) + m_xSpacing);
         if (!Equals(x3, constrainedObject->GetX()))
-           {
-          changed = TRUE;
-          constrainedObject->Move(dc, x3, constrainedObject->GetY(), FALSE);
-           }
+        {
+          changed = true;
+          constrainedObject->Move(dc, x3, constrainedObject->GetY(), false);
+        }
 
         node = node->GetNext();
       }
       return changed;
-
-      return FALSE;
     }
     case gyCONSTRAINT_ABOVE:
     {
-      bool changed = FALSE;
+      bool changed = false;
 
       wxNode *node = m_constrainedObjects.GetFirst();
       while (node)
@@ -402,10 +401,10 @@ bool wxOGLConstraint::Evaluate()
 
         double y3 = (double)(y - (minHeight/2.0) - (height2/2.0) - m_ySpacing);
         if (!Equals(y3, constrainedObject->GetY()))
-           {
-          changed = TRUE;
-          constrainedObject->Move(dc, constrainedObject->GetX(), y3, FALSE);
-           }
+        {
+          changed = true;
+          constrainedObject->Move(dc, constrainedObject->GetX(), y3, false);
+        }
 
         node = node->GetNext();
       }
@@ -413,7 +412,7 @@ bool wxOGLConstraint::Evaluate()
     }
     case gyCONSTRAINT_BELOW:
     {
-      bool changed = FALSE;
+      bool changed = false;
 
       wxNode *node = m_constrainedObjects.GetFirst();
       while (node)
@@ -425,10 +424,10 @@ bool wxOGLConstraint::Evaluate()
 
         double y3 = (double)(y + (minHeight/2.0) + (height2/2.0) + m_ySpacing);
         if (!Equals(y3, constrainedObject->GetY()))
-           {
-          changed = TRUE;
-          constrainedObject->Move(dc, constrainedObject->GetX(), y3, FALSE);
-           }
+        {
+          changed = true;
+          constrainedObject->Move(dc, constrainedObject->GetX(), y3, false);
+        }
 
         node = node->GetNext();
       }
@@ -436,7 +435,7 @@ bool wxOGLConstraint::Evaluate()
     }
     case gyCONSTRAINT_ALIGNED_LEFT:
     {
-      bool changed = FALSE;
+      bool changed = false;
 
       wxNode *node = m_constrainedObjects.GetFirst();
       while (node)
@@ -448,10 +447,10 @@ bool wxOGLConstraint::Evaluate()
 
         double x3 = (double)(x - (minWidth/2.0) + (width2/2.0) + m_xSpacing);
         if (!Equals(x3, constrainedObject->GetX()))
-           {
-          changed = TRUE;
-          constrainedObject->Move(dc, x3, constrainedObject->GetY(), FALSE);
-           }
+        {
+          changed = true;
+          constrainedObject->Move(dc, x3, constrainedObject->GetY(), false);
+        }
 
         node = node->GetNext();
       }
@@ -459,7 +458,7 @@ bool wxOGLConstraint::Evaluate()
     }
     case gyCONSTRAINT_ALIGNED_RIGHT:
     {
-      bool changed = FALSE;
+      bool changed = false;
 
       wxNode *node = m_constrainedObjects.GetFirst();
       while (node)
@@ -471,20 +470,22 @@ bool wxOGLConstraint::Evaluate()
 
         double x3 = (double)(x + (minWidth/2.0) - (width2/2.0) - m_xSpacing);
         if (!Equals(x3, constrainedObject->GetX()))
-           {
-          changed = TRUE;
-          constrainedObject->Move(dc, x3, constrainedObject->GetY(), FALSE);
-           }
+        {
+          changed = true;
+          constrainedObject->Move(dc, x3, constrainedObject->GetY(), false);
+        }
 
         node = node->GetNext();
       }
       return changed;
-
-      return FALSE;
+      #if 0
+      // two returned values ?
+      return false;
+      #endif
     }
     case gyCONSTRAINT_ALIGNED_TOP:
     {
-      bool changed = FALSE;
+      bool changed = false;
 
       wxNode *node = m_constrainedObjects.GetFirst();
       while (node)
@@ -496,10 +497,10 @@ bool wxOGLConstraint::Evaluate()
 
         double y3 = (double)(y - (minHeight/2.0) + (height2/2.0) + m_ySpacing);
         if (!Equals(y3, constrainedObject->GetY()))
-           {
-          changed = TRUE;
-          constrainedObject->Move(dc, constrainedObject->GetX(), y3, FALSE);
-           }
+        {
+          changed = true;
+          constrainedObject->Move(dc, constrainedObject->GetX(), y3, false);
+        }
 
         node = node->GetNext();
       }
@@ -507,7 +508,7 @@ bool wxOGLConstraint::Evaluate()
     }
     case gyCONSTRAINT_ALIGNED_BOTTOM:
     {
-      bool changed = FALSE;
+      bool changed = false;
 
       wxNode *node = m_constrainedObjects.GetFirst();
       while (node)
@@ -519,10 +520,10 @@ bool wxOGLConstraint::Evaluate()
 
         double y3 = (double)(y + (minHeight/2.0) - (height2/2.0) - m_ySpacing);
         if (!Equals(y3, constrainedObject->GetY()))
-           {
-          changed = TRUE;
-          constrainedObject->Move(dc, constrainedObject->GetX(), y3, FALSE);
-           }
+        {
+          changed = true;
+          constrainedObject->Move(dc, constrainedObject->GetX(), y3, false);
+        }
 
         node = node->GetNext();
       }
@@ -530,7 +531,7 @@ bool wxOGLConstraint::Evaluate()
     }
     case gyCONSTRAINT_MIDALIGNED_LEFT:
     {
-      bool changed = FALSE;
+      bool changed = false;
 
       wxNode *node = m_constrainedObjects.GetFirst();
       while (node)
@@ -539,10 +540,10 @@ bool wxOGLConstraint::Evaluate()
 
         double x3 = (double)(x - (minWidth/2.0));
         if (!Equals(x3, constrainedObject->GetX()))
-           {
-          changed = TRUE;
-          constrainedObject->Move(dc, x3, constrainedObject->GetY(), FALSE);
-           }
+        {
+          changed = true;
+          constrainedObject->Move(dc, x3, constrainedObject->GetY(), false);
+        }
 
         node = node->GetNext();
       }
@@ -550,7 +551,7 @@ bool wxOGLConstraint::Evaluate()
     }
     case gyCONSTRAINT_MIDALIGNED_RIGHT:
     {
-      bool changed = FALSE;
+      bool changed = false;
 
       wxNode *node = m_constrainedObjects.GetFirst();
       while (node)
@@ -559,20 +560,22 @@ bool wxOGLConstraint::Evaluate()
 
         double x3 = (double)(x + (minWidth/2.0));
         if (!Equals(x3, constrainedObject->GetX()))
-           {
-          changed = TRUE;
-          constrainedObject->Move(dc, x3, constrainedObject->GetY(), FALSE);
-           }
+        {
+          changed = true;
+          constrainedObject->Move(dc, x3, constrainedObject->GetY(), false);
+        }
 
         node = node->GetNext();
       }
       return changed;
-
-      return FALSE;
+      #if 0
+      // two returned values ?
+      return false;
+      #endif
     }
     case gyCONSTRAINT_MIDALIGNED_TOP:
     {
-      bool changed = FALSE;
+      bool changed = false;
 
       wxNode *node = m_constrainedObjects.GetFirst();
       while (node)
@@ -581,10 +584,10 @@ bool wxOGLConstraint::Evaluate()
 
         double y3 = (double)(y - (minHeight/2.0));
         if (!Equals(y3, constrainedObject->GetY()))
-           {
-          changed = TRUE;
-          constrainedObject->Move(dc, constrainedObject->GetX(), y3, FALSE);
-           }
+        {
+          changed = true;
+          constrainedObject->Move(dc, constrainedObject->GetX(), y3, false);
+        }
 
         node = node->GetNext();
       }
@@ -592,7 +595,7 @@ bool wxOGLConstraint::Evaluate()
     }
     case gyCONSTRAINT_MIDALIGNED_BOTTOM:
     {
-      bool changed = FALSE;
+      bool changed = false;
 
       wxNode *node = m_constrainedObjects.GetFirst();
       while (node)
@@ -601,19 +604,21 @@ bool wxOGLConstraint::Evaluate()
 
         double y3 = (double)(y + (minHeight/2.0));
         if (!Equals(y3, constrainedObject->GetY()))
-           {
-          changed = TRUE;
-          constrainedObject->Move(dc, constrainedObject->GetX(), y3, FALSE);
-           }
+        {
+          changed = true;
+          constrainedObject->Move(dc, constrainedObject->GetX(), y3, false);
+        }
 
         node = node->GetNext();
       }
       return changed;
     }
-
+    #if 0
+    // default value handled in main function body
     default:
-      return FALSE;
+      return false;
+    #endif
   }
-  return FALSE;
+  return false;
 }