projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added API for column reordering
[wxWidgets.git]
/
include
/
wx
/
palette.h
diff --git
a/include/wx/palette.h
b/include/wx/palette.h
index 15be24fe3feb0b48982f5d3eaab9921ffc8e7156..491838d3cddc8d377955a31518271073ae46c250 100644
(file)
--- a/
include/wx/palette.h
+++ b/
include/wx/palette.h
@@
-25,8
+25,6
@@
class WXDLLEXPORT wxPaletteBase: public wxGDIObject
public:
virtual ~wxPaletteBase() { }
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( _T("not implemented") ); return 0; }
};
@@
-34,12
+32,10
@@
public:
#include "wx/palmos/palette.h"
#elif defined(__WXMSW__)
#include "wx/msw/palette.h"
#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__)
@@
-50,5
+46,4
@@
public:
#endif // wxUSE_PALETTE
#endif // wxUSE_PALETTE
-#endif
- // _WX_PALETTE_H_BASE_
+#endif // _WX_PALETTE_H_BASE_