X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/03f38c58fdd36b1e951dfed81b245a7337bbc3b4..c822ad5a5e30a21ca3340af644bf79804cf7c777:/include/wx/icon.h diff --git a/include/wx/icon.h b/include/wx/icon.h index 4de7f27e5d..bd8703d178 100644 --- a/include/wx/icon.h +++ b/include/wx/icon.h @@ -1,24 +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) +*/ #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" -#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(__WXPM__) + #include "wx/os2/icon.h" #elif defined(__WXSTUBS__) #include "wx/stubs/icon.h" #endif