Patch #952053, wxToggleButton gains WS_VISIBLE flag

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

diff --git a/include/wx/icon.h b/include/wx/icon.h
index 91aca9710b27e744dc501e5255b3e9e99637c234..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_
 
 #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"
 
 #if defined(__WXMSW__)
   #include "wx/msw/icon.h"


@@ -19,6 +15,8 @@
   #include "wx/mgl/icon.h"
 #elif defined(__WXMAC__)
   #include "wx/mac/icon.h"
   #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"
 #endif
 #elif defined(__WXPM__)
   #include "wx/os2/icon.h"
 #endif