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

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

diff --git a/contrib/src/ogl/constrnt.cpp b/contrib/src/ogl/constrnt.cpp
index 98e9e6ffde46e5e3105f955c8e4eb67bf6c5c28e..ddd736d643f9429aabf65737f5717e9d98f09f9a 100644 (file)
--- a/contrib/src/ogl/constrnt.cpp
+++ b/contrib/src/ogl/constrnt.cpp
@@ -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;
 
@@ -385,8 +386,6 @@ bool wxOGLConstraint::Evaluate()
         node = node->GetNext();
       }
       return changed;
-
-      return FALSE;
     }
     case gyCONSTRAINT_ABOVE:
     {
@@ -479,8 +478,10 @@ bool wxOGLConstraint::Evaluate()
         node = node->GetNext();
       }
       return changed;
-
+      #if 0
+      // two returned values ?
       return FALSE;
+      #endif
     }
     case gyCONSTRAINT_ALIGNED_TOP:
     {
@@ -567,8 +568,10 @@ bool wxOGLConstraint::Evaluate()
         node = node->GetNext();
       }
       return changed;
-
+      #if 0
+      // two returned values ?
       return FALSE;
+      #endif
     }
     case gyCONSTRAINT_MIDALIGNED_TOP:
     {
@@ -610,9 +613,11 @@ bool wxOGLConstraint::Evaluate()
       }
       return changed;
     }
-
+    #if 0
+    // default value handled in main function body
     default:
       return FALSE;
+    #endif
   }
   return FALSE;
 }