Applied patch [ 1286701 ] fix for compiling odbc with MS VC8 on x64

[wxWidgets.git] / include / wx / gtk / bitmap.h

diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h
index 3dccd3668fd17d6f9ce372419761db1754767701..3a780c8a7015a69ffe5829acda50bb455e065806 100644 (file)
--- a/include/wx/gtk/bitmap.h
+++ b/include/wx/gtk/bitmap.h
@@ -31,15 +31,15 @@ class WXDLLEXPORT wxPixelDataBase;
 // classes
 //-----------------------------------------------------------------------------
 
-class wxMask;
-class wxBitmap;
-class wxImage;
+class WXDLLIMPEXP_CORE wxMask;
+class WXDLLIMPEXP_CORE wxBitmap;
+class WXDLLIMPEXP_CORE wxImage;
 
 //-----------------------------------------------------------------------------
 // wxMask
 //-----------------------------------------------------------------------------
 
-class wxMask: public wxObject
+class WXDLLIMPEXP_CORE wxMask: public wxObject
 {
 public:
     wxMask();
@@ -65,7 +65,7 @@ private:
 // wxBitmap
 //-----------------------------------------------------------------------------
 
-class wxBitmap: public wxBitmapBase
+class WXDLLIMPEXP_CORE wxBitmap: public wxBitmapBase
 {
 public:
     wxBitmap();
@@ -137,8 +137,8 @@ public:
     void *GetRawData(wxPixelDataBase& data, int bpp);
     void UngetRawData(wxPixelDataBase& data);
 
-    bool HasAlpha() const { return true; }
-    void UseAlpha() { }
+    bool HasAlpha() const;
+    void UseAlpha();
 
 protected:
     bool CreateFromXpm(const char **bits);
@@ -173,7 +173,7 @@ private:
 // wxBitmapHandler
 //-----------------------------------------------------------------------------
 
-class wxBitmapHandler: public wxBitmapHandlerBase
+class WXDLLIMPEXP_CORE wxBitmapHandler: public wxBitmapHandlerBase
 {
 public:
     wxBitmapHandler() { }