X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/904a68b6f648fc7802b41a8d176c78394252a4b7..4658c44ec233e09db6f108f1ce01f06708907dd7:/include/wx/gdicmn.h?ds=sidebyside diff --git a/include/wx/gdicmn.h b/include/wx/gdicmn.h index 0633285338..0f98d1ffa4 100644 --- a/include/wx/gdicmn.h +++ b/include/wx/gdicmn.h @@ -167,7 +167,7 @@ enum wxStockCursor #if defined(__WXMSW__) || defined(__WXPM__) #define wxBITMAP(name) wxBitmap(#name, wxBITMAP_TYPE_RESOURCE) -#elif defined(__WXGTK__) || defined(__WXMOTIF__) +#elif defined(__WXGTK__) || defined(__WXMOTIF__) || defined(__WXMAC__) // Initialize from an included XPM #define wxBITMAP(name) wxBitmap( (const char**) name##_xpm ) #else // other platforms @@ -383,6 +383,11 @@ public: wxColour *FindColour(const wxString& colour) ; wxString FindName(const wxColour& colour) const; void Initialize(); +#ifdef __WXPM__ + // PM keeps its own type of colour table + long* m_palTable; + size_t m_nSize; +#endif }; class WXDLLEXPORT wxBitmapList : public wxList