Disable some wxWebView tests that fail on the buildbot but not locally.

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

diff --git a/src/msw/textentry.cpp b/src/msw/textentry.cpp
index ba18dd0445c5f317dbc7053ca2422e0c07a26184..e993654d249529ed037ec6991b675cb5037a4cc4 100644 (file)
--- a/src/msw/textentry.cpp
+++ b/src/msw/textentry.cpp
@@ -34,6 +34,8 @@
 #include "wx/textcompleter.h"
 #include "wx/dynlib.h"
 
 #include "wx/textcompleter.h"
 #include "wx/dynlib.h"
 

+#include <initguid.h>
+

 #include "wx/msw/private.h"
 
 #if wxUSE_UXTHEME
 #include "wx/msw/private.h"
 
 #if wxUSE_UXTHEME


@@ -73,6 +75,10 @@
     #define SHACF_FILESYS_ONLY 0x00000010
 #endif
 
     #define SHACF_FILESYS_ONLY 0x00000010
 #endif
 

+#ifndef SHACF_FILESYS_DIRS
+    #define SHACF_FILESYS_DIRS 0x00000020
+#endif
+

 namespace
 {
 
 namespace
 {
 


@@ -738,7 +744,7 @@ void wxTextEntry::GetSelection(long *from, long *to) const
 
 #ifdef HAS_AUTOCOMPLETE
 
 
 #ifdef HAS_AUTOCOMPLETE
 

-bool wxTextEntry::DoAutoCompleteFileNames()
+bool wxTextEntry::DoAutoCompleteFileNames(int flags)

 {
     typedef HRESULT (WINAPI *SHAutoComplete_t)(HWND, DWORD);
     static SHAutoComplete_t s_pfnSHAutoComplete = (SHAutoComplete_t)-1;
 {
     typedef HRESULT (WINAPI *SHAutoComplete_t)(HWND, DWORD);
     static SHAutoComplete_t s_pfnSHAutoComplete = (SHAutoComplete_t)-1;


@@ -758,7 +764,18 @@ bool wxTextEntry::DoAutoCompleteFileNames()
     if ( !s_pfnSHAutoComplete )
         return false;
 
     if ( !s_pfnSHAutoComplete )
         return false;
 

-    HRESULT hr = (*s_pfnSHAutoComplete)(GetEditHwnd(), SHACF_FILESYS_ONLY);
+    DWORD dwFlags = 0;
+    if ( flags & wxFILE )
+        dwFlags |= SHACF_FILESYS_ONLY;
+    else if ( flags & wxDIR )
+        dwFlags |= SHACF_FILESYS_DIRS;
+    else
+    {
+        wxFAIL_MSG(wxS("No flags for file name auto completion?"));
+        return false;
+    }
+
+    HRESULT hr = (*s_pfnSHAutoComplete)(GetEditHwnd(), dwFlags);

     if ( FAILED(hr) )
     {
         wxLogApiError(wxT("SHAutoComplete()"), hr);
     if ( FAILED(hr) )
     {
         wxLogApiError(wxT("SHAutoComplete()"), hr);


@@ -831,9 +848,9 @@ bool wxTextEntry::DoAutoCompleteCustom(wxTextCompleter *completer)
 
 // We still need to define stubs as we declared these overrides in the header.
 
 
 // We still need to define stubs as we declared these overrides in the header.
 

-bool wxTextEntry::DoAutoCompleteFileNames()
+bool wxTextEntry::DoAutoCompleteFileNames(int flags)

 {
 {

-    return wxTextEntryBase::DoAutoCompleteFileNames();
+    return wxTextEntryBase::DoAutoCompleteFileNames(flags);

 }
 
 bool wxTextEntry::DoAutoCompleteStrings(const wxArrayString& choices)
 }
 
 bool wxTextEntry::DoAutoCompleteStrings(const wxArrayString& choices)