X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fd85921189610501e38fb501801b1eb6b9560fe7..988a8d440e98d86557c6a6393ee20bbca65bfe6f:/include/wx/os2/bitmap.h diff --git a/include/wx/os2/bitmap.h b/include/wx/os2/bitmap.h index ba920a1fac..f5d99b666d 100644 --- a/include/wx/os2/bitmap.h +++ b/include/wx/os2/bitmap.h @@ -84,8 +84,8 @@ public: ); // Initialize with XPM data - wxBitmap(const char** ppData); - wxBitmap(char** ppData); + wxBitmap(const char** ppData) { CreateFromXpm(ppData); } + wxBitmap(char** ppData) { CreateFromXpm((const char**)ppData); } // Load a file or resource wxBitmap( const wxString& rName @@ -106,7 +106,7 @@ public: ,int nDepth = -1 ); - wxBitmap( const wxImage& image, int depth = -1 ) + wxBitmap( const wxImage& image, int depth = -1 ) { (void)CreateFromImage(image, depth); } // we must have this, otherwise icons are silently copied into bitmaps using @@ -136,7 +136,7 @@ public: virtual ~wxBitmap(); - wxImage ConvertToImage() const; + wxImage ConvertToImage() const; // get the given part of bitmap wxBitmap GetSubBitmap(const wxRect& rRect) const; @@ -231,7 +231,7 @@ protected: { return new wxBitmapRefData; } // creates the bitmap from XPM data, supposed to be called from ctor - bool CreateFromXpm(const char **bits); + bool CreateFromXpm(const char** ppData); bool CreateFromImage(const wxImage& image, int depth); private: