Generic file dialog presentation. Regenerated makefiles.

[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 5389351fe46a4aded0ad30e7309333657eee3ae4..b6e3dc00a689e7acf8731dd21a5aa358b1e544f5 100644 (file)
--- a/contrib/include/wx/ogl/bmpshape.h
+++ b/contrib/include/wx/ogl/bmpshape.h
@@ -6,7 +6,7 @@
 // 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_
 /////////////////////////////////////////////////////////////////////////////
 
 #ifndef _OGL_BITMAP_H_


@@ -16,9 +16,8 @@
 #pragma interface "bmpshape.h"
 #endif
 
 #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:


@@ -36,7 +35,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; };