X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/5e7718a281fbb372c68354ea815784b02c4f686e..9556c0f1b3dec367bf2bdc3eef7b1d54668adcf7:/src/msw/treectrl.cpp

diff --git a/src/msw/treectrl.cpp b/src/msw/treectrl.cpp
index ba700d35ee..cd18d9d3f3 100644
--- a/src/msw/treectrl.cpp
+++ b/src/msw/treectrl.cpp
@@ -757,6 +757,8 @@ bool wxTreeCtrl::Create(wxWindow *parent,
 
     SetSize(pos.x, pos.y, size.x, size.y);
 
+    wxSetCCUnicodeFormat(GetHwnd());
+
     return true;
 }
 
@@ -2138,10 +2140,10 @@ bool wxTreeCtrl::MSWCommand(WXUINT cmd, WXWORD id)
 // only do it during dragging, minimize wxWin overhead (this is important for
 // WM_MOUSEMOVE as they're a lot of them) by catching Windows messages directly
 // instead of passing by wxWin events
-long wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
+WXLRESULT wxTreeCtrl::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
 {
     bool processed = false;
-    long rc = 0;
+    WXLRESULT rc = 0;
     bool isMultiple = (GetWindowStyle() & wxTR_MULTIPLE) != 0;
 
     if ( (nMsg >= WM_MOUSEFIRST) && (nMsg <= WM_MOUSELAST) )