diff --git a/src/msw/mslu.cpp b/src/msw/mslu.cpp index 3e63d04fb2..cdd08914c8 100644 --- a/src/msw/mslu.cpp +++ b/src/msw/mslu.cpp @@ -27,14 +27,7 @@ //------------------------------------------------------------------------ -#if !wxUSE_UNICODE_MSLU - -bool wxUsingUnicowsDll() -{ - return false; -} - -#else +#if wxUSE_UNICODE_MSLU //------------------------------------------------------------------------ // @@ -65,13 +58,6 @@ bool wxUsingUnicowsDll() #undef GetOpenFileNameW #undef GetSaveFileNameW -// Returns true if we are running under Unicode emulation in Win9x environment. -// Workaround hacks take effect only if this condition is met -bool wxUsingUnicowsDll() -{ - return (wxGetOsVersion() == wxWIN95); -} - //------------------------------------------------------------------------ // Wrongly implemented functions from unicows.dll //------------------------------------------------------------------------ diff --git a/src/msw/utils.cpp b/src/msw/utils.cpp index eb91843d61..0e56e5d0f8 100644 --- a/src/msw/utils.cpp +++ b/src/msw/utils.cpp @@ -111,6 +111,22 @@ static const wxChar eUSERNAME[] = wxT("UserName"); // implementation // ============================================================================ +#if !wxUSE_UNICODE_MSLU + +bool wxUsingUnicowsDll() +{ + return false; +} + +#else + +bool wxUsingUnicowsDll() +{ + return (wxGetOsVersion() == wxWIN95); +} + +#endif + // ---------------------------------------------------------------------------- // get host name and related // ----------------------------------------------------------------------------