Merged wxPython 2.4.x to the 2.5 branch (Finally!!!)

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

diff --git a/contrib/include/wx/ogl/ogldiag.h b/contrib/include/wx/ogl/ogldiag.h
index 0444911f79b798f35895cd4e9024c96ba78806a7..7a593f2466e0c3dcaa8a8bf9edd0132a7d88409b 100644 (file)
--- a/contrib/include/wx/ogl/ogldiag.h
+++ b/contrib/include/wx/ogl/ogldiag.h
@@ -12,7 +12,7 @@
 #ifndef _OGL_OGLDIAG_H_
 #define _OGL_OGLDIAG_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "ogldiag.h"
 #endif
 
@@ -67,7 +67,7 @@ public:
   // Make sure all text that should be centred, is centred.
   void RecentreAll(wxDC& dc);
 
-#ifdef PROLOGIO
+#if wxUSE_PROLOGIO
   virtual bool SaveFile(const wxString& filename);
   virtual bool LoadFile(const wxString& filename);