projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
we need our own imaglist implementation because in wxmac wxIcon does not inherit...
[wxWidgets.git]
/
include
/
wx
/
icon.h
diff --git
a/include/wx/icon.h
b/include/wx/icon.h
index 6d892226290caa2bc22bf086faa7112f0903edd3..4b7218e15865c9ae308b7ce74cf057d022298322 100644
(file)
--- a/
include/wx/icon.h
+++ b/
include/wx/icon.h
@@
-1,13
+1,11
@@
#ifndef _WX_ICON_H_BASE_
#define _WX_ICON_H_BASE_
#ifndef _WX_ICON_H_BASE_
#define _WX_ICON_H_BASE_
-/* Commenting out since duplicated in gdicmn.h
-// this is for Unix (i.e. now for anything other than MSW)
-#undef wxICON
-#define wxICON(icon_name) wxIcon(icon_name##_xpm)
-*/
+#include "wx/iconloc.h"
-#if defined(__WXMSW__)
+#if defined(__WXPALMOS__)
+ #include "wx/palmos/icon.h"
+#elif defined(__WXMSW__)
#include "wx/msw/icon.h"
#elif defined(__WXMOTIF__)
#include "wx/motif/icon.h"
#include "wx/msw/icon.h"
#elif defined(__WXMOTIF__)
#include "wx/motif/icon.h"