X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6184558583df419ff7830abaf16e7ec40ac00b32..ca77701441e39245dcbfce903049e76f166979e5:/include/wx/palette.h diff --git a/include/wx/palette.h b/include/wx/palette.h index 8f2e85363d..61013d53fb 100644 --- a/include/wx/palette.h +++ b/include/wx/palette.h @@ -20,28 +20,22 @@ #include "wx/gdiobj.h" // wxPaletteBase -class WXDLLEXPORT wxPaletteBase: public wxGDIObject +class WXDLLIMPEXP_CORE wxPaletteBase: public wxGDIObject { public: virtual ~wxPaletteBase() { } - virtual bool Ok() const { return IsOk(); } - virtual bool IsOk() const = 0; - virtual int GetColoursCount() const { wxFAIL_MSG( _T("not implemented") ); return 0; } + virtual int GetColoursCount() const { wxFAIL_MSG( wxT("not implemented") ); return 0; } }; -#if defined(__WXPALMOS__) - #include "wx/palmos/palette.h" -#elif defined(__WXMSW__) +#if defined(__WXMSW__) #include "wx/msw/palette.h" #elif defined(__WXX11__) || defined(__WXMOTIF__) #include "wx/x11/palette.h" #elif defined(__WXGTK__) || defined(__WXCOCOA__) #include "wx/generic/paletteg.h" -#elif defined(__WXMGL__) - #include "wx/mgl/palette.h" #elif defined(__WXMAC__) - #include "wx/mac/palette.h" + #include "wx/osx/palette.h" #elif defined(__WXPM__) #include "wx/os2/palette.h" #endif