X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/650c0aa9180563eece310851973171cfaac83ad8..1789c1c6022a63d0d7bfdf5242528f526b870bc6:/src/palmos/bitmap.cpp diff --git a/src/palmos/bitmap.cpp b/src/palmos/bitmap.cpp index 9af1c0882f..ed435cf0dd 100644 --- a/src/palmos/bitmap.cpp +++ b/src/palmos/bitmap.cpp @@ -45,10 +45,6 @@ #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) @@ -96,7 +92,7 @@ public: private: wxMask *m_bitmapMask; - DECLARE_NO_COPY_CLASS(wxBitmapRefData) + wxDECLARE_NO_COPY_CLASS(wxBitmapRefData); }; // ---------------------------------------------------------------------------- @@ -202,19 +198,11 @@ bool wxBitmap::CopyFromDIB(const wxDIB& dib) #endif // NEVER_USE_DIB -wxBitmap::~wxBitmap() -{ -} - wxBitmap::wxBitmap(const char bits[], int width, int height, int depth) { Init(); } -wxBitmap::wxBitmap(int w, int h, int d) -{ -} - wxBitmap::wxBitmap(int w, int h, const wxDC& dc) { } @@ -313,20 +301,20 @@ wxBitmap wxBitmap::GetSubBitmap( const wxRect& rect) const #if wxUSE_PALETTE wxPalette* wxBitmap::GetPalette() const { - return (wxPalette *) NULL; + return NULL; } #endif wxMask *wxBitmap::GetMask() const { - return (wxMask *) NULL; + return NULL; } #ifdef __WXDEBUG__ wxDC *wxBitmap::GetSelectedInto() const { - return (wxDC *) NULL; + return NULL; } #endif @@ -364,18 +352,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 // ----------------------------------------------------------------------------