X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1bc822dfb5cdc24fd2d98b59ea20c9951301bfb1..810f173e8d7f580c612f202aab2a01003c3fb834:/include/wx/bitmap.h diff --git a/include/wx/bitmap.h b/include/wx/bitmap.h index 9d113ffa91..52c7e88bb7 100644 --- a/include/wx/bitmap.h +++ b/include/wx/bitmap.h @@ -32,7 +32,7 @@ class WXDLLEXPORT wxImage; class WXDLLEXPORT wxMask; class WXDLLEXPORT wxPalette; -#if defined(__WXMGL__) || defined(__WXMAC__) || defined(__WXMOTIF__) +#if defined(__WXMGL__) || defined(__WXMAC__) || defined(__WXCOCOA__) || defined(__WXMOTIF__) // Only used by some ports // FIXME -- make all ports (but MSW which uses wxGDIImage) use these base classes @@ -117,8 +117,18 @@ public: const wxPalette *palette = (wxPalette *)NULL) const = 0; virtual bool LoadFile(const wxString &name, wxBitmapType type) = 0; + /* + If raw bitmap access is supported (see wx/rawbmp.h), the following + methods should be implemented: + + virtual bool GetRawData(wxRawBitmapData *data) = 0; + virtual void UngetRawData(wxRawBitmapData *data) = 0; + */ + +#if wxUSE_PALETTE virtual wxPalette *GetPalette() const = 0; virtual void SetPalette(const wxPalette& palette) = 0; +#endif // wxUSE_PALETTE #if WXWIN_COMPATIBILITY wxPalette *GetColourMap() const { return GetPalette(); } @@ -166,6 +176,8 @@ protected: #include "wx/mgl/bitmap.h" #elif defined(__WXMAC__) #include "wx/mac/bitmap.h" +#elif defined(__WXCOCOA__) +#include "wx/cocoa/bitmap.h" #elif defined(__WXPM__) #include "wx/os2/bitmap.h" #endif