X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7f37eded21431a8464cf4b59a39667ded9e5fc09..2a45803fc3877afd0ae3ce356dfe216505165882:/include/wx/icon.h diff --git a/include/wx/icon.h b/include/wx/icon.h index f44f6fa002..5eebb3f38e 100644 --- a/include/wx/icon.h +++ b/include/wx/icon.h @@ -23,17 +23,18 @@ // 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__) #define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_XPM #include "wx/motif/icon.h" #elif defined(__WXGTK20__) - #define wxICON_DEFAULT_TYPE wxBITMAP_TYPE_XPM + #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 @@ -41,9 +42,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"