X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/155ecd4c4221d3bbc7aa93d472d11948f21d21ab..9d5507f7a2701395e1d5c121bd877bb9066ee6ea:/src/palmos/bitmap.cpp diff --git a/src/palmos/bitmap.cpp b/src/palmos/bitmap.cpp index 75ae168b58..9af1c0882f 100644 --- a/src/palmos/bitmap.cpp +++ b/src/palmos/bitmap.cpp @@ -211,16 +211,6 @@ wxBitmap::wxBitmap(const char bits[], int width, int height, int depth) Init(); } -// Create from XPM data -#if wxUSE_IMAGE && wxUSE_XPM -bool wxBitmap::CreateFromXpm(const char **data) -#else -bool wxBitmap::CreateFromXpm(const char **WXUNUSED(data)) -#endif -{ - return false; -} - wxBitmap::wxBitmap(int w, int h, int d) { } @@ -229,7 +219,7 @@ wxBitmap::wxBitmap(int w, int h, const wxDC& dc) { } -wxBitmap::wxBitmap(void *data, long type, int width, int height, int depth) +wxBitmap::wxBitmap(const void* data, long type, int width, int height, int depth) { } @@ -294,7 +284,7 @@ bool wxBitmap::LoadFile(const wxString& filename, long type) return false; } -bool wxBitmap::Create(void *data, long type, int width, int height, int depth) +bool wxBitmap::Create(const void* data, long type, int width, int height, int depth) { return false; } @@ -341,10 +331,6 @@ wxDC *wxBitmap::GetSelectedInto() const #endif -void wxBitmap::UseAlpha() -{ -} - bool wxBitmap::HasAlpha() const { return false; @@ -445,7 +431,7 @@ bool wxMask::Create(const wxBitmap& bitmap, const wxColour& colour) // ---------------------------------------------------------------------------- bool wxBitmapHandler::Create(wxGDIImage *image, - void *data, + const void* data, long flags, int width, int height, int depth) { @@ -468,7 +454,7 @@ bool wxBitmapHandler::Save(wxGDIImage *image, } bool wxBitmapHandler::Create(wxBitmap *WXUNUSED(bitmap), - void *WXUNUSED(data), + const void* WXUNUSED(data), long WXUNUSED(type), int WXUNUSED(width), int WXUNUSED(height),