Moved function from mslu to utils to make the

linker not complain about double symbols.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29422 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/msw/mslu.cpp

@@ -27,14 +27,7 @@
 
 //------------------------------------------------------------------------
 
-#if !wxUSE_UNICODE_MSLU
+#if wxUSE_UNICODE_MSLU
-
-bool wxUsingUnicowsDll()
-{ 
-    return false; 
-}
-
-#else
 
 //------------------------------------------------------------------------
 //
@@ -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
 //------------------------------------------------------------------------

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
 // ----------------------------------------------------------------------------