X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/2049ba38adafa0ec146880de29f26e32dd69a125..15678bec37c6e3cb8a67a8b041579af595d4ccf3:/include/wx/icon.h diff --git a/include/wx/icon.h b/include/wx/icon.h index 1dbcd1443b..1632b1a03f 100644 --- a/include/wx/icon.h +++ b/include/wx/icon.h @@ -1,13 +1,27 @@ -#ifndef __ICONH_BASE__ -#define __ICONH_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) +*/ #if defined(__WXMSW__) -#include "wx/msw/icon.h" + #include "wx/msw/icon.h" #elif defined(__WXMOTIF__) -#include "wx/xt/icon.h" + #include "wx/motif/icon.h" #elif defined(__WXGTK__) -#include "wx/gtk/icon.h" + #include "wx/gtk/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 #endif - // __ICONH_BASE__ + // _WX_ICON_H_BASE_