non-PCH build fix (according to Tinderbox).

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

diff --git a/contrib/src/ogl/constrnt.cpp b/contrib/src/ogl/constrnt.cpp
index 98e9e6ffde46e5e3105f955c8e4eb67bf6c5c28e..0e1a104447e2ad3d798707f04ef96f79c6decb0e 100644 (file)
--- a/contrib/src/ogl/constrnt.cpp
+++ b/contrib/src/ogl/constrnt.cpp
@@ -6,13 +6,9 @@
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart

-// Licence:    wxWindows licence
+// Licence:     wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "constrnt.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -21,14 +17,15 @@
 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

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

 #endif
 
 #endif
 

-#include <wx/deprecated/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;
 


@@ -159,7 +156,7 @@ bool wxOGLConstraint::Equals(double a, double b)
   return eq;
 }
 
   return eq;
 }
 

-// Return TRUE if anything changed
+// Return true if anything changed

 bool wxOGLConstraint::Evaluate()
 {
   double maxWidth, maxHeight, minWidth, minHeight, x, y;
 bool wxOGLConstraint::Evaluate()
 {
   double maxWidth, maxHeight, minWidth, minHeight, x, y;


@@ -203,7 +200,7 @@ bool wxOGLConstraint::Evaluate()
       }
 
       // Now position the objects
       }
 
       // Now position the objects

-      bool changed = FALSE;
+      bool changed = false;

       node = m_constrainedObjects.GetFirst();
       while (node)
       {
       node = m_constrainedObjects.GetFirst();
       while (node)
       {


@@ -213,8 +210,8 @@ bool wxOGLConstraint::Evaluate()
         startY += (double)(spacingY + (height2/2.0));
         if (!Equals(startY, constrainedObject->GetY()))
         {
         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();
         }
         startY += (double)(height2/2.0);
         node = node->GetNext();


@@ -251,7 +248,7 @@ bool wxOGLConstraint::Evaluate()
       }
 
       // Now position the objects
       }
 
       // Now position the objects

-      bool changed = FALSE;
+      bool changed = false;

       node = m_constrainedObjects.GetFirst();
       while (node)
       {
       node = m_constrainedObjects.GetFirst();
       while (node)
       {


@@ -261,8 +258,8 @@ bool wxOGLConstraint::Evaluate()
         startX += (double)(spacingX + (width2/2.0));
         if (!Equals(startX, constrainedObject->GetX()))
         {
         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();
         }
         startX += (double)(width2/2.0);
         node = node->GetNext();


@@ -317,7 +314,7 @@ bool wxOGLConstraint::Evaluate()
       }
 
       // Now position the objects
       }
 
       // Now position the objects

-      bool changed = FALSE;
+      bool changed = false;

       node = m_constrainedObjects.GetFirst();
       while (node)
       {
       node = m_constrainedObjects.GetFirst();
       while (node)
       {


@@ -328,10 +325,10 @@ bool wxOGLConstraint::Evaluate()
         startY += (double)(spacingY + (height2/2.0));
 
         if ((!Equals(startX, constrainedObject->GetX())) || (!Equals(startY, constrainedObject->GetY())))
         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);
 
         startX += (double)(width2/2.0);
         startY += (double)(height2/2.0);


@@ -342,7 +339,7 @@ bool wxOGLConstraint::Evaluate()
     }
     case gyCONSTRAINT_LEFT_OF:
     {
     }
     case gyCONSTRAINT_LEFT_OF:
     {

-      bool changed = FALSE;
+      bool changed = false;

 
       wxNode *node = m_constrainedObjects.GetFirst();
       while (node)
 
       wxNode *node = m_constrainedObjects.GetFirst();
       while (node)


@@ -354,10 +351,10 @@ bool wxOGLConstraint::Evaluate()
 
         double x3 = (double)(x - (minWidth/2.0) - (width2/2.0) - m_xSpacing);
         if (!Equals(x3, constrainedObject->GetX()))
 
         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();
       }
 
         node = node->GetNext();
       }


@@ -365,7 +362,7 @@ bool wxOGLConstraint::Evaluate()
     }
     case gyCONSTRAINT_RIGHT_OF:
     {
     }
     case gyCONSTRAINT_RIGHT_OF:
     {

-      bool changed = FALSE;
+      bool changed = false;

 
       wxNode *node = m_constrainedObjects.GetFirst();
       while (node)
 
       wxNode *node = m_constrainedObjects.GetFirst();
       while (node)


@@ -377,20 +374,18 @@ bool wxOGLConstraint::Evaluate()
 
         double x3 = (double)(x + (minWidth/2.0) + (width2/2.0) + m_xSpacing);
         if (!Equals(x3, constrainedObject->GetX()))
 
         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;
 
         node = node->GetNext();
       }
       return changed;

-
-      return FALSE;

     }
     case gyCONSTRAINT_ABOVE:
     {
     }
     case gyCONSTRAINT_ABOVE:
     {

-      bool changed = FALSE;
+      bool changed = false;

 
       wxNode *node = m_constrainedObjects.GetFirst();
       while (node)
 
       wxNode *node = m_constrainedObjects.GetFirst();
       while (node)


@@ -402,10 +397,10 @@ bool wxOGLConstraint::Evaluate()
 
         double y3 = (double)(y - (minHeight/2.0) - (height2/2.0) - m_ySpacing);
         if (!Equals(y3, constrainedObject->GetY()))
 
         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();
       }
 
         node = node->GetNext();
       }


@@ -413,7 +408,7 @@ bool wxOGLConstraint::Evaluate()
     }
     case gyCONSTRAINT_BELOW:
     {
     }
     case gyCONSTRAINT_BELOW:
     {

-      bool changed = FALSE;
+      bool changed = false;

 
       wxNode *node = m_constrainedObjects.GetFirst();
       while (node)
 
       wxNode *node = m_constrainedObjects.GetFirst();
       while (node)


@@ -425,10 +420,10 @@ bool wxOGLConstraint::Evaluate()
 
         double y3 = (double)(y + (minHeight/2.0) + (height2/2.0) + m_ySpacing);
         if (!Equals(y3, constrainedObject->GetY()))
 
         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();
       }
 
         node = node->GetNext();
       }


@@ -436,7 +431,7 @@ bool wxOGLConstraint::Evaluate()
     }
     case gyCONSTRAINT_ALIGNED_LEFT:
     {
     }
     case gyCONSTRAINT_ALIGNED_LEFT:
     {

-      bool changed = FALSE;
+      bool changed = false;

 
       wxNode *node = m_constrainedObjects.GetFirst();
       while (node)
 
       wxNode *node = m_constrainedObjects.GetFirst();
       while (node)


@@ -448,10 +443,10 @@ bool wxOGLConstraint::Evaluate()
 
         double x3 = (double)(x - (minWidth/2.0) + (width2/2.0) + m_xSpacing);
         if (!Equals(x3, constrainedObject->GetX()))
 
         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();
       }
 
         node = node->GetNext();
       }


@@ -459,7 +454,7 @@ bool wxOGLConstraint::Evaluate()
     }
     case gyCONSTRAINT_ALIGNED_RIGHT:
     {
     }
     case gyCONSTRAINT_ALIGNED_RIGHT:
     {

-      bool changed = FALSE;
+      bool changed = false;

 
       wxNode *node = m_constrainedObjects.GetFirst();
       while (node)
 
       wxNode *node = m_constrainedObjects.GetFirst();
       while (node)


@@ -471,20 +466,22 @@ bool wxOGLConstraint::Evaluate()
 
         double x3 = (double)(x + (minWidth/2.0) - (width2/2.0) - m_xSpacing);
         if (!Equals(x3, constrainedObject->GetX()))
 
         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;
 
         node = node->GetNext();
       }
       return changed;

-
-      return FALSE;
+      #if 0
+      // two returned values ?
+      return false;
+      #endif

     }
     case gyCONSTRAINT_ALIGNED_TOP:
     {
     }
     case gyCONSTRAINT_ALIGNED_TOP:
     {

-      bool changed = FALSE;
+      bool changed = false;

 
       wxNode *node = m_constrainedObjects.GetFirst();
       while (node)
 
       wxNode *node = m_constrainedObjects.GetFirst();
       while (node)


@@ -496,10 +493,10 @@ bool wxOGLConstraint::Evaluate()
 
         double y3 = (double)(y - (minHeight/2.0) + (height2/2.0) + m_ySpacing);
         if (!Equals(y3, constrainedObject->GetY()))
 
         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();
       }
 
         node = node->GetNext();
       }


@@ -507,7 +504,7 @@ bool wxOGLConstraint::Evaluate()
     }
     case gyCONSTRAINT_ALIGNED_BOTTOM:
     {
     }
     case gyCONSTRAINT_ALIGNED_BOTTOM:
     {

-      bool changed = FALSE;
+      bool changed = false;

 
       wxNode *node = m_constrainedObjects.GetFirst();
       while (node)
 
       wxNode *node = m_constrainedObjects.GetFirst();
       while (node)


@@ -519,10 +516,10 @@ bool wxOGLConstraint::Evaluate()
 
         double y3 = (double)(y + (minHeight/2.0) - (height2/2.0) - m_ySpacing);
         if (!Equals(y3, constrainedObject->GetY()))
 
         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();
       }
 
         node = node->GetNext();
       }


@@ -530,7 +527,7 @@ bool wxOGLConstraint::Evaluate()
     }
     case gyCONSTRAINT_MIDALIGNED_LEFT:
     {
     }
     case gyCONSTRAINT_MIDALIGNED_LEFT:
     {

-      bool changed = FALSE;
+      bool changed = false;

 
       wxNode *node = m_constrainedObjects.GetFirst();
       while (node)
 
       wxNode *node = m_constrainedObjects.GetFirst();
       while (node)


@@ -539,10 +536,10 @@ bool wxOGLConstraint::Evaluate()
 
         double x3 = (double)(x - (minWidth/2.0));
         if (!Equals(x3, constrainedObject->GetX()))
 
         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();
       }
 
         node = node->GetNext();
       }


@@ -550,7 +547,7 @@ bool wxOGLConstraint::Evaluate()
     }
     case gyCONSTRAINT_MIDALIGNED_RIGHT:
     {
     }
     case gyCONSTRAINT_MIDALIGNED_RIGHT:
     {

-      bool changed = FALSE;
+      bool changed = false;

 
       wxNode *node = m_constrainedObjects.GetFirst();
       while (node)
 
       wxNode *node = m_constrainedObjects.GetFirst();
       while (node)


@@ -559,20 +556,22 @@ bool wxOGLConstraint::Evaluate()
 
         double x3 = (double)(x + (minWidth/2.0));
         if (!Equals(x3, constrainedObject->GetX()))
 
         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;
 
         node = node->GetNext();
       }
       return changed;

-
-      return FALSE;
+      #if 0
+      // two returned values ?
+      return false;
+      #endif

     }
     case gyCONSTRAINT_MIDALIGNED_TOP:
     {
     }
     case gyCONSTRAINT_MIDALIGNED_TOP:
     {

-      bool changed = FALSE;
+      bool changed = false;

 
       wxNode *node = m_constrainedObjects.GetFirst();
       while (node)
 
       wxNode *node = m_constrainedObjects.GetFirst();
       while (node)


@@ -581,10 +580,10 @@ bool wxOGLConstraint::Evaluate()
 
         double y3 = (double)(y - (minHeight/2.0));
         if (!Equals(y3, constrainedObject->GetY()))
 
         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();
       }
 
         node = node->GetNext();
       }


@@ -592,7 +591,7 @@ bool wxOGLConstraint::Evaluate()
     }
     case gyCONSTRAINT_MIDALIGNED_BOTTOM:
     {
     }
     case gyCONSTRAINT_MIDALIGNED_BOTTOM:
     {

-      bool changed = FALSE;
+      bool changed = false;

 
       wxNode *node = m_constrainedObjects.GetFirst();
       while (node)
 
       wxNode *node = m_constrainedObjects.GetFirst();
       while (node)


@@ -601,19 +600,21 @@ bool wxOGLConstraint::Evaluate()
 
         double y3 = (double)(y + (minHeight/2.0));
         if (!Equals(y3, constrainedObject->GetY()))
 
         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;
     }
 
         node = node->GetNext();
       }
       return changed;
     }

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

     default:
     default:

-      return FALSE;
+      return false;
+    #endif

   }
   }

-  return FALSE;
+  return false;

 }
 
 }