X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/c48d0d37c22b74ce0ff9f324c7426892b5d57332..d7b468788e860e7e39bb55bb921f757207b6f9fe:/include/wx/icon.h diff --git a/include/wx/icon.h b/include/wx/icon.h index 5dca8e8b13..3b7b9b20a5 100644 --- a/include/wx/icon.h +++ b/include/wx/icon.h @@ -23,10 +23,7 @@ // constant defines the default argument value for wxIcon ctor and wxIcon::LoadFile() // functions. -#if defined(__WXPALMOS__) - #define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_XPM - #include "wx/generic/icon.h" -#elif defined(__WXMSW__) +#if defined(__WXMSW__) #define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_ICO_RESOURCE #include "wx/msw/icon.h" #elif defined(__WXMOTIF__) @@ -41,9 +38,6 @@ #elif defined(__WXX11__) #define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_XPM #include "wx/generic/icon.h" -#elif defined(__WXMGL__) - #define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_ICO_RESOURCE - #include "wx/generic/icon.h" #elif defined(__WXDFB__) #define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_XPM #include "wx/generic/icon.h" @@ -52,7 +46,7 @@ #define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_ICON_RESOURCE #include "wx/osx/icon.h" #else - #define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_XPM + #define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_PNG_RESOURCE #include "wx/generic/icon.h" #endif #elif defined(__WXCOCOA__)