X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..8946ede10c2702c7acbb194fe8bd2793d7fb8358:/src/palmos/bitmap.cpp?ds=sidebyside diff --git a/src/palmos/bitmap.cpp b/src/palmos/bitmap.cpp index ae71f142b8..674aa379a9 100644 --- a/src/palmos/bitmap.cpp +++ b/src/palmos/bitmap.cpp @@ -24,6 +24,8 @@ #pragma hdrstop #endif +#include "wx/bitmap.h" + #ifndef WX_PRECOMP #include @@ -32,23 +34,17 @@ #include "wx/app.h" #include "wx/palette.h" #include "wx/dcmemory.h" - #include "wx/bitmap.h" #include "wx/icon.h" + #include "wx/log.h" + #include "wx/image.h" #endif -#include "wx/log.h" - #if wxUSE_WXDIB #include "wx/palmos/dib.h" #endif -#include "wx/image.h" #include "wx/xpmdecod.h" -#ifdef wxHAVE_RAW_BITMAP -#include "wx/rawbmp.h" -#endif - // missing from mingw32 header #ifndef CLR_INVALID #define CLR_INVALID ((COLORREF)-1) @@ -211,16 +207,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 +215,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 +280,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 +327,6 @@ wxDC *wxBitmap::GetSelectedInto() const #endif -void wxBitmap::UseAlpha() -{ -} - bool wxBitmap::HasAlpha() const { return false; @@ -378,18 +360,6 @@ void wxBitmap::SetMask(wxMask *mask) // raw bitmap access support // ---------------------------------------------------------------------------- -#ifdef wxHAVE_RAW_BITMAP -void *wxBitmap::GetRawData(wxPixelDataBase& data, int bpp) -{ - return NULL; -} - -void wxBitmap::UngetRawData(wxPixelDataBase& dataBase) -{ - return; -} -#endif // #ifdef wxHAVE_RAW_BITMAP - // ---------------------------------------------------------------------------- // wxMask // ---------------------------------------------------------------------------- @@ -445,7 +415,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 +438,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),