From 27005f3a3f26b3b7d413863c4e73c7c30ff6fcc1 Mon Sep 17 00:00:00 2001
From: Vadim Zeitlin <vadim@wxwidgets.org>
Date: Sat, 20 Mar 2004 12:45:26 +0000
Subject: [PATCH] explicitly return NFR_UNICODE from WM_NOTIFYFORMAT when using
 MSLU

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@26281 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/msw/window.cpp | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/msw/window.cpp b/src/msw/window.cpp
index 9a4db98241..d49586e8e3 100644
--- a/src/msw/window.cpp
+++ b/src/msw/window.cpp
@@ -2547,6 +2547,19 @@ WXLRESULT wxWindowMSW::MSWWindowProc(WXUINT message, WXWPARAM wParam, WXLPARAM l
             processed = HandleNotify((int)wParam, lParam, &rc.result);
             break;
 
+        // we only need to reply to WM_NOTIFYFORMAT manually when using MSLU,
+        // otherwise DefWindowProc() does it perfectly fine for us, but MSLU
+        // apparently doesn't always behave properly and needs some help
+#if wxUSE_UNICODE_MSLU && defined(NF_QUERY)
+        case WM_NOTIFYFORMAT:
+            if ( lParam == NF_QUERY )
+            {
+                processed = true;
+                rc.result = NFR_UNICODE;
+            }
+            break;
+#endif // wxUSE_UNICODE_MSLU
+
             // for these messages we must return true if process the message
 #ifdef WM_DRAWITEM
         case WM_DRAWITEM: