X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/3185abc27836dab3e27221ec60e52fddc984e76b..2a45803fc3877afd0ae3ce356dfe216505165882:/include/wx/apptrait.h?ds=sidebyside diff --git a/include/wx/apptrait.h b/include/wx/apptrait.h index c5df2d7e0c..59861fbfec 100644 --- a/include/wx/apptrait.h +++ b/include/wx/apptrait.h @@ -77,12 +77,6 @@ public: // except in the case of wxMac and wxCocoa virtual wxStandardPaths& GetStandardPaths(); -#if wxUSE_INTL - // called during wxApp initialization to set the locale to correspond to - // the user default (i.e. system locale under Windows, LC_ALL under Unix) - virtual void SetLocale(); -#endif // wxUSE_INTL - // functions abstracting differences between GUI and console modes // ------------------------------------------------------------------------ @@ -177,9 +171,7 @@ private: // 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(__WIN32__) +#if defined(__WIN32__) #include "wx/msw/apptbase.h" #elif defined(__UNIX__) && !defined(__EMX__) #include "wx/unix/apptbase.h" @@ -274,9 +266,7 @@ public: // ---------------------------------------------------------------------------- // ABX: check __WIN32__ instead of __WXMSW__ for the same MSWBase in any Win32 port -#if defined(__WXPALMOS__) - #include "wx/palmos/apptrait.h" -#elif defined(__WIN32__) +#if defined(__WIN32__) #include "wx/msw/apptrait.h" #elif defined(__OS2__) #include "wx/os2/apptrait.h"