X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2aeec9ecccdb1b051848768f45a4ac1859ded5f3..bedaf53eaf4e2a860b34d4ff5e0b1928ce8fa5c9:/include/wx/msw/bitmap.h?ds=sidebyside diff --git a/include/wx/msw/bitmap.h b/include/wx/msw/bitmap.h index 2aab4a41ee..85f7b683c5 100644 --- a/include/wx/msw/bitmap.h +++ b/include/wx/msw/bitmap.h @@ -90,9 +90,12 @@ public: // If depth is omitted, will create a bitmap compatible with the display wxBitmap(int width, int height, int depth = -1); - + +#if wxUSE_IMAGE // Convert from wxImage: - wxBitmap(const wxImage& image, int depth = -1) { (void)CreateFromImage(image, depth); } + wxBitmap(const wxImage& image, int depth = -1) + { (void)CreateFromImage(image, depth); } +#endif // wxUSE_IMAGE // we must have this, otherwise icons are silently copied into bitmaps using // the copy ctor but the resulting bitmap is invalid! @@ -121,11 +124,13 @@ public: virtual ~wxBitmap(); +#if wxUSE_IMAGE wxImage ConvertToImage() const; +#endif // wxUSE_IMAGE // get the given part of bitmap wxBitmap GetSubBitmap( const wxRect& rect ) const; - + // copies the contents and mask of the given (colour) icon to the bitmap bool CopyFromIcon(const wxIcon& icon); @@ -191,9 +196,11 @@ protected: // creates the bitmap from XPM data, supposed to be called from ctor bool CreateFromXpm(const char **bits); + +#if wxUSE_IMAGE // creates the bitmap from wxImage, supposed to be called from ctor bool CreateFromImage(const wxImage& image, int depth); - +#endif // wxUSE_IMAGE private: #ifdef __WIN32__