X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/6e711d5c093dcc758e3f1670caf845612ea9fa92..bcd96979730f8bb56ac220f9092439694d4e0456:/include/wx/icon.h diff --git a/include/wx/icon.h b/include/wx/icon.h index 1632b1a03f..bcf9c53ca8 100644 --- a/include/wx/icon.h +++ b/include/wx/icon.h @@ -1,26 +1,39 @@ +///////////////////////////////////////////////////////////////////////////// +// Name: wx/icon.h +// Purpose: wxIcon base header +// Author: Julian Smart +// Modified by: +// Created: +// Copyright: (c) Julian Smart +// RCS-ID: $Id$ +// Licence: wxWindows licence +///////////////////////////////////////////////////////////////////////////// + #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__) +#if defined(__WXPALMOS__) + #include "wx/palmos/icon.h" +#elif defined(__WXMSW__) #include "wx/msw/icon.h" #elif defined(__WXMOTIF__) #include "wx/motif/icon.h" -#elif defined(__WXGTK__) +#elif defined(__WXGTK20__) #include "wx/gtk/icon.h" +#elif defined(__WXGTK__) + #include "wx/gtk1/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(__WXCOCOA__) + #include "wx/cocoa/icon.h" #elif defined(__WXPM__) #include "wx/os2/icon.h" -#elif defined(__WXSTUBS__) - #include "wx/stubs/icon.h" #endif #endif