[#1472076] Fixes after stock gdi changes within core library.

[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 1b564775506af6c46c95675153577cc477b693eb..f16992e2cd159170ebbddf62e93c402e03a0a33c 100644 (file)
--- a/contrib/include/wx/ogl/bmpshape.h
+++ b/contrib/include/wx/ogl/bmpshape.h
@@ -6,19 +6,14 @@
 // Created:     12/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Julian Smart
 // 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_
 
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _OGL_BITMAP_H_
 #define _OGL_BITMAP_H_
 

-#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:
 {
  DECLARE_DYNAMIC_CLASS(wxBitmapShape)
  public:


@@ -27,7 +22,7 @@ class wxBitmapShape: public wxRectangleShape
 
   void OnDraw(wxDC& dc);
 
 
   void OnDraw(wxDC& dc);
 

-#ifdef PROLOGIO
+#if wxUSE_PROLOGIO

   // I/O
   void WriteAttributes(wxExpr *clause);
   void ReadAttributes(wxExpr *clause);
   // I/O
   void WriteAttributes(wxExpr *clause);
   void ReadAttributes(wxExpr *clause);


@@ -36,7 +31,7 @@ class wxBitmapShape: public wxRectangleShape
   // Does the copying for this object
   void Copy(wxShape& copy);
 
   // 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; };
   inline wxBitmap& GetBitmap() const { return (wxBitmap&) m_bitmap; }
   void SetBitmap(const wxBitmap& bm);
   inline void SetFilename(const wxString& f) { m_filename = f; };