X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7c23a0b01b3fb667ec41fc8271ce1ee5b5aa4e19..4d94751752c081c289a1d8f159405487dbbe4e68:/include/wx/stubs/bitmap.h diff --git a/include/wx/stubs/bitmap.h b/include/wx/stubs/bitmap.h index f01c6a2de3..0b1efd764e 100644 --- a/include/wx/stubs/bitmap.h +++ b/include/wx/stubs/bitmap.h @@ -109,6 +109,7 @@ protected: wxString m_extension; long m_type; }; + #define M_BITMAPHANDLERDATA ((wxBitmapRefData *)bitmap->GetRefData()) class WXDLLEXPORT wxBitmap: public wxGDIObject @@ -160,10 +161,10 @@ public: void SetQuality(int q); void SetOk(bool isOk); - inline wxPalette* GetPalette() const { return (M_BITMAPDATA ? (& M_BITMAPDATA->m_bitmapPalette) : NULL); } + inline wxPalette* GetPalette() const { return (M_BITMAPDATA ? (& M_BITMAPDATA->m_bitmapPalette) : (wxPalette*) NULL); } void SetPalette(const wxPalette& palette); - inline wxMask *GetMask() const { return (M_BITMAPDATA ? M_BITMAPDATA->m_bitmapMask : NULL); } + inline wxMask *GetMask() const { return (M_BITMAPDATA ? M_BITMAPDATA->m_bitmapMask : (wxMask*) NULL); } void SetMask(wxMask *mask) ; inline wxBitmap& operator = (const wxBitmap& bitmap) { if (*this == bitmap) return (*this); Ref(bitmap); return *this; }