X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/55ccdb93e4ae4b606a4068cb37492c1ec3ed77a6..55809d1394516044a90fa34b12070d0f3e9f1439:/include/wx/os2/bitmap.h diff --git a/include/wx/os2/bitmap.h b/include/wx/os2/bitmap.h index 03802ca653..552cbe22d9 100644 --- a/include/wx/os2/bitmap.h +++ b/include/wx/os2/bitmap.h @@ -38,6 +38,7 @@ class WXDLLEXPORT wxBitmapRefData : public wxGDIImageRefData { public: wxBitmapRefData(); + wxBitmapRefData(const wxBitmapRefData &tocopy); virtual ~wxBitmapRefData() { Free(); } virtual void Free(); @@ -85,7 +86,7 @@ public: // Initialize with XPM data wxBitmap(const char* const* bits); -#if defined (__GNUC__) && __GNUC__ < 3 +#ifdef wxNEEDS_CHARPP // needed for old GCC wxBitmap(char** data) { @@ -215,6 +216,10 @@ protected: bool CreateFromImage(const wxImage& image, int depth); + // ref counting code + virtual wxObjectRefData *CreateRefData() const; + virtual wxObjectRefData *CloneRefData(const wxObjectRefData *data) const; + private: bool CopyFromIconOrCursor(const wxGDIImage& rIcon); @@ -230,6 +235,7 @@ class WXDLLEXPORT wxMask : public wxObject { public: wxMask(); + wxMask( const wxMask& tocopy); // Construct a mask from a bitmap and a colour indicating the transparent // area