Remove obsolete or unused code from CUtils.

diff --git a/xkeymacs/xkeymacs.cpp b/xkeymacs/xkeymacs.cpp
index 4505008..db40ccc 100644 (file)
--- a/xkeymacs/xkeymacs.cpp
+++ b/xkeymacs/xkeymacs.cpp
@@ -73,8 +73,6 @@ BOOL CXkeymacsApp::InitInstance()
        m_pMainWnd->UpdateWindow();\r
        SetClassLongPtr(m_pMainWnd->m_hWnd, GCLP_HICON, (LONG_PTR)LoadIcon(IDR_MAINFRAME));\r
 \r
-       // set registry key\r
-       CUtils::InitCUtils();\r
        if (!Start64bitProcess())\r
                return FALSE;\r
        CProfile::InitDllData();\r

diff --git a/xkeymacs/xkeymacs64.cpp b/xkeymacs/xkeymacs64.cpp
index 6565aa0..fab4f08 100644 (file)
--- a/xkeymacs/xkeymacs64.cpp
+++ b/xkeymacs/xkeymacs64.cpp
@@ -30,7 +30,6 @@ BOOL CXkeymacsApp::InitInstance()
        m_pMainWnd->ShowWindow(SW_HIDE);\r
        m_pMainWnd->UpdateWindow();\r
 \r
-       CUtils::InitCUtils();\r
        AfxBeginThread(PollIPCMessage, NULL);\r
        if (start32bit)\r
                Start32bitProcess();\r

diff --git a/xkeymacsdll/Commands.cpp b/xkeymacsdll/Commands.cpp
index 0f958c7..c8f784f 100644 (file)
--- a/xkeymacsdll/Commands.cpp
+++ b/xkeymacsdll/Commands.cpp
@@ -1007,9 +1007,7 @@ int CCommands::SaveBuffersKillEmacs()
        if (CUtils::IsConsole()) {\r
                SystemMenu(CMD_CLOSE);\r
        } else if (CUtils::IsExplorer()) {\r
-               if (!CUtils::IsXPorLater()) {\r
-                       ReleaseKey(VK_CONTROL);\r
-               }\r
+               ReleaseKey(VK_CONTROL);\r
                AdKduAu(VK_F4);\r
        } else if (CUtils::IsInternetExplorer()\r
                        || CUtils::IsJavaW()) {\r

diff --git a/xkeymacsdll/Utils.cpp b/xkeymacsdll/Utils.cpp
index 133ced5..bac5b99 100644 (file)
--- a/xkeymacsdll/Utils.cpp
+++ b/xkeymacsdll/Utils.cpp
@@ -9,7 +9,6 @@
 #pragma data_seg(".xkmcs")\r
 TCHAR CUtils::m_szApplicationName[MAX_PATH] = {'\0'};\r
 TCHAR CUtils::m_szIMEName[MAX_PATH] = _T("IME");       // IDS_IME_FILE_NAME\r
-OSVERSIONINFO CUtils::m_OsVersionInfo = {sizeof(OSVERSIONINFO)};\r
 #pragma data_seg()\r
 \r
 BOOL CUtils::GetFindDialogTitle(CString *szDialogTitle)\r
@@ -391,26 +390,6 @@ void CUtils::SetApplicationName(BOOL bImeComposition)
        }\r
 }\r
 \r
-void CUtils::SetIMEName()\r
-{\r
-       HKL hKL = GetKeyboardLayout(0);\r
-       if (ImmIsIME(hKL)) {\r
-               ImmGetIMEFileName(hKL, m_szIMEName, sizeof(m_szIMEName));\r
-       }\r
-}\r
-\r
-void CUtils::InitCUtils()\r
-{\r
-       GetVersionEx(&m_OsVersionInfo);\r
-       SetIMEName();\r
-}\r
-\r
-BOOL CUtils::IsXPorLater()\r
-{\r
-       return 5 < m_OsVersionInfo.dwMajorVersion\r
-               || 5 == m_OsVersionInfo.dwMajorVersion && 1 <= m_OsVersionInfo.dwMinorVersion;\r
-}\r
-\r
 BOOL CUtils::OpenClipboard()\r
 {\r
        // OpenClipboard will fail on OpenOffice.org/LibreOffice at the first time\r
@@ -1028,26 +1007,6 @@ BOOL CUtils::IsVisualSlickEdit()
        return !_tcsicmp(m_szApplicationName, _T("vs.exe"));\r
 }\r
 \r
-void CUtils::PrintWindowInfo(WINDOWINFO *pwi)\r
-{\r
-       Log(_T("windowinfo.cbSize: %d"), pwi->cbSize);\r
-       Log(_T("windowinfo.rcWindow.top: %d"), pwi->rcWindow.top);\r
-       Log(_T("windowinfo.rcWindow.bottom: %d"), pwi->rcWindow.bottom);\r
-       Log(_T("windowinfo.rcWindow.left: %d"), pwi->rcWindow.left);\r
-       Log(_T("windowinfo.rcWindow.right: %d"), pwi->rcWindow.right);\r
-       Log(_T("windowinfo.rcClient.top: %d"), pwi->rcClient.top);\r
-       Log(_T("windowinfo.rcClient.bottom: %d"), pwi->rcClient.bottom);\r
-       Log(_T("windowinfo.rcClient.left: %d"), pwi->rcClient.left);\r
-       Log(_T("windowinfo.rcClient.right: %d"), pwi->rcClient.right);\r
-       Log(_T("windowinfo.dwStyle: %d"), pwi->dwStyle);\r
-       Log(_T("windowinfo.dwExStyle: %d"), pwi->dwExStyle);\r
-       Log(_T("windowinfo.dwWindowStatus: %d"), pwi->dwWindowStatus);\r
-       Log(_T("windowinfo.cxWindowBorders: %d"), pwi->cxWindowBorders);\r
-       Log(_T("windowinfo.cyWindowBorders: %d"), pwi->cyWindowBorders);\r
-       Log(_T("windowinfo.atomWindowType: %d"), pwi->atomWindowType);\r
-       Log(_T("windowinfo.wCreatorVersion: %d"), pwi->wCreatorVersion);\r
-}\r
-\r
 BOOL CUtils::IsOpenJane()\r
 {\r
        return !_tcsicmp(m_szApplicationName, _T("Jane2ch.exe"));\r

diff --git a/xkeymacsdll/Utils.h b/xkeymacsdll/Utils.h
index c799053..049c5b6 100644 (file)
--- a/xkeymacsdll/Utils.h
+++ b/xkeymacsdll/Utils.h
@@ -19,7 +19,6 @@ public:
        static int GetWindowTextType(CString strWindowText);\r
        static BOOL IsThunderbird();\r
        static BOOL IsOpenJane();\r
-       static void PrintWindowInfo(WINDOWINFO *pwi);\r
        static BOOL IsVisualSlickEdit();\r
        static BOOL IsMSDN();\r
        static BOOL IsJavaW();\r
@@ -36,7 +35,6 @@ public:
        static BOOL IsIPMessenger();\r
        static BOOL IsDana();\r
        static BOOL IsJmEditor();\r
-       static BOOL IsXPorLater();\r
        static BOOL IsEdLeaf();\r
        static BOOL IsShuriken();\r
        static BOOL IsAutla();\r
@@ -87,7 +85,6 @@ public:
        static BOOL IsEmacs();\r
        static BOOL SetClipboardText(const CString& text);\r
        static BOOL GetClipboardText(CString& text);\r
-       static void InitCUtils();\r
        static void SetApplicationName(BOOL bImeComposition);\r
        static LPCTSTR const GetApplicationName();\r
        static BOOL IsXyzzy();\r
@@ -124,8 +121,6 @@ private:
        static void FairConsoleApplicationName(LPTSTR szApplicationName, LPTSTR szWindowText);\r
        static BOOL IsConsole(LPCTSTR szApplicationName);\r
        static BOOL IsJavaW(LPCTSTR szApplicationName);\r
-       static void SetIMEName();\r
-       static OSVERSIONINFO m_OsVersionInfo;\r
        static TCHAR m_szIMEName[MAX_PATH];\r
        static TCHAR m_szApplicationName[MAX_PATH];\r
 };\r

diff --git a/xkeymacsdll/xkeymacsdll.cpp b/xkeymacsdll/xkeymacsdll.cpp
index 85c316a..f8e9979 100644 (file)
--- a/xkeymacsdll/xkeymacsdll.cpp
+++ b/xkeymacsdll/xkeymacsdll.cpp
@@ -918,12 +918,8 @@ void CXkeymacsDll::DoKeybd_event(BYTE bVk, DWORD dwFlags)
                break;\r
 \r
        case VK_SHIFT:\r
-               if (m_bRightShift) {\r
-                       if (CUtils::IsXPorLater())\r
-                               bVk = VK_RSHIFT;\r
-                       else\r
-                               dwFlags |= KEYEVENTF_EXTENDEDKEY;\r
-               }\r
+               if (m_bRightShift)\r
+                       bVk = VK_RSHIFT;\r
                break;\r
        case VK_PAUSE:\r
                if (IsDown(VK_CONTROL, FALSE)) // Break\r