X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/88ef3a57a47f840adea9d38bc11cb30689a0838a..66c2bf7b1d9326fb650acfaae22ec50528cfbf7c:/include/wx/palette.h diff --git a/include/wx/palette.h b/include/wx/palette.h index 28951a21ce..85bf7dd689 100644 --- a/include/wx/palette.h +++ b/include/wx/palette.h @@ -4,7 +4,6 @@ // Author: Julian Smart // Modified by: // Created: -// RCS-ID: $Id$ // Copyright: (c) Julian Smart // Licence: wxWindows Licence ///////////////////////////////////////////////////////////////////////////// @@ -20,39 +19,26 @@ #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; }; + 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(__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__) - #include "wx/mac/palette.h" + #include "wx/osx/palette.h" #elif defined(__WXPM__) #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_