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 f62585c9314230d1bc5f16c8c09c6a09ef622328..ddd736d643f9429aabf65737f5717e9d98f09f9a 100644 (file)
--- a/contrib/src/ogl/constrnt.cpp
+++ b/contrib/src/ogl/constrnt.cpp
@@ -24,13 +24,12 @@
 #include <wx/wx.h>
 #endif
 
 #include <wx/wx.h>
 #endif
 

-#if wxUSE_DEPRECATED
+#if wxUSE_PROLOGIO

 #include <wx/deprecated/wxexpr.h>
 #endif
 
 #include <wx/deprecated/wxexpr.h>
 #endif
 

-#include <wx/ogl/basic.h>
-#include <wx/ogl/constrnt.h>
-#include <wx/ogl/canvas.h>
+#include "wx/ogl/ogl.h"
+

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


@@ -387,8 +386,6 @@ bool wxOGLConstraint::Evaluate()
         node = node->GetNext();
       }
       return changed;
         node = node->GetNext();
       }
       return changed;

-
-      return FALSE;

     }
     case gyCONSTRAINT_ABOVE:
     {
     }
     case gyCONSTRAINT_ABOVE:
     {


@@ -481,8 +478,10 @@ bool wxOGLConstraint::Evaluate()
         node = node->GetNext();
       }
       return changed;
         node = node->GetNext();
       }
       return changed;

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

       return FALSE;
       return FALSE;

+      #endif

     }
     case gyCONSTRAINT_ALIGNED_TOP:
     {
     }
     case gyCONSTRAINT_ALIGNED_TOP:
     {


@@ -569,8 +568,10 @@ bool wxOGLConstraint::Evaluate()
         node = node->GetNext();
       }
       return changed;
         node = node->GetNext();
       }
       return changed;

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

       return FALSE;
       return FALSE;

+      #endif

     }
     case gyCONSTRAINT_MIDALIGNED_TOP:
     {
     }
     case gyCONSTRAINT_MIDALIGNED_TOP:
     {


@@ -612,9 +613,11 @@ bool wxOGLConstraint::Evaluate()
       }
       return changed;
     }
       }
       return changed;
     }

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

     default:
       return FALSE;
     default:
       return FALSE;

+    #endif

   }
   return FALSE;
 }
   }
   return FALSE;
 }