X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/34138703c3997ce676a1e713d9ff9eb020640da7..c331ac2ed75ba5c435d745e9282c27a339da4f18:/include/wx/icon.h

diff --git a/include/wx/icon.h b/include/wx/icon.h
index 2baded96c3..bd8703d178 100644
--- a/include/wx/icon.h
+++ b/include/wx/icon.h
@@ -1,18 +1,28 @@
 #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__)
-#include "wx/msw/icon.h"
+  #include "wx/msw/icon.h"
 #elif defined(__WXMOTIF__)
-#include "wx/motif/icon.h"
+  #include "wx/motif/icon.h"
 #elif defined(__WXGTK__)
-#include "wx/gtk/icon.h"
-#elif defined(__WXQT__)
-#include "wx/qt/icon.h"
+  #include "wx/gtk/icon.h"
+#elif defined(__WXX11__)
+  #include "wx/x11/icon.h"
+#elif defined(__WXMGL__)
+  #include "wx/mgl/icon.h"
 #elif defined(__WXMAC__)
-#include "wx/mac/icon.h"
+  #include "wx/mac/icon.h"
+#elif defined(__WXPM__)
+  #include "wx/os2/icon.h"
 #elif defined(__WXSTUBS__)
-#include "wx/stubs/icon.h"
+  #include "wx/stubs/icon.h"
 #endif
 
 #endif