X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5633b968f51434b88d52e0e3bdda6ab447487e12..09b895cb4a954494063eb17d3dc302a654fd99e5:/include/wx/palette.h?ds=sidebyside diff --git a/include/wx/palette.h b/include/wx/palette.h index 658c32f976..8f9183cdfb 100644 --- a/include/wx/palette.h +++ b/include/wx/palette.h @@ -20,12 +20,11 @@ #include "wx/gdiobj.h" // wxPaletteBase -class WXDLLEXPORT wxPaletteBase: public wxGDIObject +class WXDLLIMPEXP_CORE wxPaletteBase: public wxGDIObject { public: virtual ~wxPaletteBase() { } - virtual bool Ok() const = 0; virtual int GetColoursCount() const { wxFAIL_MSG( _T("not implemented") ); return 0; } }; @@ -33,12 +32,10 @@ public: #include "wx/palmos/palette.h" #elif defined(__WXMSW__) #include "wx/msw/palette.h" -#elif defined(__WXMOTIF__) - #include "wx/motif/palette.h" +#elif defined(__WXX11__) || defined(__WXMOTIF__) + #include "wx/x11/palette.h" #elif defined(__WXGTK__) || defined(__WXCOCOA__) #include "wx/generic/paletteg.h" -#elif defined(__WXX11__) - #include "wx/x11/palette.h" #elif defined(__WXMGL__) #include "wx/mgl/palette.h" #elif defined(__WXMAC__) @@ -47,12 +44,6 @@ public: #include "wx/os2/palette.h" #endif -#if WXWIN_COMPATIBILITY_2_4 - #define wxColorMap wxPalette - #define wxColourMap wxPalette -#endif - #endif // wxUSE_PALETTE -#endif - // _WX_PALETTE_H_BASE_ +#endif // _WX_PALETTE_H_BASE_