Added wxTreeCtrl::GetItemParent to deprecate GetParent.

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

diff --git a/include/wx/icon.h b/include/wx/icon.h
index 4de7f27e5d1b423b4914dfe7f41d5570748abdce..bd8703d1780b2f78aaaa3bd725f9aada130cba21 100644 (file)
--- a/include/wx/icon.h
+++ b/include/wx/icon.h
@@ -1,24 +1,26 @@
 #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)
 // 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__)

-  // under Windows, icon name is the ressource id (string)
-  #undef wxICON
-  #define wxICON(icon_name)   wxIcon(#icon_name)
-

   #include "wx/msw/icon.h"
 #elif defined(__WXMOTIF__)
   #include "wx/motif/icon.h"
 #elif defined(__WXGTK__)
   #include "wx/gtk/icon.h"
   #include "wx/msw/icon.h"
 #elif defined(__WXMOTIF__)
   #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(__WXMAC__)
   #include "wx/mac/icon.h"

+#elif defined(__WXPM__)
+  #include "wx/os2/icon.h"

 #elif defined(__WXSTUBS__)
   #include "wx/stubs/icon.h"
 #endif
 #elif defined(__WXSTUBS__)
   #include "wx/stubs/icon.h"
 #endif