projects
/
wxWidgets.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
corrected CodeWarrior project target names and generated application names
[wxWidgets.git]
/
include
/
wx
/
icon.h
diff --git
a/include/wx/icon.h
b/include/wx/icon.h
index b5df2eff3811d5a19f36ebdeafb56674ca03dd06..609c8c42c28b07b63c27e2ae5092b5130584c2bf 100644
(file)
--- a/
include/wx/icon.h
+++ b/
include/wx/icon.h
@@
-1,15
+1,29
@@
-#ifndef __ICONH_BASE__
-#define __ICONH_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)
+*/
#if defined(__WXMSW__)
#if defined(__WXMSW__)
-#include "wx/msw/icon.h"
+
#include "wx/msw/icon.h"
#elif defined(__WXMOTIF__)
#elif defined(__WXMOTIF__)
-
#include "wx/xt
/icon.h"
+
#include "wx/motif
/icon.h"
#elif defined(__WXGTK__)
#elif defined(__WXGTK__)
-#include "wx/gtk/icon.h"
+ #include "wx/gtk/icon.h"
+#elif defined(__WXMGL__)
+ #include "wx/mgl/icon.h"
#elif defined(__WXQT__)
#elif defined(__WXQT__)
-#include "wx/qt/icon.h"
+ #include "wx/qt/icon.h"
+#elif defined(__WXMAC__)
+ #include "wx/mac/icon.h"
+#elif defined(__WXPM__)
+ #include "wx/os2/icon.h"
+#elif defined(__WXSTUBS__)
+ #include "wx/stubs/icon.h"
#endif
#endif
#endif
#endif
- // _
_ICONH_BASE_
_
+ // _
WX_ICON_H_BASE
_