accidentally removed IMPLEMENT_DYNAMIC_CLASS added back

[wxWidgets.git] / utils / ogl / src / constrnt.h

diff --git a/utils/ogl/src/constrnt.h b/utils/ogl/src/constrnt.h
index 7fb402090987925a8976b280dd78aa20507984a6..812aca19a9e83f567688cc0ecc06e5bd71c6319d 100644 (file)
--- a/utils/ogl/src/constrnt.h
+++ b/utils/ogl/src/constrnt.h
@@ -21,12 +21,12 @@
  *
  */
 
-class OGLConstraintType: public wxObject
+class wxOGLConstraintType: public wxObject
 {
- DECLARE_DYNAMIC_CLASS(OGLConstraintType)
+ DECLARE_DYNAMIC_CLASS(wxOGLConstraintType)
 public:
-  OGLConstraintType(int type = 0, const wxString& name = "", const wxString& phrase = "");
-  ~OGLConstraintType();
+  wxOGLConstraintType(int type = 0, const wxString& name = "", const wxString& phrase = "");
+  ~wxOGLConstraintType();
 
 public:
   int           m_type;     // E.g. gyCONSTRAINT_CENTRED_VERTICALLY
@@ -35,7 +35,7 @@ public:
 
 };
 
-extern wxList* OGLConstraintTypes;
+extern wxList* wxOGLConstraintTypes;
 
 #define gyCONSTRAINT_CENTRED_VERTICALLY   1
 #define gyCONSTRAINT_CENTRED_HORIZONTALLY 2
@@ -56,22 +56,22 @@ extern wxList* OGLConstraintTypes;
 #define gyCONSTRAINT_MIDALIGNED_LEFT      14
 #define gyCONSTRAINT_MIDALIGNED_RIGHT     15
 
-class OGLConstraint: public wxObject
+class wxOGLConstraint: public wxObject
 {
- DECLARE_DYNAMIC_CLASS(OGLConstraint)
+ DECLARE_DYNAMIC_CLASS(wxOGLConstraint)
  public:
-  OGLConstraint() { m_xSpacing = 0.0; m_ySpacing = 0.0; m_constraintType = 0; m_constraintName = ""; m_constraintId = 0;
+  wxOGLConstraint() { m_xSpacing = 0.0; m_ySpacing = 0.0; m_constraintType = 0; m_constraintName = ""; m_constraintId = 0;
                         m_constrainingObject = NULL; }
-  OGLConstraint(int type, wxShape *constraining, wxList& constrained);
-  ~OGLConstraint();
+  wxOGLConstraint(int type, wxShape *constraining, wxList& constrained);
+  ~wxOGLConstraint();
 
   // Returns TRUE if anything changed
   bool Evaluate();
-  inline void SetSpacing(float x, float y) { m_xSpacing = x; m_ySpacing = y; };
-  bool Equals(float a, float b);
+  inline void SetSpacing(double x, double y) { m_xSpacing = x; m_ySpacing = y; };
+  bool Equals(double a, double b);
 
-  float         m_xSpacing;
-  float         m_ySpacing;
+  double         m_xSpacing;
+  double         m_ySpacing;
   int           m_constraintType;
   wxString      m_constraintName;
   long          m_constraintId;