X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/e9e4acc5197ac49259b9a39468c5931b4459d87f..880d76dfb12d4e8466df30d641bb25c6f71bd398:/include/wx/icon.h?ds=sidebyside diff --git a/include/wx/icon.h b/include/wx/icon.h index 91aca9710b..5eebb3f38e 100644 --- a/include/wx/icon.h +++ b/include/wx/icon.h @@ -1,27 +1,75 @@ +///////////////////////////////////////////////////////////////////////////// +// 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" + + +// a more readable way to tell +#define wxICON_SCREEN_DEPTH (-1) + + +// the wxICON_DEFAULT_TYPE (the wxIcon equivalent of wxBITMAP_DEFAULT_TYPE) +// constant defines the default argument value for wxIcon ctor and wxIcon::LoadFile() +// functions. #if defined(__WXMSW__) + #define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_ICO_RESOURCE #include "wx/msw/icon.h" #elif defined(__WXMOTIF__) + #define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_XPM #include "wx/motif/icon.h" +#elif defined(__WXGTK20__) + #ifdef __WINDOWS__ + #define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_ICO_RESOURCE + #else + #define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_XPM + #endif + #include "wx/generic/icon.h" #elif defined(__WXGTK__) - #include "wx/gtk/icon.h" + #define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_XPM + #include "wx/generic/icon.h" #elif defined(__WXX11__) - #include "wx/x11/icon.h" -#elif defined(__WXMGL__) - #include "wx/mgl/icon.h" + #define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_XPM + #include "wx/generic/icon.h" +#elif defined(__WXDFB__) + #define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_XPM + #include "wx/generic/icon.h" #elif defined(__WXMAC__) - #include "wx/mac/icon.h" +#if wxOSX_USE_COCOA_OR_CARBON + #define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_ICON_RESOURCE + #include "wx/osx/icon.h" +#else + #define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_PNG_RESOURCE + #include "wx/generic/icon.h" +#endif +#elif defined(__WXCOCOA__) + #define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_ICON_RESOURCE + #include "wx/cocoa/icon.h" #elif defined(__WXPM__) + #define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_ICO_RESOURCE #include "wx/os2/icon.h" #endif +//----------------------------------------------------------------------------- +// wxVariant support +//----------------------------------------------------------------------------- + +#if wxUSE_VARIANT +#include "wx/variant.h" +DECLARE_VARIANT_OBJECT_EXPORTED(wxIcon,WXDLLIMPEXP_CORE) +#endif + + #endif // _WX_ICON_H_BASE_