respect the encoding of the text style and not only the global control font encoding...

[wxWidgets.git] / src / msw / utilsgui.cpp

diff --git a/src/msw/utilsgui.cpp b/src/msw/utilsgui.cpp
index c49738c79656c1f3c0f16cefcf4397ca10166862..d1acea6ad5e2d32c31e485edd7d6bc7534810e4d 100644 (file)
--- a/src/msw/utilsgui.cpp
+++ b/src/msw/utilsgui.cpp
@@ -30,6 +30,8 @@
     #include "wx/utils.h"
 #endif //WX_PRECOMP
 
     #include "wx/utils.h"
 #endif //WX_PRECOMP
 

+#include "wx/dynlib.h"
+

 #include "wx/msw/private.h"     // includes <windows.h>
 
 // ============================================================================
 #include "wx/msw/private.h"     // includes <windows.h>
 
 // ============================================================================


@@ -157,7 +159,7 @@ extern HCURSOR wxGetCurrentBusyCursor()
 }
 
 // Set the cursor to the busy cursor for all windows
 }
 
 // Set the cursor to the busy cursor for all windows

-void wxBeginBusyCursor(wxCursor *cursor)
+void wxBeginBusyCursor(const wxCursor *cursor)

 {
     if ( gs_wxBusyCursorCount++ == 0 )
     {
 {
     if ( gs_wxBusyCursorCount++ == 0 )
     {


@@ -257,7 +259,7 @@ void wxGetMousePosition( int* x, int* y )
     GetCursorPos( & pt );
     if ( x ) *x = pt.x;
     if ( y ) *y = pt.y;
     GetCursorPos( & pt );
     if ( x ) *x = pt.x;
     if ( y ) *y = pt.y;

-};
+}

 
 // Return true if we have a colour display
 bool wxColourDisplay()
 
 // Return true if we have a colour display
 bool wxColourDisplay()


@@ -267,7 +269,7 @@ bool wxColourDisplay()
     return true;
 #else
     // this function is called from wxDC ctor so it is called a *lot* of times
     return true;
 #else
     // this function is called from wxDC ctor so it is called a *lot* of times

-    // hence we optimize it a bit but doign the check only once
+    // hence we optimize it a bit but doing the check only once

     //
     // this should be MT safe as only the GUI thread (holding the GUI mutex)
     // can call us
     //
     // this should be MT safe as only the GUI thread (holding the GUI mutex)
     // can call us


@@ -452,3 +454,50 @@ void wxDrawLine(HDC hdc, int x1, int y1, int x2, int y2)
 }
 
 
 }
 
 

+// ----------------------------------------------------------------------------
+// Shell API wrappers
+// ----------------------------------------------------------------------------
+
+extern bool wxEnableFileNameAutoComplete(HWND hwnd)
+{
+#if wxUSE_DYNLIB_CLASS
+    typedef HRESULT (WINAPI *SHAutoComplete_t)(HWND, DWORD);
+
+    static SHAutoComplete_t s_pfnSHAutoComplete = NULL;
+    static bool s_initialized = false;
+
+    if ( !s_initialized )
+    {
+        s_initialized = true;
+
+        wxLogNull nolog;
+        wxDynamicLibrary dll(_T("shlwapi.dll"));
+        if ( dll.IsLoaded() )
+        {
+            s_pfnSHAutoComplete =
+                (SHAutoComplete_t)dll.GetSymbol(_T("SHAutoComplete"));
+            if ( s_pfnSHAutoComplete )
+            {
+                // won't be unloaded until the process termination, no big deal
+                dll.Detach();
+            }
+        }
+    }
+
+    if ( !s_pfnSHAutoComplete )
+        return false;
+
+    HRESULT hr = s_pfnSHAutoComplete(hwnd, 0x10 /* SHACF_FILESYS_ONLY */);
+    if ( FAILED(hr) )
+    {
+        wxLogApiError(_T("SHAutoComplete"), hr);
+        return false;
+    }
+
+    return true;
+#else
+    wxUnusedVar(hwnd);
+    return false;
+#endif // wxUSE_DYNLIB_CLASS/!wxUSE_DYNLIB_CLASS
+}
+