Commit: 91ee60b4c9b38e2806ba74b80531e12f3d31103c - xkeymacs64 (git)

XKeymacs for 64bit Windows

Commit MetaInfo

• Revision: 91ee60b4c9b38e2806ba74b80531e12f3d31103c (tree)
• Time: 2011-05-27 08:38:33
• Author: Kazuhiro Fujieda <fujieda@user...>
• Commiter: Kazuhiro Fujieda

Log Message

Make all member functions of CXkeymacsDll static.
Make CMainFrame::m_pPropertiesDlg private.

Change Summary

• modified: xkeymacs/mainfrm.cpp
• modified: xkeymacs/mainfrm.h
• modified: xkeymacs/optionsdlg.cpp
• modified: xkeymacs/profile.cpp
• modified: xkeymacs/xkeymacs.cpp
• modified: xkeymacsdll/xkeymacsdll.cpp
• modified: xkeymacsdll/xkeymacsdll.h

Incremental Difference

--- a/xkeymacs/mainfrm.cpp
+++ b/xkeymacs/mainfrm.cpp
@@ -43,7 +43,6 @@ END_MESSAGE_MAP()
 
 CMainFrame::CMainFrame()
 {
-	m_pXkeymacsDll			= new CXkeymacsDll;
 	m_pPropertiesDlg		= new CProperties;
 	m_nResultPropertiesDlg	= -1;
 	m_bPropertiesDlgExist	= FALSE;
@@ -87,9 +86,6 @@ CMainFrame::CMainFrame()
 
 CMainFrame::~CMainFrame()
 {
-	delete m_pXkeymacsDll;
-	m_pXkeymacsDll = NULL;
-
 	delete m_pPropertiesDlg;
 	m_pPropertiesDlg = NULL;
 
@@ -114,7 +110,7 @@ int CMainFrame::OnCreate(const LPCREATESTRUCT lpCreateStruct)
 		return -1;
 	}
 
-	m_pXkeymacsDll->Set106Keyboard(CProfile::Is106Keyboard());
+	CXkeymacsDll::Set106Keyboard(CProfile::Is106Keyboard());
 
 	// init notify icon data
 	NOTIFYICONDATA notifyIconData[MAX_ICON_TYPE] = {
@@ -149,7 +145,7 @@ int CMainFrame::OnCreate(const LPCREATESTRUCT lpCreateStruct)
 			   sizeof(notifyIconData[ALT_ICON].szTip));
 
 	// set notify icon data
-	m_pXkeymacsDll->SetNotifyIconData(MAIN_ICON, notifyIconData[MAIN_ICON],
+	CXkeymacsDll::SetNotifyIconData(MAIN_ICON, notifyIconData[MAIN_ICON],
 		(HICON)::LoadImage(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDR_MAINFRAME), IMAGE_ICON, 16, 16, LR_SHARED),
 		(HICON)::LoadImage(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDR_MAIN_DISABLE_TMP), IMAGE_ICON, 16, 16, LR_SHARED),
 		(HICON)::LoadImage(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDR_MAIN_DISABLE_WOCQ), IMAGE_ICON, 16, 16, LR_SHARED),		// disable without C-q
@@ -157,45 +153,45 @@ int CMainFrame::OnCreate(const LPCREATESTRUCT lpCreateStruct)
 		AfxGetApp()->GetProfileInt(CString(), CString(MAKEINTRESOURCE(IDS_REG_ENTRY_MAIN)), 1));
 
 	// set notify ^X icon data
-	m_pXkeymacsDll->SetNotifyIconData(CX_ICON, notifyIconData[CX_ICON], AfxGetApp()->LoadIcon(IDI_CX_ON),
+	CXkeymacsDll::SetNotifyIconData(CX_ICON, notifyIconData[CX_ICON], AfxGetApp()->LoadIcon(IDI_CX_ON),
 									  AfxGetApp()->LoadIcon(IDI_CX_OFF),
 									  AfxGetApp()->GetProfileInt(CString(), CString(MAKEINTRESOURCE(IDS_REG_ENTRY_CX)), 0));
 
 	// set notify M-x icon data
-	m_pXkeymacsDll->SetNotifyIconData(MX_ICON, notifyIconData[MX_ICON], AfxGetApp()->LoadIcon(IDI_MX_ON),
+	CXkeymacsDll::SetNotifyIconData(MX_ICON, notifyIconData[MX_ICON], AfxGetApp()->LoadIcon(IDI_MX_ON),
 									  AfxGetApp()->LoadIcon(IDI_MX_OFF),
 									  AfxGetApp()->GetProfileInt(CString(), CString(MAKEINTRESOURCE(IDS_REG_ENTRY_MX)), 0));
 
 	// set notify Meta icon data
-	m_pXkeymacsDll->SetNotifyIconData(META_ICON, notifyIconData[META_ICON], AfxGetApp()->LoadIcon(IDI_META_ON),
+	CXkeymacsDll::SetNotifyIconData(META_ICON, notifyIconData[META_ICON], AfxGetApp()->LoadIcon(IDI_META_ON),
 									  AfxGetApp()->LoadIcon(IDI_META_OFF),
 									  AfxGetApp()->GetProfileInt(CString(), CString(MAKEINTRESOURCE(IDS_REG_ENTRY_META)), 0));
 
 	// set notify Shift icon data
-	m_pXkeymacsDll->SetNotifyIconData(SHIFT_ICON, notifyIconData[SHIFT_ICON], AfxGetApp()->LoadIcon(IDI_SHIFT_ON),
+	CXkeymacsDll::SetNotifyIconData(SHIFT_ICON, notifyIconData[SHIFT_ICON], AfxGetApp()->LoadIcon(IDI_SHIFT_ON),
 									  AfxGetApp()->LoadIcon(IDI_SHIFT_OFF),
 									  AfxGetApp()->GetProfileInt(CString(), CString(MAKEINTRESOURCE(IDS_REG_ENTRY_SHIFT)), 0));
 
 	// set notify Ctrl icon data
-	m_pXkeymacsDll->SetNotifyIconData(CTRL_ICON, notifyIconData[CTRL_ICON], AfxGetApp()->LoadIcon(IDI_CTRL_ON),
+	CXkeymacsDll::SetNotifyIconData(CTRL_ICON, notifyIconData[CTRL_ICON], AfxGetApp()->LoadIcon(IDI_CTRL_ON),
 									  AfxGetApp()->LoadIcon(IDI_CTRL_OFF),
 									  AfxGetApp()->GetProfileInt(CString(), CString(MAKEINTRESOURCE(IDS_REG_ENTRY_CTRL)), 0));
 
 	// set notify Alt icon data
-	m_pXkeymacsDll->SetNotifyIconData(ALT_ICON, notifyIconData[ALT_ICON], AfxGetApp()->LoadIcon(IDI_ALT_ON),
+	CXkeymacsDll::SetNotifyIconData(ALT_ICON, notifyIconData[ALT_ICON], AfxGetApp()->LoadIcon(IDI_ALT_ON),
 									  AfxGetApp()->LoadIcon(IDI_ALT_OFF),
 									  AfxGetApp()->GetProfileInt(CString(), CString(MAKEINTRESOURCE(IDS_REG_ENTRY_ALT)), 0));
 
-	m_pXkeymacsDll->SetKeyboardSpeed(CProfile::GetKeyboardSpeed());
-	m_pXkeymacsDll->SetAccelerate(AfxGetApp()->GetProfileInt(CString(), CString(MAKEINTRESOURCE(IDS_REG_ENTRY_ACCELERATE)), 1));
+	CXkeymacsDll::SetKeyboardSpeed(CProfile::GetKeyboardSpeed());
+	CXkeymacsDll::SetAccelerate(AfxGetApp()->GetProfileInt(CString(), CString(MAKEINTRESOURCE(IDS_REG_ENTRY_ACCELERATE)), 1));
 
-	m_pXkeymacsDll->SetCursorData((HCURSOR)::LoadImage(NULL, MAKEINTRESOURCE(IDC_ARROW), IMAGE_CURSOR, 0, 0, LR_DEFAULTSIZE | LR_SHARED),
+	CXkeymacsDll::SetCursorData((HCURSOR)::LoadImage(NULL, MAKEINTRESOURCE(IDC_ARROW), IMAGE_CURSOR, 0, 0, LR_DEFAULTSIZE | LR_SHARED),
 								  (HCURSOR)::LoadImage(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDC_DISABLE_TMP_CURSOR), IMAGE_CURSOR, 0, 0, LR_DEFAULTSIZE | LR_SHARED),
 								  (HCURSOR)::LoadImage(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDC_DISABLE_WOCQ_CURSOR), IMAGE_CURSOR, 0, 0, LR_DEFAULTSIZE | LR_SHARED),
 								  (HCURSOR)::LoadImage(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDC_DISABLE_CURSOR), IMAGE_CURSOR, 0, 0, LR_DEFAULTSIZE | LR_SHARED),
 								  AfxGetApp()->GetProfileInt(CString(), CString(MAKEINTRESOURCE(IDS_REG_ENTRY_CHANGE_CURSOR)), 0));
 
-	m_pXkeymacsDll->SetHooks();
+	CXkeymacsDll::SetHooks();
 
 	return 0;
 }
@@ -290,7 +286,7 @@ void CMainFrame::ShowRightMenu(const ICON_TYPE icon)
 		popUp->SetDefaultItem(IDC_PROPERTIES);
 
 		CString szDisable(MAKEINTRESOURCE(IDS_ENABLE));
-		if (m_pXkeymacsDll->IsKeyboardHook()) {
+		if (CXkeymacsDll::IsKeyboardHook()) {
 			szDisable.LoadString(IDS_DISABLE);
 		}
 		szDisable += _T("\tCtrl+Q");
@@ -359,7 +355,7 @@ LRESULT CMainFrame::WindowProc(const UINT message, const WPARAM wParam, const LP
 		}
 	default:
 		if (message == s_uTaskbarRestart) {
-			m_pXkeymacsDll->AddAllShell_NotifyIcon();
+			CXkeymacsDll::AddAllShell_NotifyIcon();
 		}
 		break;
 	}
@@ -385,10 +381,10 @@ void CMainFrame::OnOptions()
 // stop/start keyboard hook
 void CMainFrame::OnDisable() 
 {
-	if (m_pXkeymacsDll->IsKeyboardHook()) {
-		m_pXkeymacsDll->SetKeyboardHookFlag(FALSE);
+	if (CXkeymacsDll::IsKeyboardHook()) {
+		CXkeymacsDll::SetKeyboardHookFlag(FALSE);
 	} else {
-		m_pXkeymacsDll->SetKeyboardHookFlag(TRUE);
+		CXkeymacsDll::SetKeyboardHookFlag(TRUE);
 	}
 }
 
@@ -411,8 +407,8 @@ void CMainFrame::OnQuit()
 		CloseDialog(m_p109KeyboardDlg[i], &m_nResultKeyboardDlg[JAPANESE_KEYBOARD][i]);
 	}
 
-	m_pXkeymacsDll->ReleaseHooks();
-	m_pXkeymacsDll->DeleteAllShell_NotifyIcon();
+	CXkeymacsDll::ReleaseHooks();
+	CXkeymacsDll::DeleteAllShell_NotifyIcon();
 
 	PostQuitMessage(0);
 }
@@ -459,8 +455,8 @@ void CMainFrame::OnExport()
 
 void CMainFrame::OnReset() 
 {
-	m_pXkeymacsDll->ReleaseHooks();
-	m_pXkeymacsDll->SetHooks();
+	CXkeymacsDll::ReleaseHooks();
+	CXkeymacsDll::SetHooks();
 }
 
 void CMainFrame::OnHelpFinder() 

--- a/xkeymacs/mainfrm.h
+++ b/xkeymacs/mainfrm.h
@@ -86,9 +86,7 @@ private:
 	CAboutDlg *m_pAboutDlg;
 	int	m_nResultAboutDlg;
 	int m_nResultPropertiesDlg;
-public:
 	CProperties *m_pPropertiesDlg;
-	CXkeymacsDll *m_pXkeymacsDll;
 };
 
 /////////////////////////////////////////////////////////////////////////////

--- a/xkeymacs/optionsdlg.cpp
+++ b/xkeymacs/optionsdlg.cpp
@@ -160,13 +160,12 @@ void COptionsDlg::OnOK()
 		AfxGetApp()->WriteProfileInt(CString(), CString(MAKEINTRESOURCE(IDS_REG_ENTRY_ALT)), m_cAlt.GetCheck());
 
 		// set dll data
-		CMainFrame *pMainFrame = (CMainFrame*)AfxGetMainWnd();
-		pMainFrame->m_pXkeymacsDll->EnableShell_NotifyIcon(CX_ICON, m_cCx.GetCheck());
-		pMainFrame->m_pXkeymacsDll->EnableShell_NotifyIcon(MX_ICON, m_cMx.GetCheck());
-		pMainFrame->m_pXkeymacsDll->EnableShell_NotifyIcon(META_ICON, m_cM_.GetCheck());
-		pMainFrame->m_pXkeymacsDll->EnableShell_NotifyIcon(SHIFT_ICON, m_cShift.GetCheck());
-		pMainFrame->m_pXkeymacsDll->EnableShell_NotifyIcon(CTRL_ICON, m_cCtrl.GetCheck());
-		pMainFrame->m_pXkeymacsDll->EnableShell_NotifyIcon(ALT_ICON, m_cAlt.GetCheck());
+		CXkeymacsDll::EnableShell_NotifyIcon(CX_ICON, m_cCx.GetCheck());
+		CXkeymacsDll::EnableShell_NotifyIcon(MX_ICON, m_cMx.GetCheck());
+		CXkeymacsDll::EnableShell_NotifyIcon(META_ICON, m_cM_.GetCheck());
+		CXkeymacsDll::EnableShell_NotifyIcon(SHIFT_ICON, m_cShift.GetCheck());
+		CXkeymacsDll::EnableShell_NotifyIcon(CTRL_ICON, m_cCtrl.GetCheck());
+		CXkeymacsDll::EnableShell_NotifyIcon(ALT_ICON, m_cAlt.GetCheck());
 	}
 
 	CDialog::OnOK();

--- a/xkeymacs/profile.cpp
+++ b/xkeymacs/profile.cpp
@@ -474,7 +474,7 @@ BOOL CALLBACK CProfile::EnumWindowsProc(const HWND hWnd, const LPARAM lParam)
 	}
 	return TRUE;
 }
-	
+
 //////////////////////////////////////////////////////////////////////
 // Construction/Destruction
 //////////////////////////////////////////////////////////////////////
@@ -768,11 +768,9 @@ void CProfile::SaveRegistryData()
 
 void CProfile::SetDllData()
 {
-	CMainFrame *pMainFrame = (CMainFrame*)AfxGetMainWnd();
-
-	pMainFrame->m_pXkeymacsDll->ClearFunctionDefinition();
+	CXkeymacsDll::ClearFunctionDefinition();
 	for (int nFunctionID = 0; nFunctionID < CDotXkeymacs::GetFunctionNumber(); ++nFunctionID) {
-		pMainFrame->m_pXkeymacsDll->SetFunctionDefinition(nFunctionID, CDotXkeymacs::GetFunctionDefinition(nFunctionID));
+		CXkeymacsDll::SetFunctionDefinition(nFunctionID, CDotXkeymacs::GetFunctionDefinition(nFunctionID));
 	}
 
 	for (int nApplicationID = 0; nApplicationID < MAX_APP; ++nApplicationID) {
@@ -780,24 +778,24 @@ void CProfile::SetDllData()
 		CString szApplicationName = m_XkeymacsData[nApplicationID].GetApplicationName();
 
 		if (szApplicationName.IsEmpty()) {
-			pMainFrame->m_pXkeymacsDll->Clear(nApplicationID);
+			CXkeymacsDll::Clear(nApplicationID);
 			continue;
 		}
 
-		pMainFrame->m_pXkeymacsDll->SetApplicationName(nApplicationID, szApplicationName);
-		pMainFrame->m_pXkeymacsDll->SetWindowText(nApplicationID, m_XkeymacsData[nApplicationID].GetWindowText());
-		pMainFrame->m_pXkeymacsDll->SetCommandID(nApplicationID, CONTROL, 'X', 0);
-		pMainFrame->m_pXkeymacsDll->SetAtIbeamCursorOnly(nApplicationID, CONTROL, 'X', FALSE);
+		CXkeymacsDll::SetApplicationName(nApplicationID, szApplicationName);
+		CXkeymacsDll::SetWindowText(nApplicationID, m_XkeymacsData[nApplicationID].GetWindowText());
+		CXkeymacsDll::SetCommandID(nApplicationID, CONTROL, 'X', 0);
+		CXkeymacsDll::SetAtIbeamCursorOnly(nApplicationID, CONTROL, 'X', FALSE);
 
 		for (int nCommandType = 0; nCommandType < MAX_COMMAND_TYPE; ++nCommandType) {
 			for (int nKey = 0; nKey < MAX_KEY; ++nKey) {
 				const int nCommandID = m_XkeymacsData[nApplicationID].GetCommandID(nCommandType, nKey);
-				pMainFrame->m_pXkeymacsDll->SetCommandID(nApplicationID, nCommandType, nKey, nCommandID);
+				CXkeymacsDll::SetCommandID(nApplicationID, nCommandType, nKey, nCommandID);
 				const BOOL bAtIbeamCursorOnly = m_XkeymacsData[nApplicationID].GetAtIbeamCursorOnly(nCommandType, nKey);
-				pMainFrame->m_pXkeymacsDll->SetAtIbeamCursorOnly(nApplicationID, nCommandType, nKey, bAtIbeamCursorOnly);
+				CXkeymacsDll::SetAtIbeamCursorOnly(nApplicationID, nCommandType, nKey, bAtIbeamCursorOnly);
 				if ((nCommandType & CONTROLX) && nCommandID) {
-					pMainFrame->m_pXkeymacsDll->SetCommandID(nApplicationID, CONTROL, 'X', 1);			// Commands[1] is C-x
-					pMainFrame->m_pXkeymacsDll->SetAtIbeamCursorOnly(nApplicationID, CONTROL, 'X', bAtIbeamCursorOnly);
+					CXkeymacsDll::SetCommandID(nApplicationID, CONTROL, 'X', 1);			// Commands[1] is C-x
+					CXkeymacsDll::SetAtIbeamCursorOnly(nApplicationID, CONTROL, 'X', bAtIbeamCursorOnly);
 				}
 			}
 		}
@@ -807,22 +805,22 @@ void CProfile::SetDllData()
 				int nCommandType = 0;
 				int nKey = 0;
 				CDotXkeymacs::GetKey(nFunctionID, nApplicationID, nKeyID, &nCommandType, &nKey);
-				pMainFrame->m_pXkeymacsDll->SetFunctionKey(nFunctionID, nApplicationID, nCommandType, nKey);
+				CXkeymacsDll::SetFunctionKey(nFunctionID, nApplicationID, nCommandType, nKey);
 				if (nCommandType & CONTROLX) {
-					pMainFrame->m_pXkeymacsDll->SetCommandID(nApplicationID, CONTROL, 'X', 1);			// Commands[1] is C-x
+					CXkeymacsDll::SetCommandID(nApplicationID, CONTROL, 'X', 1);			// Commands[1] is C-x
 					const BOOL bAtIbeamCursorOnly = m_XkeymacsData[nApplicationID].GetAtIbeamCursorOnly(nCommandType, nKey);
-					pMainFrame->m_pXkeymacsDll->SetAtIbeamCursorOnly(nApplicationID, CONTROL, 'X', bAtIbeamCursorOnly);
+					CXkeymacsDll::SetAtIbeamCursorOnly(nApplicationID, CONTROL, 'X', bAtIbeamCursorOnly);
 				}
 			}
 		}
 
-		pMainFrame->m_pXkeymacsDll->SetKillRingMax(nApplicationID, m_XkeymacsData[nApplicationID].GetKillRingMax());
-		pMainFrame->m_pXkeymacsDll->SetUseDialogSetting(nApplicationID, m_XkeymacsData[nApplicationID].GetUseDialogSetting());
-		pMainFrame->m_pXkeymacsDll->SetSettingStyle(nApplicationID, m_XkeymacsData[nApplicationID].GetSettingStyle());
-		pMainFrame->m_pXkeymacsDll->SetIgnoreUndefinedMetaCtrl(nApplicationID, m_XkeymacsData[nApplicationID].GetIgnoreUndefinedMetaCtrl());
-		pMainFrame->m_pXkeymacsDll->SetIgnoreUndefinedC_x(nApplicationID, m_XkeymacsData[nApplicationID].GetIgnoreUndefinedC_x());
-		pMainFrame->m_pXkeymacsDll->SetEnableCUA(nApplicationID, m_XkeymacsData[nApplicationID].GetEnableCUA());
-		pMainFrame->m_pXkeymacsDll->Set326Compatible(nApplicationID, m_XkeymacsData[nApplicationID].Get326Compatible());
+		CXkeymacsDll::SetKillRingMax(nApplicationID, m_XkeymacsData[nApplicationID].GetKillRingMax());
+		CXkeymacsDll::SetUseDialogSetting(nApplicationID, m_XkeymacsData[nApplicationID].GetUseDialogSetting());
+		CXkeymacsDll::SetSettingStyle(nApplicationID, m_XkeymacsData[nApplicationID].GetSettingStyle());
+		CXkeymacsDll::SetIgnoreUndefinedMetaCtrl(nApplicationID, m_XkeymacsData[nApplicationID].GetIgnoreUndefinedMetaCtrl());
+		CXkeymacsDll::SetIgnoreUndefinedC_x(nApplicationID, m_XkeymacsData[nApplicationID].GetIgnoreUndefinedC_x());
+		CXkeymacsDll::SetEnableCUA(nApplicationID, m_XkeymacsData[nApplicationID].GetEnableCUA());
+		CXkeymacsDll::Set326Compatible(nApplicationID, m_XkeymacsData[nApplicationID].Get326Compatible());
 	}
 }
 

--- a/xkeymacs/xkeymacs.cpp
+++ b/xkeymacs/xkeymacs.cpp
@@ -89,6 +89,7 @@ BOOL CXkeymacsApp::InitInstance()
 
 	// set registry key
 	CProfile::InitDllData();
+	CUtils::InitCUtils();
 
 	return TRUE;
 }

--- a/xkeymacsdll/xkeymacsdll.cpp
+++ b/xkeymacsdll/xkeymacsdll.cpp
@@ -246,7 +246,7 @@ DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved)
 
 CXkeymacsDll::CXkeymacsDll()
 {
-	CUtils::InitCUtils();
+
 }
 
 CXkeymacsDll::~CXkeymacsDll()

--- a/xkeymacsdll/xkeymacsdll.h
+++ b/xkeymacsdll/xkeymacsdll.h
@@ -53,33 +53,33 @@ class AFX_EXT_CLASS CXkeymacsDll
 public:
 	static void ModifyM_xTip(const TCHAR *const szPath);
 	static BOOL Get326Compatible();
-	void Set326Compatible(int nApplicationID, BOOL b326Compatible);
-	void SetCursorData(HCURSOR hEnable, HCURSOR hDisableTMP, HCURSOR hDisableWOCQ, HICON hDisable, BOOL bEnable);
+	static void Set326Compatible(int nApplicationID, BOOL b326Compatible);
+	static void SetCursorData(HCURSOR hEnable, HCURSOR hDisableTMP, HCURSOR hDisableWOCQ, HICON hDisable, BOOL bEnable);
 	static unsigned int GetMaxKeyInterval(void);
 	static void SetKeyboardSpeed(int nKeyboardSpeed);
 	static int GetAccelerate(void);
 	static void SetAccelerate(int nAccelerate);
-	void SetWindowText(int nApplicationID, CString szWindowText);
-	void AddAllShell_NotifyIcon();
-	void DeleteAllShell_NotifyIcon();
-	void SetKillRingMax(int nApplicationID, int nKillRingMax);
-	void CXkeymacsDll::EnableShell_NotifyIcon(ICON_TYPE icon, BOOL bEnable);
-	void SetNotifyIconData(ICON_TYPE icon, NOTIFYICONDATA stNtfyIcon, HICON hEnable, HICON hDisableTMP, HICON hDisableWOCQ, HICON hDisable, BOOL bEnable);
-	void SetNotifyIconData(ICON_TYPE icon, NOTIFYICONDATA stNtfyIcon, HICON hOn, HICON hOff, BOOL bEnable);
-	void Clear(int nApplicationID);
-	BOOL IsKeyboardHook();
-	void SetCommandID(int nApplicationID, int nCommandType, int nKey, int nCommandID);
-	void SetAtIbeamCursorOnly(int nApplicationID, int nCommandType, int nKey, BOOL bAtIbeamCursorOnly);
-	void SetApplicationName(int nApplicationID, CString szApplicationName);
+	static void SetWindowText(int nApplicationID, CString szWindowText);
+	static void AddAllShell_NotifyIcon();
+	static void DeleteAllShell_NotifyIcon();
+	static void SetKillRingMax(int nApplicationID, int nKillRingMax);
+	static void EnableShell_NotifyIcon(ICON_TYPE icon, BOOL bEnable);
+	static void SetNotifyIconData(ICON_TYPE icon, NOTIFYICONDATA stNtfyIcon, HICON hEnable, HICON hDisableTMP, HICON hDisableWOCQ, HICON hDisable, BOOL bEnable);
+	static void SetNotifyIconData(ICON_TYPE icon, NOTIFYICONDATA stNtfyIcon, HICON hOn, HICON hOff, BOOL bEnable);
+	static void Clear(int nApplicationID);
+	static BOOL IsKeyboardHook();
+	static void SetCommandID(int nApplicationID, int nCommandType, int nKey, int nCommandID);
+	static void SetAtIbeamCursorOnly(int nApplicationID, int nCommandType, int nKey, BOOL bAtIbeamCursorOnly);
+	static void SetApplicationName(int nApplicationID, CString szApplicationName);
 	static void ReleaseHooks();
 	static void ReleaseKeyboardHook();
-	void SetEnableCUA(int nApplicationID, BOOL bEnableCUA);
-	void SetIgnoreUndefinedC_x(int nApplicationID, BOOL bIgnoreUndefinedC_x);
-	void SetIgnoreUndefinedMetaCtrl(int nApplicationID, BOOL bIgnoreUndefinedMetaCtrl);
+	static void SetEnableCUA(int nApplicationID, BOOL bEnableCUA);
+	static void SetIgnoreUndefinedC_x(int nApplicationID, BOOL bIgnoreUndefinedC_x);
+	static void SetIgnoreUndefinedMetaCtrl(int nApplicationID, BOOL bIgnoreUndefinedMetaCtrl);
 	static void SetHooks();
 	static void SetKeyboardHook();
-	void SetSettingStyle(int nApplicationID, int nSettingStyle);
-	void SetUseDialogSetting(int nApplicationID, BOOL bUseDialogSetting);
+	static void SetSettingStyle(int nApplicationID, int nSettingStyle);
+	static void SetUseDialogSetting(int nApplicationID, BOOL bUseDialogSetting);
 	static void AddKillRing(BOOL bNewData = TRUE);
 	static void CallMacro();
 	static void ClearFunctionDefinition();
@@ -119,7 +119,7 @@ private:
 	static HHOOK m_hHookGetMessage;
 	static HHOOK m_hHookShell;
 	static void AddShell_NotifyIcon(ICON_TYPE icon);
-	void DeleteShell_NotifyIcon(ICON_TYPE icon);
+	static void DeleteShell_NotifyIcon(ICON_TYPE icon);
 	static BOOL DefiningMacro();
 	static BOOL IsControl();
 	static BOOL IsMeta();