Applied patch [ 868061 ] Warning free OGL

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

diff --git a/contrib/include/wx/ogl/bmpshape.h b/contrib/include/wx/ogl/bmpshape.h
index 8dd7caeb2fb0220beab36f5cb193c8eefe68e551..86251e55458abe32641b14d59577dc8aa3ce9fb4 100644 (file)
--- a/contrib/include/wx/ogl/bmpshape.h
+++ b/contrib/include/wx/ogl/bmpshape.h
@@ -12,13 +12,12 @@
 #ifndef _OGL_BITMAP_H_
 #define _OGL_BITMAP_H_
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(__APPLE__)
 #pragma interface "bmpshape.h"
 #endif
 
-#include <wx/ogl/basic.h>
 
-class wxBitmapShape: public wxRectangleShape
+class WXDLLIMPEXP_OGL wxBitmapShape: public wxRectangleShape
 {
  DECLARE_DYNAMIC_CLASS(wxBitmapShape)
  public:
@@ -27,7 +26,7 @@ class wxBitmapShape: public wxRectangleShape
 
   void OnDraw(wxDC& dc);
 
-#ifdef PROLOGIO
+#if wxUSE_PROLOGIO
   // I/O
   void WriteAttributes(wxExpr *clause);
   void ReadAttributes(wxExpr *clause);