warnings (and some errors) fixes for wxUniv DLL build

[wxWidgets.git] / include / wx / icon.h

diff --git a/include/wx/icon.h b/include/wx/icon.h
index ee304c2b697602edbd334aeef88ef8f9a13c7436..1f273ebb070423a2bada1a977fa7422e786410b6 100644 (file)
--- a/include/wx/icon.h
+++ b/include/wx/icon.h
@@ -1,11 +1,7 @@
 #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__)
   #include "wx/msw/icon.h"
@@ -13,14 +9,16 @@
   #include "wx/motif/icon.h"
 #elif defined(__WXGTK__)
   #include "wx/gtk/icon.h"
-#elif defined(__WXQT__)
-  #include "wx/qt/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"
+#elif defined(__WXCOCOA__)
+  #include "wx/cocoa/icon.h"
 #elif defined(__WXPM__)
   #include "wx/os2/icon.h"
-#elif defined(__WXSTUBS__)
-  #include "wx/stubs/icon.h"
 #endif
 
 #endif