X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/1e6feb95a79834836e88143b15d9f424ebe79621..659ade8c5b948b775ba278837659f10bf66b4844:/include/wx/icon.h diff --git a/include/wx/icon.h b/include/wx/icon.h index 609c8c42c2..1f273ebb07 100644 --- 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,16 +9,16 @@ #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