X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ffecfa5aeb540b54914739dbb8603edbbd4c00a0..333e57d578e9e0fb6555452b5a53698ffd85ee69:/include/wx/icon.h diff --git a/include/wx/icon.h b/include/wx/icon.h index c0af6c26c2..f4f92e7451 100644 --- a/include/wx/icon.h +++ b/include/wx/icon.h @@ -1,20 +1,36 @@ +///////////////////////////////////////////////////////////////////////////// +// 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_ #include "wx/iconloc.h" -#if defined(__PALMOS__) - #include "wx/palmos/icon.h" +#if defined(__WXPALMOS__) + #include "wx/generic/icon.h" #elif defined(__WXMSW__) #include "wx/msw/icon.h" #elif defined(__WXMOTIF__) #include "wx/motif/icon.h" +#elif defined(__WXGTK20__) + #include "wx/generic/icon.h" #elif defined(__WXGTK__) - #include "wx/gtk/icon.h" + #include "wx/generic/icon.h" #elif defined(__WXX11__) - #include "wx/x11/icon.h" + #include "wx/generic/icon.h" #elif defined(__WXMGL__) - #include "wx/mgl/icon.h" + #define wxICON_DEFAULT_BITMAP_TYPE wxBITMAP_TYPE_ICO_RESOURCE + #include "wx/generic/icon.h" +#elif defined(__WXDFB__) + #include "wx/generic/icon.h" #elif defined(__WXMAC__) #include "wx/mac/icon.h" #elif defined(__WXCOCOA__) @@ -23,5 +39,15 @@ #include "wx/os2/icon.h" #endif +//----------------------------------------------------------------------------- +// wxVariant support +//----------------------------------------------------------------------------- + +#if wxUSE_VARIANT +#include "wx/variant.h" +DECLARE_VARIANT_OBJECT_EXPORTED(wxIcon,WXDLLEXPORT) +#endif + + #endif // _WX_ICON_H_BASE_