don't eat Shift-Ctrl-[XCV] keys

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16879 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

src/msw/textctrl.cpp

@@ -1189,7 +1189,24 @@ bool wxTextCtrl::MSWShouldPreProcessMessage(WXMSG* pMsg)
         }
         else // no Alt
         {
-            if ( wxIsCtrlDown() )
+            // we want to process some Ctrl-foo and Shift-bar but no key
+            // combinations without either Ctrl or Shift nor with both of them
+            // pressed
+            const int ctrl = wxIsCtrlDown(),
+                      shift = wxIsShiftDown();
+            switch ( ctrl + shift )
+            {
+                default:
+                    wxFAIL_MSG( _T("how many modifiers have we got?") );
+                    // fall through
+
+                case 0:
+                case 2:
+                    break;
+
+                case 1:
+                    // either Ctrl or Shift pressed
+                    if ( ctrl )
                     {
                         switch ( vkey )
                         {
@@ -1203,13 +1220,14 @@ bool wxTextCtrl::MSWShouldPreProcessMessage(WXMSG* pMsg)
                                 return FALSE;
                         }
                     }
-            else if ( wxIsShiftDown() )
+                    else // Shift is pressed
                     {
                         if ( vkey == VK_INSERT || vkey == VK_DELETE )
                             return FALSE;
                     }
             }
         }
+    }
 
     return wxControl::MSWShouldPreProcessMessage(pMsg);
 }