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

diff --git a/src/msw/mslu.cpp b/src/msw/mslu.cpp
index 3e63d04fb25b795fa8739dd9bca36ab74d77d245..cdd08914c8123db82f0de5eb21cb4da800ba46be 100644 (file)
--- 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 eb91843d616c5aef2a67f8ed3144457ea7b0479a..0e56e5d0f89f2ea060f35d3faf217e4828e8e442 100644 (file)
--- 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
 // ----------------------------------------------------------------------------