projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
wxFont::MakeXXX() and Scale() methods now modify the font in place; XXX() and Scaled...
[wxWidgets.git]
/
include
/
wx
/
palette.h
diff --git
a/include/wx/palette.h
b/include/wx/palette.h
index 28951a21cee56c20bc7801746f0e614c44814a60..02edb405b556319248d17aad9ed143827444b5aa 100644
(file)
--- a/
include/wx/palette.h
+++ b/
include/wx/palette.h
@@
-20,39
+20,30
@@
#include "wx/gdiobj.h"
// wxPaletteBase
#include "wx/gdiobj.h"
// wxPaletteBase
-class WXDLL
EXPORT
wxPaletteBase: public wxGDIObject
+class WXDLL
IMPEXP_CORE
wxPaletteBase: public wxGDIObject
{
public:
virtual ~wxPaletteBase() { }
{
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( _T("not implemented") ); return 0; }
};
#if defined(__WXPALMOS__)
#include "wx/palmos/palette.h"
#elif defined(__WXMSW__)
#include "wx/msw/palette.h"
};
#if defined(__WXPALMOS__)
#include "wx/palmos/palette.h"
#elif defined(__WXMSW__)
#include "wx/msw/palette.h"
-#elif defined(__WXMOTIF__)
- #include "wx/
motif
/palette.h"
+#elif defined(__WX
X11__) || defined(__WX
MOTIF__)
+ #include "wx/
x11
/palette.h"
#elif defined(__WXGTK__) || defined(__WXCOCOA__)
#include "wx/generic/paletteg.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__)
#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
#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 // wxUSE_PALETTE
-#endif
- // _WX_PALETTE_H_BASE_
+#endif // _WX_PALETTE_H_BASE_