X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/732d8c74f805e35cd398711fcd3969c4c668e259..c6ea1fdaf924be4ee49a19d12f76e4fcd257bb0a:/include/wx/x11/bitmap.h diff --git a/include/wx/x11/bitmap.h b/include/wx/x11/bitmap.h index e60874f815..8b5d956aca 100644 --- a/include/wx/x11/bitmap.h +++ b/include/wx/x11/bitmap.h @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: x11/bitmap.h +// Name: wx/x11/bitmap.h // Purpose: wxBitmap class // Author: Julian Smart, Robert Roebling // Modified by: @@ -34,6 +34,7 @@ class WXDLLIMPEXP_CORE wxMask: public wxObject { public: wxMask(); + wxMask(const wxMask& mask); wxMask( const wxBitmap& bitmap, const wxColour& colour ); wxMask( const wxBitmap& bitmap, int paletteIndex ); wxMask( const wxBitmap& bitmap ); @@ -53,6 +54,7 @@ public: private: WXPixmap m_bitmap; WXDisplay *m_display; + wxSize m_size; private: DECLARE_DYNAMIC_CLASS(wxMask) @@ -68,7 +70,7 @@ public: wxBitmap() {} wxBitmap( int width, int height, int depth = -1 ) { Create( width, height, depth ); } wxBitmap( const wxSize& sz, int depth = -1 ) { Create( sz, depth ); } - + wxBitmap( const char bits[], int width, int height, int depth = 1 ); wxBitmap( const char* const* bits ); #ifdef wxNEEDS_CHARPP