X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/77ffb5937e89927b621128789401db8921fe580f..48f7ffbe93ab587c54643e2476b0e3b0c74e1386:/include/wx/msw/bitmap.h diff --git a/include/wx/msw/bitmap.h b/include/wx/msw/bitmap.h index 466a3f0398..b60793bbe4 100644 --- a/include/wx/msw/bitmap.h +++ b/include/wx/msw/bitmap.h @@ -6,7 +6,7 @@ // Created: 01/02/97 // RCS-ID: $Id$ // Copyright: (c) Julian Smart -// Licence: wxWidgets licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifndef _WX_BITMAP_H_ @@ -46,7 +46,7 @@ public: wxBitmap() { Init(); } // Copy constructors - wxBitmap(const wxBitmap& bitmap) { Init(); Ref(bitmap); } + wxBitmap(const wxBitmap& bitmap) : wxGDIImage(bitmap) { Init(); Ref(bitmap); } // Initialize with raw data wxBitmap(const char bits[], int width, int height, int depth = 1); @@ -145,6 +145,7 @@ public: #endif // wxUSE_PALETTE wxMask *GetMask() const; + wxBitmap GetMaskBitmap() const; void SetMask(wxMask *mask); bool operator==(const wxBitmap& bitmap) const { return m_refData == bitmap.m_refData; } @@ -179,6 +180,7 @@ protected: void Init(); virtual wxGDIImageRefData *CreateData() const; + virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const; // creates the bitmap from XPM data, supposed to be called from ctor bool CreateFromXpm(const char **bits);