Updates to MIME-types and wxFileDialog code for better

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

diff --git a/contrib/include/wx/ogl/divided.h b/contrib/include/wx/ogl/divided.h
index f8404637dfabfc191a5915763ed5cf3466f7cf29..dea08ce1c30cca95c6c5078ad3dadd09ba557b7c 100644 (file)
--- a/contrib/include/wx/ogl/divided.h
+++ b/contrib/include/wx/ogl/divided.h
@@ -12,10 +12,11 @@
 #ifndef _OGL_DIVIDED_H_
 #define _OGL_DIVIDED_H_
 
-#ifdef __GNUG__
-#pragma interface "basic.h"
+#if defined(__GNUG__) && !defined(__APPLE__)
+#pragma interface "divided.h"
 #endif
 
+
 /*
  * Definition of a region
  *
@@ -27,7 +28,7 @@
  */
 
 extern wxFont *g_oglNormalFont;
-class wxDividedShape: public wxRectangleShape
+class WXDLLIMPEXP_OGL wxDividedShape: public wxRectangleShape
 {
  DECLARE_DYNAMIC_CLASS(wxDividedShape)
 
@@ -46,7 +47,7 @@ class wxDividedShape: public wxRectangleShape
   void MakeMandatoryControlPoints();
   void ResetMandatoryControlPoints();
 
-#ifdef PROLOGIO
+#if wxUSE_PROLOGIO
   void WriteAttributes(wxExpr *clause);
   void ReadAttributes(wxExpr *clause);
 #endif
@@ -63,7 +64,7 @@ class wxDividedShape: public wxRectangleShape
   // Attachment points correspond to regions in the divided box
   bool GetAttachmentPosition(int attachment, double *x, double *y,
                                      int nth = 0, int no_arcs = 1, wxLineShape *line = NULL);
-  bool AttachmentIsValid(int attachment);
+  bool AttachmentIsValid(int attachment) const;
   int GetNumberOfAttachments() const;
 
   // Invoke editor on CTRL-right click