projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix duplicate events for selection keys after the last change (see #626)
[wxWidgets.git]
/
include
/
wx
/
palette.h
diff --git
a/include/wx/palette.h
b/include/wx/palette.h
index 8f2e85363dbb07e5f875a370eb8ff1bedd64bc12..02edb405b556319248d17aad9ed143827444b5aa 100644
(file)
--- a/
include/wx/palette.h
+++ b/
include/wx/palette.h
@@
-20,13
+20,11
@@
#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 { 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; }
};
@@
-41,7
+39,7
@@
public:
#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