Do not propagate key events from child controls unless they have modifiers

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

diff --git a/src/msw/textentry.cpp b/src/msw/textentry.cpp
index 4ea98d5bb0dc450453fd37884705350f1b2c9cfa..f8b91e383cd78c7f5deb7f32e05fcc2b87ca1dd5 100644 (file)
--- a/src/msw/textentry.cpp
+++ b/src/msw/textentry.cpp
@@ -103,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);
         }


@@ -243,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);


@@ -336,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) )
     {


@@ -360,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) )
     {