Generic file dialog presentation. Regenerated makefiles.

[wxWidgets.git] / contrib / include / wx / ogl / constrnt.h

diff --git a/contrib/include/wx/ogl/constrnt.h b/contrib/include/wx/ogl/constrnt.h
index 812aca19a9e83f567688cc0ecc06e5bd71c6319d..eaa777d067a66c423c0a8a8ef2f638bed069a056 100644 (file)
--- a/contrib/include/wx/ogl/constrnt.h
+++ b/contrib/include/wx/ogl/constrnt.h
@@ -6,26 +6,28 @@
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _OGL_CONSTRNT_H_
 #define _OGL_CONSTRNT_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "constrnt.h"
 #endif
 
+
 /*
  * OGL Constraints
  *
  */
 
-class wxOGLConstraintType: public wxObject
+class WXDLLIMPEXP_OGL wxOGLConstraintType: public wxObject
 {
  DECLARE_DYNAMIC_CLASS(wxOGLConstraintType)
 public:
-  wxOGLConstraintType(int type = 0, const wxString& name = "", const wxString& phrase = "");
+  wxOGLConstraintType(int type = 0, const wxString& name = wxEmptyString,
+                      const wxString& phrase = wxEmptyString);
   ~wxOGLConstraintType();
 
 public:
@@ -56,16 +58,18 @@ extern wxList* wxOGLConstraintTypes;
 #define gyCONSTRAINT_MIDALIGNED_LEFT      14
 #define gyCONSTRAINT_MIDALIGNED_RIGHT     15
 
-class wxOGLConstraint: public wxObject
+class WXDLLIMPEXP_OGL wxOGLConstraint: public wxObject
 {
  DECLARE_DYNAMIC_CLASS(wxOGLConstraint)
  public:
-  wxOGLConstraint() { m_xSpacing = 0.0; m_ySpacing = 0.0; m_constraintType = 0; m_constraintName = ""; m_constraintId = 0;
-                        m_constrainingObject = NULL; }
+  wxOGLConstraint() {
+     m_xSpacing = 0.0; m_ySpacing = 0.0; m_constraintType = 0;
+     m_constraintName = wxEmptyString; m_constraintId = 0;
+     m_constrainingObject = NULL; }
   wxOGLConstraint(int type, wxShape *constraining, wxList& constrained);
   ~wxOGLConstraint();
 
-  // Returns TRUE if anything changed
+  // Returns true if anything changed
   bool Evaluate();
   inline void SetSpacing(double x, double y) { m_xSpacing = x; m_ySpacing = y; };
   bool Equals(double a, double b);