fixing dangling includes

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

diff --git a/src/msw/textentry.cpp b/src/msw/textentry.cpp
index 65fbc3031f3bf270cdd24577f7dfeddb29f0e160..f8b91e383cd78c7f5deb7f32e05fcc2b87ca1dd5 100644 (file)
--- a/src/msw/textentry.cpp
+++ b/src/msw/textentry.cpp
@@ -41,12 +41,17 @@
 // wxIEnumString implements IEnumString interface
 // ----------------------------------------------------------------------------
 
 // wxIEnumString implements IEnumString interface
 // ----------------------------------------------------------------------------
 

-#if wxUSE_OLE
+// standard VC6 SDK (WINVER == 0x0400) does not know about IAutoComplete
+#if wxUSE_OLE && (WINVER >= 0x0500)
+    #define HAS_AUTOCOMPLETE
+#endif
+
+#ifdef HAS_AUTOCOMPLETE

 
 #include "wx/msw/ole/oleutils.h"
 #include <shldisp.h>
 
 
 #include "wx/msw/ole/oleutils.h"
 #include <shldisp.h>
 

-#if defined(__MINGW32__)
+#if defined(__MINGW32__) || defined (__WATCOMC__)

     // needed for IID_IAutoComplete, IID_IAutoComplete2 and ACO_AUTOSUGGEST
     #include <shlguid.h>
 #endif
     // needed for IID_IAutoComplete, IID_IAutoComplete2 and ACO_AUTOSUGGEST
     #include <shlguid.h>
 #endif


@@ -90,7 +95,7 @@ public:
             if ( m_index == count )
                 return S_FALSE;
 
             if ( m_index == count )
                 return S_FALSE;
 

-            const wxWX2WCbuf wcbuf(m_strings[m_index].wc_str());
+            const wxWX2WCbuf wcbuf = m_strings[m_index].wc_str();

             const size_t size = (wcslen(wcbuf) + 1)*sizeof(wchar_t);
             void *olestr = CoTaskMemAlloc(size);
             if ( !olestr )
             const size_t size = (wcslen(wcbuf) + 1)*sizeof(wchar_t);
             void *olestr = CoTaskMemAlloc(size);
             if ( !olestr )


@@ -98,7 +103,7 @@ public:
 
             memcpy(olestr, wcbuf, size);
 
 
             memcpy(olestr, wcbuf, size);
 

-            *rgelt++ = wx_static_cast(LPOLESTR, olestr);
+            *rgelt++ = static_cast<LPOLESTR>(olestr);

 
             ++(*pceltFetched);
         }
 
             ++(*pceltFetched);
         }


@@ -160,7 +165,7 @@ END_IID_TABLE;
 
 IMPLEMENT_IUNKNOWN_METHODS(wxIEnumString)
 
 
 IMPLEMENT_IUNKNOWN_METHODS(wxIEnumString)
 

-#endif // wxUSE_OLE
+#endif // HAS_AUTOCOMPLETE

 
 // ============================================================================
 // wxTextEntry implementation
 
 // ============================================================================
 // wxTextEntry implementation


@@ -238,6 +243,11 @@ bool wxTextEntry::CanRedo() const
 
 void wxTextEntry::SetInsertionPoint(long pos)
 {
 
 void wxTextEntry::SetInsertionPoint(long pos)
 {

+    // calling DoSetSelection(-1, -1) would select everything which is not what
+    // we want here
+    if ( pos == -1 )
+        pos = GetLastPosition();
+

     // be careful to call DoSetSelection() which is overridden in wxTextCtrl
     // and not just SetSelection() here
     DoSetSelection(pos, pos);
     // be careful to call DoSetSelection() which is overridden in wxTextCtrl
     // and not just SetSelection() here
     DoSetSelection(pos, pos);


@@ -283,17 +293,15 @@ void wxTextEntry::GetSelection(long *from, long *to) const
 // ----------------------------------------------------------------------------
 
 #if wxUSE_OLE
 // ----------------------------------------------------------------------------
 
 #if wxUSE_OLE

-

 bool wxTextEntry::AutoCompleteFileNames()
 {
 bool wxTextEntry::AutoCompleteFileNames()
 {

+#ifdef HAS_AUTOCOMPLETE

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

-        wxLogNull noLog;
-
-        if ( !s_dllShlwapi.Load(_T("shlwapi.dll"), wxDL_VERBATIM) )
+        if ( !s_dllShlwapi.Load(_T("shlwapi.dll"), wxDL_VERBATIM | wxDL_QUIET) )

         {
             s_pfnSHAutoComplete = NULL;
         }
         {
             s_pfnSHAutoComplete = NULL;
         }


@@ -313,12 +321,15 @@ bool wxTextEntry::AutoCompleteFileNames()
 
         return false;
     }
 
         return false;
     }

-

     return true;
     return true;

+#else // !HAS_AUTOCOMPLETE
+    return false;
+#endif // HAS_AUTOCOMPLETE/!HAS_AUTOCOMPLETE

 }
 
 bool wxTextEntry::AutoComplete(const wxArrayString& choices)
 {
 }
 
 bool wxTextEntry::AutoComplete(const wxArrayString& choices)
 {

+#ifdef HAS_AUTOCOMPLETE

     // create an object exposing IAutoComplete interface (don't go for
     // IAutoComplete2 immediately as, presumably, it might be not available on
     // older systems as otherwise why do we have both -- although in practice I
     // create an object exposing IAutoComplete interface (don't go for
     // IAutoComplete2 immediately as, presumably, it might be not available on
     // older systems as otherwise why do we have both -- although in practice I


@@ -330,7 +341,7 @@ bool wxTextEntry::AutoComplete(const wxArrayString& choices)
                     NULL,
                     CLSCTX_INPROC_SERVER,
                     IID_IAutoComplete,
                     NULL,
                     CLSCTX_INPROC_SERVER,
                     IID_IAutoComplete,

-                    wx_reinterpret_cast(void **, &pAutoComplete)
+                    reinterpret_cast<void **>(&pAutoComplete)

                  );
     if ( FAILED(hr) )
     {
                  );
     if ( FAILED(hr) )
     {


@@ -354,7 +365,7 @@ bool wxTextEntry::AutoComplete(const wxArrayString& choices)
     hr = pAutoComplete->QueryInterface
                         (
                            IID_IAutoComplete2,
     hr = pAutoComplete->QueryInterface
                         (
                            IID_IAutoComplete2,

-                           wx_reinterpret_cast(void **, &pAutoComplete2)
+                           reinterpret_cast<void **>(&pAutoComplete2)

                         );
     if ( SUCCEEDED(hr) )
     {
                         );
     if ( SUCCEEDED(hr) )
     {


@@ -366,10 +377,13 @@ bool wxTextEntry::AutoComplete(const wxArrayString& choices)
     // do it immediately, presumably the edit control itself keeps a reference
     // to the auto completer object
     pAutoComplete->Release();
     // do it immediately, presumably the edit control itself keeps a reference
     // to the auto completer object
     pAutoComplete->Release();

-

     return true;
     return true;

-}
+#else // !HAS_AUTOCOMPLETE
+    wxUnusedVar(choices);

 
 

+    return false;
+#endif // HAS_AUTOCOMPLETE/!HAS_AUTOCOMPLETE
+}

 #endif // wxUSE_OLE
 
 // ----------------------------------------------------------------------------
 #endif // wxUSE_OLE
 
 // ----------------------------------------------------------------------------