removed unneeded prototype

[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..338e4dfed252e1a8c6e268ce8d3f4f227d7642c5 100644 (file)
--- a/contrib/include/wx/ogl/constrnt.h
+++ b/contrib/include/wx/ogl/constrnt.h
@@ -12,20 +12,22 @@
 #ifndef _OGL_CONSTRNT_H_
 #define _OGL_CONSTRNT_H_
 
 #ifndef _OGL_CONSTRNT_H_
 #define _OGL_CONSTRNT_H_
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)

 #pragma interface "constrnt.h"
 #endif
 
 #pragma interface "constrnt.h"
 #endif
 

+

 /*
  * OGL Constraints
  *
  */
 
 /*
  * OGL Constraints
  *
  */
 

-class wxOGLConstraintType: public wxObject
+class WXDLLIMPEXP_OGL wxOGLConstraintType: public wxObject

 {
  DECLARE_DYNAMIC_CLASS(wxOGLConstraintType)
 public:
 {
  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:
   ~wxOGLConstraintType();
 
 public:


@@ -56,12 +58,14 @@ extern wxList* wxOGLConstraintTypes;
 #define gyCONSTRAINT_MIDALIGNED_LEFT      14
 #define gyCONSTRAINT_MIDALIGNED_RIGHT     15
 
 #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:
 {
  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();
 
   wxOGLConstraint(int type, wxShape *constraining, wxList& constrained);
   ~wxOGLConstraint();