X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/03647350fc7cd141953c72e0284e928847d30f44..125e7c11c16f23daa4c594f3b8d90194099c2394:/include/wx/gtk/bitmap.h?ds=sidebyside diff --git a/include/wx/gtk/bitmap.h b/include/wx/gtk/bitmap.h index 32a612d4a9..b2d1c0eb37 100644 --- a/include/wx/gtk/bitmap.h +++ b/include/wx/gtk/bitmap.h @@ -17,7 +17,7 @@ class WXDLLIMPEXP_FWD_CORE wxPixelDataBase; // wxMask //----------------------------------------------------------------------------- -class WXDLLIMPEXP_CORE wxMask: public wxObject +class WXDLLIMPEXP_CORE wxMask: public wxMaskBase { public: wxMask(); @@ -28,18 +28,15 @@ public: wxMask( const wxBitmap& bitmap ); virtual ~wxMask(); - bool Create( const wxBitmap& bitmap, const wxColour& colour ); -#if wxUSE_PALETTE - bool Create( const wxBitmap& bitmap, int paletteIndex ); -#endif // wxUSE_PALETTE - bool Create( const wxBitmap& bitmap ); - // implementation GdkBitmap *m_bitmap; - GdkBitmap *GetBitmap() const; -private: +protected: + virtual void FreeData(); + virtual bool InitFromColour(const wxBitmap& bitmap, const wxColour& colour); + virtual bool InitFromMonoBitmap(const wxBitmap& bitmap); + DECLARE_DYNAMIC_CLASS(wxMask) };