X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/917be7ed065337e8a7a67615969ecaade9eea809..ca77701441e39245dcbfce903049e76f166979e5:/include/wx/palette.h diff --git a/include/wx/palette.h b/include/wx/palette.h index 91c1f52945..61013d53fb 100644 --- a/include/wx/palette.h +++ b/include/wx/palette.h @@ -1,3 +1,14 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: wx/palette.h +// Purpose: Common header and base class for wxPalette +// Author: Julian Smart +// Modified by: +// Created: +// RCS-ID: $Id$ +// Copyright: (c) Julian Smart +// Licence: wxWindows Licence +///////////////////////////////////////////////////////////////////////////// + #ifndef _WX_PALETTE_H_BASE_ #define _WX_PALETTE_H_BASE_ @@ -8,40 +19,27 @@ #include "wx/object.h" #include "wx/gdiobj.h" -// wxBrushBase -class WXDLLEXPORT wxPaletteBase: public wxGDIObject +// wxPaletteBase +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(__PALMOS__) - #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_