added .chm support for Unix (Markus Sinner)

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

diff --git a/contrib/include/wx/ogl/composit.h b/contrib/include/wx/ogl/composit.h
index bbbcc835d3d001c7b99d645e27afe86a043efeab..19afcfffcb75e9cae6e15ccfa9080f537937581e 100644 (file)
--- a/contrib/include/wx/ogl/composit.h
+++ b/contrib/include/wx/ogl/composit.h
@@ -12,19 +12,20 @@
 #ifndef _OGL_COMPOSIT_H_
 #define _OGL_COMPOSIT_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "composit.h"
 #endif
 
-class wxDivisionShape;
-class wxOGLConstraint;
+
+class WXDLLIMPEXP_OGL wxDivisionShape;
+class WXDLLIMPEXP_OGL wxOGLConstraint;
 
 /*
  * A composite object is an invisible rectangle surrounding all children
  *
  */
 
-class wxCompositeShape: public wxRectangleShape
+class WXDLLIMPEXP_OGL wxCompositeShape: public wxRectangleShape
 {
  DECLARE_DYNAMIC_CLASS(wxCompositeShape)
 public:
@@ -77,7 +78,7 @@ public:
   // Calculates size and position of composite object based on children
   void CalculateSize();
 
-#ifdef PROLOGIO
+#if wxUSE_PROLOGIO
   void WriteAttributes(wxExpr *clause);
   void ReadAttributes(wxExpr *clause);
   // In case the object has constraints it needs to read in in a different pass
@@ -122,7 +123,7 @@ protected:
 #define DIVISION_SIDE_RIGHT     3
 #define DIVISION_SIDE_BOTTOM    4
 
-class wxDivisionShape: public wxCompositeShape
+class WXDLLIMPEXP_OGL wxDivisionShape: public wxCompositeShape
 {
  DECLARE_DYNAMIC_CLASS(wxDivisionShape)
  public:
@@ -152,7 +153,7 @@ class wxDivisionShape: public wxCompositeShape
   void MakeMandatoryControlPoints();
   void ResetMandatoryControlPoints();
 
-#ifdef PROLOGIO
+#if wxUSE_PROLOGIO
   void WriteAttributes(wxExpr *clause);
   void ReadAttributes(wxExpr *clause);
 #endif