[ 1176516 ] argv datatype has changed (char in docs but really wxChar)

[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..b6e3dc00a689e7acf8731dd21a5aa358b1e544f5 100644 (file)
--- a/contrib/include/wx/ogl/bmpshape.h
+++ b/contrib/include/wx/ogl/bmpshape.h
@@ -6,19 +6,18 @@
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
-// Licence:    wxWindows licence
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 #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);
@@ -36,7 +35,7 @@ class wxBitmapShape: public wxRectangleShape
   // Does the copying for this object
   void Copy(wxShape& copy);
 
-  void SetSize(double w, double h, bool recursive = TRUE);
+  void SetSize(double w, double h, bool recursive = true);
   inline wxBitmap& GetBitmap() const { return (wxBitmap&) m_bitmap; }
   void SetBitmap(const wxBitmap& bm);
   inline void SetFilename(const wxString& f) { m_filename = f; };