X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/60a3d1c65bc65df9f9ba486587e3fab216beb470..85047589a993f5c5529e1dae284be8af84cd68ef:/include/wx/gtk/bitmap.h diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h index b2d1c0eb37..71f5d5b75c 100644 --- a/include/wx/gtk/bitmap.h +++ b/include/wx/gtk/bitmap.h @@ -21,6 +21,7 @@ class WXDLLIMPEXP_CORE wxMask: public wxMaskBase { public: wxMask(); + wxMask(const wxMask& mask); wxMask( const wxBitmap& bitmap, const wxColour& colour ); #if wxUSE_PALETTE wxMask( const wxBitmap& bitmap, int paletteIndex ); @@ -104,8 +105,7 @@ public: void SetHeight( int height ); void SetWidth( int width ); void SetDepth( int depth ); - void SetPixmap( GdkPixmap *pixmap ); - void SetPixbuf(GdkPixbuf* pixbuf, int depth = 0); + void SetPixbuf(GdkPixbuf* pixbuf); GdkPixmap *GetPixmap() const; bool HasPixmap() const; @@ -127,6 +127,7 @@ protected: virtual wxGDIRefData* CloneGDIRefData(const wxGDIRefData* data) const; private: + void SetPixmap(GdkPixmap* pixmap); #if wxUSE_IMAGE // to be called from CreateFromImage only! bool CreateFromImageAsPixmap(const wxImage& image, int depth); @@ -144,7 +145,6 @@ public: // (wxBitmap may keep same bitmap e.g. as both pixmap and pixbuf): void PurgeOtherRepresentations(Representation keep); -private: DECLARE_DYNAMIC_CLASS(wxBitmap) };