X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/07158944d86fc3895c24a5a9848616405d3d91db..f14d6dd133f96d7110b9ff635e977349b1806238:/include/wx/apptrait.h diff --git a/include/wx/apptrait.h b/include/wx/apptrait.h index 10e4d6b8dc..ef7686fd46 100644 --- a/include/wx/apptrait.h +++ b/include/wx/apptrait.h @@ -142,11 +142,12 @@ public: // include the platform-specific version of the class // ---------------------------------------------------------------------------- -// NB: test for __UNIX__ before __WXMAC__ as under Darwin we want to use the -// Unix code (and otherwise __UNIX__ wouldn't be defined) +// NB: test for __UNIX__ before __WXMAC__ as under Darwin we want to use the +// Unix code (and otherwise __UNIX__ wouldn't be defined) +// ABX: check __WIN32__ instead of __WXMSW__ for the same MSWBase in any Win32 port #if defined(__WXPALMOS__) #include "wx/palmos/apptbase.h" -#elif defined(__WXMSW__) +#elif defined(__WIN32__) #include "wx/msw/apptbase.h" #elif defined(__UNIX__) && !defined(__EMX__) #include "wx/unix/apptbase.h" @@ -229,9 +230,10 @@ public: // include the platform-specific version of the classes above // ---------------------------------------------------------------------------- +// ABX: check __WIN32__ instead of __WXMSW__ for the same MSWBase in any Win32 port #if defined(__WXPALMOS__) #include "wx/palmos/apptrait.h" -#elif defined(__WXMSW__) +#elif defined(__WIN32__) #include "wx/msw/apptrait.h" #elif defined(__UNIX__) && !defined(__EMX__) #include "wx/unix/apptrait.h"