X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/cbea3ec6ae2cd8c8d477c6f04a09ca8a1fa1ab96..66c2bf7b1d9326fb650acfaae22ec50528cfbf7c:/include/wx/icon.h?ds=sidebyside diff --git a/include/wx/icon.h b/include/wx/icon.h index bc4a80ad7e..27bb3e6921 100644 --- a/include/wx/icon.h +++ b/include/wx/icon.h @@ -5,7 +5,6 @@ // Modified by: // Created: // Copyright: (c) Julian Smart -// RCS-ID: $Id$ // Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// @@ -15,47 +14,49 @@ #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 -#elif defined(__WXMGL__) - #define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_ICO_RESOURCE -#elif defined(__WXMAC__) && wxOSX_USE_COCOA_OR_CARBON - #define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_ICON_RESOURCE -#else - #define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_XPM -#endif - -// a more readable way to tell -#define wxICON_SCREEN_DEPTH (-1) - -#if defined(__WXPALMOS__) - #include "wx/generic/icon.h" -#elif defined(__WXMSW__) #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__) + #define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_XPM #include "wx/generic/icon.h" #elif defined(__WXX11__) - #include "wx/generic/icon.h" -#elif defined(__WXMGL__) + #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__) #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