X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/55ccdb93e4ae4b606a4068cb37492c1ec3ed77a6..7c508bca835368f8082791d69dcf7a6db4dba61c:/include/wx/msw/bitmap.h diff --git a/include/wx/msw/bitmap.h b/include/wx/msw/bitmap.h index 4a02193bed..695030e453 100644 --- a/include/wx/msw/bitmap.h +++ b/include/wx/msw/bitmap.h @@ -45,8 +45,7 @@ public: // Initialize with XPM data wxBitmap(const char* const* data); -#if defined(__BORLANDC__) || (defined (__GNUC__) && __GNUC__ < 3) - // needed for Borland 5.5 +#ifdef wxNEEDS_CHARPP wxBitmap(char** data) { *this = wxBitmap(wx_const_cast(const char* const*, data)); @@ -198,6 +197,9 @@ class WXDLLEXPORT wxMask : public wxObject public: wxMask(); + // Copy constructor + wxMask(const wxMask &mask); + // Construct a mask from a bitmap and a colour indicating the transparent // area wxMask(const wxBitmap& bitmap, const wxColour& colour);