clear up wxStringBuffer docs a bit

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

diff --git a/include/wx/icon.h b/include/wx/icon.h
index 609c8c42c28b07b63c27e2ae5092b5130584c2bf..c0af6c26c2f6ad935efb7d979d929c702d351b76 100644 (file)
--- a/include/wx/icon.h
+++ b/include/wx/icon.h
@@ -1,28 +1,26 @@
 #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(__PALMOS__)
+  #include "wx/palmos/icon.h"
+#elif defined(__WXMSW__)
   #include "wx/msw/icon.h"
 #elif defined(__WXMOTIF__)
   #include "wx/motif/icon.h"
 #elif defined(__WXGTK__)
   #include "wx/gtk/icon.h"
+#elif defined(__WXX11__)
+  #include "wx/x11/icon.h"
 #elif defined(__WXMGL__)
   #include "wx/mgl/icon.h"
-#elif defined(__WXQT__)
-  #include "wx/qt/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