X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/284f2b59db428e6ab05d31ff26b12043b6d42ff3..952f2aaa86db53c587a265485791b06afcc1e903:/include/wx/gtk1/bitmap.h diff --git a/include/wx/gtk1/bitmap.h b/include/wx/gtk1/bitmap.h index 135805a5ae..3a780c8a70 100644 --- a/include/wx/gtk1/bitmap.h +++ b/include/wx/gtk1/bitmap.h @@ -20,25 +20,26 @@ #include "wx/string.h" #include "wx/palette.h" #include "wx/gdiobj.h" -#include "wx/rawbmp.h" #ifdef __WXGTK20__ typedef struct _GdkPixbuf GdkPixbuf; #endif +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(); @@ -64,7 +65,7 @@ private: // wxBitmap //----------------------------------------------------------------------------- -class wxBitmap: public wxBitmapBase +class WXDLLIMPEXP_CORE wxBitmap: public wxBitmapBase { public: wxBitmap(); @@ -136,6 +137,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); @@ -169,7 +173,7 @@ private: // wxBitmapHandler //----------------------------------------------------------------------------- -class wxBitmapHandler: public wxBitmapHandlerBase +class WXDLLIMPEXP_CORE wxBitmapHandler: public wxBitmapHandlerBase { public: wxBitmapHandler() { }