X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f383c5b89cba1a3bfcc53d9d52c523085a6156db..b8af111fa5d3916e6f42fee3af0ab1bec0ace7b6:/include/wx/gtk/bitmap.h diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h index 2c8c37975a..d33ce22cc1 100644 --- a/include/wx/gtk/bitmap.h +++ b/include/wx/gtk/bitmap.h @@ -11,10 +11,6 @@ #ifndef __GTKBITMAPH__ #define __GTKBITMAPH__ -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -#pragma interface -#endif - #include "wx/defs.h" #include "wx/object.h" #include "wx/string.h" @@ -31,15 +27,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 +61,7 @@ private: // wxBitmap //----------------------------------------------------------------------------- -class wxBitmap: public wxBitmapBase +class WXDLLIMPEXP_CORE wxBitmap: public wxBitmapBase { public: wxBitmap(); @@ -137,6 +133,9 @@ public: void *GetRawData(wxPixelDataBase& data, int bpp); void UngetRawData(wxPixelDataBase& data); + bool HasAlpha() const; + void UseAlpha(); + protected: bool CreateFromXpm(const char **bits); bool CreateFromImage(const wxImage& image, int depth); @@ -170,7 +169,7 @@ private: // wxBitmapHandler //----------------------------------------------------------------------------- -class wxBitmapHandler: public wxBitmapHandlerBase +class WXDLLIMPEXP_CORE wxBitmapHandler: public wxBitmapHandlerBase { public: wxBitmapHandler() { }