Fix a bug where deactivating the mark fails on Visual Studio.

diff --git a/xkeymacsdll/Commands.cpp b/xkeymacsdll/Commands.cpp
index 44f830d..b291689 100644 (file)
--- a/xkeymacsdll/Commands.cpp
+++ b/xkeymacsdll/Commands.cpp
@@ -1259,19 +1259,14 @@ DWORD CCommands::ClickCaret()
 \r
 DWORD CCommands::DeactivateMark()\r
 {\r
-       if (CUtils::IsOpenOffice()\r
-        || CUtils::IsVisualBasicEditor()) {\r
-               // GetCaretPos always returen (x,y) = (0,0) on OpenOffice, so ...\r
+       if (CUtils::IsOpenOffice() || CUtils::IsVisualStudio() || CUtils::IsVisualBasicEditor()) {\r
+               // GetCaretPos always returen (x,y) = (0,0) on OpenOffice and Visual Studio, so ...\r
                // GetCaretPos always returen (x,y) = (-2199,*) on M$ Excel VBE, so ...\r
                Kdu(VK_ESCAPE);\r
                return ERROR_SUCCESS;   // i.e. return 0;\r
        }\r
-       if (CUtils::IsFlash()\r
-        || CUtils::IsInternetExplorer()\r
-        || CUtils::IsMicrosoftPowerPoint()\r
-        || CUtils::IsMicrosoftWord()\r
-        || CUtils::IsSleipnir()\r
-        || CUtils::IsThunderbird()) {\r
+       if (CUtils::IsFlash() || CUtils::IsInternetExplorer() || CUtils::IsMicrosoftPowerPoint() ||\r
+                       CUtils::IsMicrosoftWord() || CUtils::IsSleipnir() || CUtils::IsThunderbird()) {\r
                // GetCaretPos always returen (x,y) = (0,0) on M$ Word and Thunderbird, so ...\r
                // GetCaretPos always returen start point on IE (and Sleipnir that uses IE), so ...\r
                Kdu(VK_RIGHT);\r
@@ -1287,16 +1282,6 @@ DWORD CCommands::DeactivateMark()
                AdKduAu('E', 'I');\r
                return ERROR_SUCCESS;   // i.e. return 0;\r
        }\r
-       if (CUtils::IsVisualStudio()) { // Ctrl + Click select a word on Visual Studio .NET\r
-               BOOL bIsCtrlDown = CXkeymacsDll::IsDown(VK_CONTROL);\r
-               if (bIsCtrlDown)\r
-                       ReleaseKey(VK_CONTROL);\r
-               DWORD res = ClickCaret();\r
-               if (bIsCtrlDown)\r
-                       DepressKey(VK_CONTROL);\r
-               return res;\r
-       }\r
-\r
        return ClickCaret();\r
 }\r
 \r