X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6463b9f5399b8670a0c74f2f8666bc2c9f37a406..74c481d11721fb42343c6b79996478a2ebacde3a:/include/wx/msw/bitmap.h diff --git a/include/wx/msw/bitmap.h b/include/wx/msw/bitmap.h index d31371c891..701c4a8c9e 100644 --- a/include/wx/msw/bitmap.h +++ b/include/wx/msw/bitmap.h @@ -71,7 +71,7 @@ public: // Create a bitmap compatible with the given DC wxBitmap(int width, int height, const wxDC& dc); -#if wxUSE_IMAGE +#if wxUSE_IMAGE && wxUSE_WXDIB // Convert from wxImage wxBitmap(const wxImage& image, int depth = -1) { (void)CreateFromImage(image, depth); } @@ -108,7 +108,7 @@ public: virtual ~wxBitmap(); -#if wxUSE_IMAGE +#if wxUSE_IMAGE && wxUSE_WXDIB wxImage ConvertToImage() const; #endif // wxUSE_IMAGE @@ -179,6 +179,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); @@ -186,7 +187,7 @@ protected: // creates an uninitialized bitmap, called from Create()s above bool DoCreate(int w, int h, int depth, WXHDC hdc); -#if wxUSE_IMAGE +#if wxUSE_IMAGE && wxUSE_WXDIB // creates the bitmap from wxImage, supposed to be called from ctor bool CreateFromImage(const wxImage& image, int depth);