• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
Aucun tag

Frequently used words (click to add to your profile)

javac++androidlinuxc#objective-cqtwindows誰得cocoapythonphprubygameguibathyscaphec翻訳omegat計画中(planning stage)frameworktwittertestdomvb.netdirectxbtronarduinopreviewerゲームエンジン

XKeymacs for 64bit Windows


Commit MetaInfo

Révision91ee60b4c9b38e2806ba74b80531e12f3d31103c (tree)
l'heure2011-05-27 08:38:33
AuteurKazuhiro Fujieda <fujieda@user...>
CommiterKazuhiro Fujieda

Message de Log

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

Change Summary

Modification

--- a/xkeymacs/mainfrm.cpp
+++ b/xkeymacs/mainfrm.cpp
@@ -43,7 +43,6 @@ END_MESSAGE_MAP()
4343
4444 CMainFrame::CMainFrame()
4545 {
46- m_pXkeymacsDll = new CXkeymacsDll;
4746 m_pPropertiesDlg = new CProperties;
4847 m_nResultPropertiesDlg = -1;
4948 m_bPropertiesDlgExist = FALSE;
@@ -87,9 +86,6 @@ CMainFrame::CMainFrame()
8786
8887 CMainFrame::~CMainFrame()
8988 {
90- delete m_pXkeymacsDll;
91- m_pXkeymacsDll = NULL;
92-
9389 delete m_pPropertiesDlg;
9490 m_pPropertiesDlg = NULL;
9591
@@ -114,7 +110,7 @@ int CMainFrame::OnCreate(const LPCREATESTRUCT lpCreateStruct)
114110 return -1;
115111 }
116112
117- m_pXkeymacsDll->Set106Keyboard(CProfile::Is106Keyboard());
113+ CXkeymacsDll::Set106Keyboard(CProfile::Is106Keyboard());
118114
119115 // init notify icon data
120116 NOTIFYICONDATA notifyIconData[MAX_ICON_TYPE] = {
@@ -149,7 +145,7 @@ int CMainFrame::OnCreate(const LPCREATESTRUCT lpCreateStruct)
149145 sizeof(notifyIconData[ALT_ICON].szTip));
150146
151147 // set notify icon data
152- m_pXkeymacsDll->SetNotifyIconData(MAIN_ICON, notifyIconData[MAIN_ICON],
148+ CXkeymacsDll::SetNotifyIconData(MAIN_ICON, notifyIconData[MAIN_ICON],
153149 (HICON)::LoadImage(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDR_MAINFRAME), IMAGE_ICON, 16, 16, LR_SHARED),
154150 (HICON)::LoadImage(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDR_MAIN_DISABLE_TMP), IMAGE_ICON, 16, 16, LR_SHARED),
155151 (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)
157153 AfxGetApp()->GetProfileInt(CString(), CString(MAKEINTRESOURCE(IDS_REG_ENTRY_MAIN)), 1));
158154
159155 // set notify ^X icon data
160- m_pXkeymacsDll->SetNotifyIconData(CX_ICON, notifyIconData[CX_ICON], AfxGetApp()->LoadIcon(IDI_CX_ON),
156+ CXkeymacsDll::SetNotifyIconData(CX_ICON, notifyIconData[CX_ICON], AfxGetApp()->LoadIcon(IDI_CX_ON),
161157 AfxGetApp()->LoadIcon(IDI_CX_OFF),
162158 AfxGetApp()->GetProfileInt(CString(), CString(MAKEINTRESOURCE(IDS_REG_ENTRY_CX)), 0));
163159
164160 // set notify M-x icon data
165- m_pXkeymacsDll->SetNotifyIconData(MX_ICON, notifyIconData[MX_ICON], AfxGetApp()->LoadIcon(IDI_MX_ON),
161+ CXkeymacsDll::SetNotifyIconData(MX_ICON, notifyIconData[MX_ICON], AfxGetApp()->LoadIcon(IDI_MX_ON),
166162 AfxGetApp()->LoadIcon(IDI_MX_OFF),
167163 AfxGetApp()->GetProfileInt(CString(), CString(MAKEINTRESOURCE(IDS_REG_ENTRY_MX)), 0));
168164
169165 // set notify Meta icon data
170- m_pXkeymacsDll->SetNotifyIconData(META_ICON, notifyIconData[META_ICON], AfxGetApp()->LoadIcon(IDI_META_ON),
166+ CXkeymacsDll::SetNotifyIconData(META_ICON, notifyIconData[META_ICON], AfxGetApp()->LoadIcon(IDI_META_ON),
171167 AfxGetApp()->LoadIcon(IDI_META_OFF),
172168 AfxGetApp()->GetProfileInt(CString(), CString(MAKEINTRESOURCE(IDS_REG_ENTRY_META)), 0));
173169
174170 // set notify Shift icon data
175- m_pXkeymacsDll->SetNotifyIconData(SHIFT_ICON, notifyIconData[SHIFT_ICON], AfxGetApp()->LoadIcon(IDI_SHIFT_ON),
171+ CXkeymacsDll::SetNotifyIconData(SHIFT_ICON, notifyIconData[SHIFT_ICON], AfxGetApp()->LoadIcon(IDI_SHIFT_ON),
176172 AfxGetApp()->LoadIcon(IDI_SHIFT_OFF),
177173 AfxGetApp()->GetProfileInt(CString(), CString(MAKEINTRESOURCE(IDS_REG_ENTRY_SHIFT)), 0));
178174
179175 // set notify Ctrl icon data
180- m_pXkeymacsDll->SetNotifyIconData(CTRL_ICON, notifyIconData[CTRL_ICON], AfxGetApp()->LoadIcon(IDI_CTRL_ON),
176+ CXkeymacsDll::SetNotifyIconData(CTRL_ICON, notifyIconData[CTRL_ICON], AfxGetApp()->LoadIcon(IDI_CTRL_ON),
181177 AfxGetApp()->LoadIcon(IDI_CTRL_OFF),
182178 AfxGetApp()->GetProfileInt(CString(), CString(MAKEINTRESOURCE(IDS_REG_ENTRY_CTRL)), 0));
183179
184180 // set notify Alt icon data
185- m_pXkeymacsDll->SetNotifyIconData(ALT_ICON, notifyIconData[ALT_ICON], AfxGetApp()->LoadIcon(IDI_ALT_ON),
181+ CXkeymacsDll::SetNotifyIconData(ALT_ICON, notifyIconData[ALT_ICON], AfxGetApp()->LoadIcon(IDI_ALT_ON),
186182 AfxGetApp()->LoadIcon(IDI_ALT_OFF),
187183 AfxGetApp()->GetProfileInt(CString(), CString(MAKEINTRESOURCE(IDS_REG_ENTRY_ALT)), 0));
188184
189- m_pXkeymacsDll->SetKeyboardSpeed(CProfile::GetKeyboardSpeed());
190- m_pXkeymacsDll->SetAccelerate(AfxGetApp()->GetProfileInt(CString(), CString(MAKEINTRESOURCE(IDS_REG_ENTRY_ACCELERATE)), 1));
185+ CXkeymacsDll::SetKeyboardSpeed(CProfile::GetKeyboardSpeed());
186+ CXkeymacsDll::SetAccelerate(AfxGetApp()->GetProfileInt(CString(), CString(MAKEINTRESOURCE(IDS_REG_ENTRY_ACCELERATE)), 1));
191187
192- m_pXkeymacsDll->SetCursorData((HCURSOR)::LoadImage(NULL, MAKEINTRESOURCE(IDC_ARROW), IMAGE_CURSOR, 0, 0, LR_DEFAULTSIZE | LR_SHARED),
188+ CXkeymacsDll::SetCursorData((HCURSOR)::LoadImage(NULL, MAKEINTRESOURCE(IDC_ARROW), IMAGE_CURSOR, 0, 0, LR_DEFAULTSIZE | LR_SHARED),
193189 (HCURSOR)::LoadImage(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDC_DISABLE_TMP_CURSOR), IMAGE_CURSOR, 0, 0, LR_DEFAULTSIZE | LR_SHARED),
194190 (HCURSOR)::LoadImage(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDC_DISABLE_WOCQ_CURSOR), IMAGE_CURSOR, 0, 0, LR_DEFAULTSIZE | LR_SHARED),
195191 (HCURSOR)::LoadImage(AfxGetInstanceHandle(), MAKEINTRESOURCE(IDC_DISABLE_CURSOR), IMAGE_CURSOR, 0, 0, LR_DEFAULTSIZE | LR_SHARED),
196192 AfxGetApp()->GetProfileInt(CString(), CString(MAKEINTRESOURCE(IDS_REG_ENTRY_CHANGE_CURSOR)), 0));
197193
198- m_pXkeymacsDll->SetHooks();
194+ CXkeymacsDll::SetHooks();
199195
200196 return 0;
201197 }
@@ -290,7 +286,7 @@ void CMainFrame::ShowRightMenu(const ICON_TYPE icon)
290286 popUp->SetDefaultItem(IDC_PROPERTIES);
291287
292288 CString szDisable(MAKEINTRESOURCE(IDS_ENABLE));
293- if (m_pXkeymacsDll->IsKeyboardHook()) {
289+ if (CXkeymacsDll::IsKeyboardHook()) {
294290 szDisable.LoadString(IDS_DISABLE);
295291 }
296292 szDisable += _T("\tCtrl+Q");
@@ -359,7 +355,7 @@ LRESULT CMainFrame::WindowProc(const UINT message, const WPARAM wParam, const LP
359355 }
360356 default:
361357 if (message == s_uTaskbarRestart) {
362- m_pXkeymacsDll->AddAllShell_NotifyIcon();
358+ CXkeymacsDll::AddAllShell_NotifyIcon();
363359 }
364360 break;
365361 }
@@ -385,10 +381,10 @@ void CMainFrame::OnOptions()
385381 // stop/start keyboard hook
386382 void CMainFrame::OnDisable()
387383 {
388- if (m_pXkeymacsDll->IsKeyboardHook()) {
389- m_pXkeymacsDll->SetKeyboardHookFlag(FALSE);
384+ if (CXkeymacsDll::IsKeyboardHook()) {
385+ CXkeymacsDll::SetKeyboardHookFlag(FALSE);
390386 } else {
391- m_pXkeymacsDll->SetKeyboardHookFlag(TRUE);
387+ CXkeymacsDll::SetKeyboardHookFlag(TRUE);
392388 }
393389 }
394390
@@ -411,8 +407,8 @@ void CMainFrame::OnQuit()
411407 CloseDialog(m_p109KeyboardDlg[i], &m_nResultKeyboardDlg[JAPANESE_KEYBOARD][i]);
412408 }
413409
414- m_pXkeymacsDll->ReleaseHooks();
415- m_pXkeymacsDll->DeleteAllShell_NotifyIcon();
410+ CXkeymacsDll::ReleaseHooks();
411+ CXkeymacsDll::DeleteAllShell_NotifyIcon();
416412
417413 PostQuitMessage(0);
418414 }
@@ -459,8 +455,8 @@ void CMainFrame::OnExport()
459455
460456 void CMainFrame::OnReset()
461457 {
462- m_pXkeymacsDll->ReleaseHooks();
463- m_pXkeymacsDll->SetHooks();
458+ CXkeymacsDll::ReleaseHooks();
459+ CXkeymacsDll::SetHooks();
464460 }
465461
466462 void CMainFrame::OnHelpFinder()
--- a/xkeymacs/mainfrm.h
+++ b/xkeymacs/mainfrm.h
@@ -86,9 +86,7 @@ private:
8686 CAboutDlg *m_pAboutDlg;
8787 int m_nResultAboutDlg;
8888 int m_nResultPropertiesDlg;
89-public:
9089 CProperties *m_pPropertiesDlg;
91- CXkeymacsDll *m_pXkeymacsDll;
9290 };
9391
9492 /////////////////////////////////////////////////////////////////////////////
--- a/xkeymacs/optionsdlg.cpp
+++ b/xkeymacs/optionsdlg.cpp
@@ -160,13 +160,12 @@ void COptionsDlg::OnOK()
160160 AfxGetApp()->WriteProfileInt(CString(), CString(MAKEINTRESOURCE(IDS_REG_ENTRY_ALT)), m_cAlt.GetCheck());
161161
162162 // set dll data
163- CMainFrame *pMainFrame = (CMainFrame*)AfxGetMainWnd();
164- pMainFrame->m_pXkeymacsDll->EnableShell_NotifyIcon(CX_ICON, m_cCx.GetCheck());
165- pMainFrame->m_pXkeymacsDll->EnableShell_NotifyIcon(MX_ICON, m_cMx.GetCheck());
166- pMainFrame->m_pXkeymacsDll->EnableShell_NotifyIcon(META_ICON, m_cM_.GetCheck());
167- pMainFrame->m_pXkeymacsDll->EnableShell_NotifyIcon(SHIFT_ICON, m_cShift.GetCheck());
168- pMainFrame->m_pXkeymacsDll->EnableShell_NotifyIcon(CTRL_ICON, m_cCtrl.GetCheck());
169- pMainFrame->m_pXkeymacsDll->EnableShell_NotifyIcon(ALT_ICON, m_cAlt.GetCheck());
163+ CXkeymacsDll::EnableShell_NotifyIcon(CX_ICON, m_cCx.GetCheck());
164+ CXkeymacsDll::EnableShell_NotifyIcon(MX_ICON, m_cMx.GetCheck());
165+ CXkeymacsDll::EnableShell_NotifyIcon(META_ICON, m_cM_.GetCheck());
166+ CXkeymacsDll::EnableShell_NotifyIcon(SHIFT_ICON, m_cShift.GetCheck());
167+ CXkeymacsDll::EnableShell_NotifyIcon(CTRL_ICON, m_cCtrl.GetCheck());
168+ CXkeymacsDll::EnableShell_NotifyIcon(ALT_ICON, m_cAlt.GetCheck());
170169 }
171170
172171 CDialog::OnOK();
--- a/xkeymacs/profile.cpp
+++ b/xkeymacs/profile.cpp
@@ -474,7 +474,7 @@ BOOL CALLBACK CProfile::EnumWindowsProc(const HWND hWnd, const LPARAM lParam)
474474 }
475475 return TRUE;
476476 }
477-
477+
478478 //////////////////////////////////////////////////////////////////////
479479 // Construction/Destruction
480480 //////////////////////////////////////////////////////////////////////
@@ -768,11 +768,9 @@ void CProfile::SaveRegistryData()
768768
769769 void CProfile::SetDllData()
770770 {
771- CMainFrame *pMainFrame = (CMainFrame*)AfxGetMainWnd();
772-
773- pMainFrame->m_pXkeymacsDll->ClearFunctionDefinition();
771+ CXkeymacsDll::ClearFunctionDefinition();
774772 for (int nFunctionID = 0; nFunctionID < CDotXkeymacs::GetFunctionNumber(); ++nFunctionID) {
775- pMainFrame->m_pXkeymacsDll->SetFunctionDefinition(nFunctionID, CDotXkeymacs::GetFunctionDefinition(nFunctionID));
773+ CXkeymacsDll::SetFunctionDefinition(nFunctionID, CDotXkeymacs::GetFunctionDefinition(nFunctionID));
776774 }
777775
778776 for (int nApplicationID = 0; nApplicationID < MAX_APP; ++nApplicationID) {
@@ -780,24 +778,24 @@ void CProfile::SetDllData()
780778 CString szApplicationName = m_XkeymacsData[nApplicationID].GetApplicationName();
781779
782780 if (szApplicationName.IsEmpty()) {
783- pMainFrame->m_pXkeymacsDll->Clear(nApplicationID);
781+ CXkeymacsDll::Clear(nApplicationID);
784782 continue;
785783 }
786784
787- pMainFrame->m_pXkeymacsDll->SetApplicationName(nApplicationID, szApplicationName);
788- pMainFrame->m_pXkeymacsDll->SetWindowText(nApplicationID, m_XkeymacsData[nApplicationID].GetWindowText());
789- pMainFrame->m_pXkeymacsDll->SetCommandID(nApplicationID, CONTROL, 'X', 0);
790- pMainFrame->m_pXkeymacsDll->SetAtIbeamCursorOnly(nApplicationID, CONTROL, 'X', FALSE);
785+ CXkeymacsDll::SetApplicationName(nApplicationID, szApplicationName);
786+ CXkeymacsDll::SetWindowText(nApplicationID, m_XkeymacsData[nApplicationID].GetWindowText());
787+ CXkeymacsDll::SetCommandID(nApplicationID, CONTROL, 'X', 0);
788+ CXkeymacsDll::SetAtIbeamCursorOnly(nApplicationID, CONTROL, 'X', FALSE);
791789
792790 for (int nCommandType = 0; nCommandType < MAX_COMMAND_TYPE; ++nCommandType) {
793791 for (int nKey = 0; nKey < MAX_KEY; ++nKey) {
794792 const int nCommandID = m_XkeymacsData[nApplicationID].GetCommandID(nCommandType, nKey);
795- pMainFrame->m_pXkeymacsDll->SetCommandID(nApplicationID, nCommandType, nKey, nCommandID);
793+ CXkeymacsDll::SetCommandID(nApplicationID, nCommandType, nKey, nCommandID);
796794 const BOOL bAtIbeamCursorOnly = m_XkeymacsData[nApplicationID].GetAtIbeamCursorOnly(nCommandType, nKey);
797- pMainFrame->m_pXkeymacsDll->SetAtIbeamCursorOnly(nApplicationID, nCommandType, nKey, bAtIbeamCursorOnly);
795+ CXkeymacsDll::SetAtIbeamCursorOnly(nApplicationID, nCommandType, nKey, bAtIbeamCursorOnly);
798796 if ((nCommandType & CONTROLX) && nCommandID) {
799- pMainFrame->m_pXkeymacsDll->SetCommandID(nApplicationID, CONTROL, 'X', 1); // Commands[1] is C-x
800- pMainFrame->m_pXkeymacsDll->SetAtIbeamCursorOnly(nApplicationID, CONTROL, 'X', bAtIbeamCursorOnly);
797+ CXkeymacsDll::SetCommandID(nApplicationID, CONTROL, 'X', 1); // Commands[1] is C-x
798+ CXkeymacsDll::SetAtIbeamCursorOnly(nApplicationID, CONTROL, 'X', bAtIbeamCursorOnly);
801799 }
802800 }
803801 }
@@ -807,22 +805,22 @@ void CProfile::SetDllData()
807805 int nCommandType = 0;
808806 int nKey = 0;
809807 CDotXkeymacs::GetKey(nFunctionID, nApplicationID, nKeyID, &nCommandType, &nKey);
810- pMainFrame->m_pXkeymacsDll->SetFunctionKey(nFunctionID, nApplicationID, nCommandType, nKey);
808+ CXkeymacsDll::SetFunctionKey(nFunctionID, nApplicationID, nCommandType, nKey);
811809 if (nCommandType & CONTROLX) {
812- pMainFrame->m_pXkeymacsDll->SetCommandID(nApplicationID, CONTROL, 'X', 1); // Commands[1] is C-x
810+ CXkeymacsDll::SetCommandID(nApplicationID, CONTROL, 'X', 1); // Commands[1] is C-x
813811 const BOOL bAtIbeamCursorOnly = m_XkeymacsData[nApplicationID].GetAtIbeamCursorOnly(nCommandType, nKey);
814- pMainFrame->m_pXkeymacsDll->SetAtIbeamCursorOnly(nApplicationID, CONTROL, 'X', bAtIbeamCursorOnly);
812+ CXkeymacsDll::SetAtIbeamCursorOnly(nApplicationID, CONTROL, 'X', bAtIbeamCursorOnly);
815813 }
816814 }
817815 }
818816
819- pMainFrame->m_pXkeymacsDll->SetKillRingMax(nApplicationID, m_XkeymacsData[nApplicationID].GetKillRingMax());
820- pMainFrame->m_pXkeymacsDll->SetUseDialogSetting(nApplicationID, m_XkeymacsData[nApplicationID].GetUseDialogSetting());
821- pMainFrame->m_pXkeymacsDll->SetSettingStyle(nApplicationID, m_XkeymacsData[nApplicationID].GetSettingStyle());
822- pMainFrame->m_pXkeymacsDll->SetIgnoreUndefinedMetaCtrl(nApplicationID, m_XkeymacsData[nApplicationID].GetIgnoreUndefinedMetaCtrl());
823- pMainFrame->m_pXkeymacsDll->SetIgnoreUndefinedC_x(nApplicationID, m_XkeymacsData[nApplicationID].GetIgnoreUndefinedC_x());
824- pMainFrame->m_pXkeymacsDll->SetEnableCUA(nApplicationID, m_XkeymacsData[nApplicationID].GetEnableCUA());
825- pMainFrame->m_pXkeymacsDll->Set326Compatible(nApplicationID, m_XkeymacsData[nApplicationID].Get326Compatible());
817+ CXkeymacsDll::SetKillRingMax(nApplicationID, m_XkeymacsData[nApplicationID].GetKillRingMax());
818+ CXkeymacsDll::SetUseDialogSetting(nApplicationID, m_XkeymacsData[nApplicationID].GetUseDialogSetting());
819+ CXkeymacsDll::SetSettingStyle(nApplicationID, m_XkeymacsData[nApplicationID].GetSettingStyle());
820+ CXkeymacsDll::SetIgnoreUndefinedMetaCtrl(nApplicationID, m_XkeymacsData[nApplicationID].GetIgnoreUndefinedMetaCtrl());
821+ CXkeymacsDll::SetIgnoreUndefinedC_x(nApplicationID, m_XkeymacsData[nApplicationID].GetIgnoreUndefinedC_x());
822+ CXkeymacsDll::SetEnableCUA(nApplicationID, m_XkeymacsData[nApplicationID].GetEnableCUA());
823+ CXkeymacsDll::Set326Compatible(nApplicationID, m_XkeymacsData[nApplicationID].Get326Compatible());
826824 }
827825 }
828826
--- a/xkeymacs/xkeymacs.cpp
+++ b/xkeymacs/xkeymacs.cpp
@@ -89,6 +89,7 @@ BOOL CXkeymacsApp::InitInstance()
8989
9090 // set registry key
9191 CProfile::InitDllData();
92+ CUtils::InitCUtils();
9293
9394 return TRUE;
9495 }
--- a/xkeymacsdll/xkeymacsdll.cpp
+++ b/xkeymacsdll/xkeymacsdll.cpp
@@ -246,7 +246,7 @@ DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved)
246246
247247 CXkeymacsDll::CXkeymacsDll()
248248 {
249- CUtils::InitCUtils();
249+
250250 }
251251
252252 CXkeymacsDll::~CXkeymacsDll()
--- a/xkeymacsdll/xkeymacsdll.h
+++ b/xkeymacsdll/xkeymacsdll.h
@@ -53,33 +53,33 @@ class AFX_EXT_CLASS CXkeymacsDll
5353 public:
5454 static void ModifyM_xTip(const TCHAR *const szPath);
5555 static BOOL Get326Compatible();
56- void Set326Compatible(int nApplicationID, BOOL b326Compatible);
57- void SetCursorData(HCURSOR hEnable, HCURSOR hDisableTMP, HCURSOR hDisableWOCQ, HICON hDisable, BOOL bEnable);
56+ static void Set326Compatible(int nApplicationID, BOOL b326Compatible);
57+ static void SetCursorData(HCURSOR hEnable, HCURSOR hDisableTMP, HCURSOR hDisableWOCQ, HICON hDisable, BOOL bEnable);
5858 static unsigned int GetMaxKeyInterval(void);
5959 static void SetKeyboardSpeed(int nKeyboardSpeed);
6060 static int GetAccelerate(void);
6161 static void SetAccelerate(int nAccelerate);
62- void SetWindowText(int nApplicationID, CString szWindowText);
63- void AddAllShell_NotifyIcon();
64- void DeleteAllShell_NotifyIcon();
65- void SetKillRingMax(int nApplicationID, int nKillRingMax);
66- void CXkeymacsDll::EnableShell_NotifyIcon(ICON_TYPE icon, BOOL bEnable);
67- void SetNotifyIconData(ICON_TYPE icon, NOTIFYICONDATA stNtfyIcon, HICON hEnable, HICON hDisableTMP, HICON hDisableWOCQ, HICON hDisable, BOOL bEnable);
68- void SetNotifyIconData(ICON_TYPE icon, NOTIFYICONDATA stNtfyIcon, HICON hOn, HICON hOff, BOOL bEnable);
69- void Clear(int nApplicationID);
70- BOOL IsKeyboardHook();
71- void SetCommandID(int nApplicationID, int nCommandType, int nKey, int nCommandID);
72- void SetAtIbeamCursorOnly(int nApplicationID, int nCommandType, int nKey, BOOL bAtIbeamCursorOnly);
73- void SetApplicationName(int nApplicationID, CString szApplicationName);
62+ static void SetWindowText(int nApplicationID, CString szWindowText);
63+ static void AddAllShell_NotifyIcon();
64+ static void DeleteAllShell_NotifyIcon();
65+ static void SetKillRingMax(int nApplicationID, int nKillRingMax);
66+ static void EnableShell_NotifyIcon(ICON_TYPE icon, BOOL bEnable);
67+ static void SetNotifyIconData(ICON_TYPE icon, NOTIFYICONDATA stNtfyIcon, HICON hEnable, HICON hDisableTMP, HICON hDisableWOCQ, HICON hDisable, BOOL bEnable);
68+ static void SetNotifyIconData(ICON_TYPE icon, NOTIFYICONDATA stNtfyIcon, HICON hOn, HICON hOff, BOOL bEnable);
69+ static void Clear(int nApplicationID);
70+ static BOOL IsKeyboardHook();
71+ static void SetCommandID(int nApplicationID, int nCommandType, int nKey, int nCommandID);
72+ static void SetAtIbeamCursorOnly(int nApplicationID, int nCommandType, int nKey, BOOL bAtIbeamCursorOnly);
73+ static void SetApplicationName(int nApplicationID, CString szApplicationName);
7474 static void ReleaseHooks();
7575 static void ReleaseKeyboardHook();
76- void SetEnableCUA(int nApplicationID, BOOL bEnableCUA);
77- void SetIgnoreUndefinedC_x(int nApplicationID, BOOL bIgnoreUndefinedC_x);
78- void SetIgnoreUndefinedMetaCtrl(int nApplicationID, BOOL bIgnoreUndefinedMetaCtrl);
76+ static void SetEnableCUA(int nApplicationID, BOOL bEnableCUA);
77+ static void SetIgnoreUndefinedC_x(int nApplicationID, BOOL bIgnoreUndefinedC_x);
78+ static void SetIgnoreUndefinedMetaCtrl(int nApplicationID, BOOL bIgnoreUndefinedMetaCtrl);
7979 static void SetHooks();
8080 static void SetKeyboardHook();
81- void SetSettingStyle(int nApplicationID, int nSettingStyle);
82- void SetUseDialogSetting(int nApplicationID, BOOL bUseDialogSetting);
81+ static void SetSettingStyle(int nApplicationID, int nSettingStyle);
82+ static void SetUseDialogSetting(int nApplicationID, BOOL bUseDialogSetting);
8383 static void AddKillRing(BOOL bNewData = TRUE);
8484 static void CallMacro();
8585 static void ClearFunctionDefinition();
@@ -119,7 +119,7 @@ private:
119119 static HHOOK m_hHookGetMessage;
120120 static HHOOK m_hHookShell;
121121 static void AddShell_NotifyIcon(ICON_TYPE icon);
122- void DeleteShell_NotifyIcon(ICON_TYPE icon);
122+ static void DeleteShell_NotifyIcon(ICON_TYPE icon);
123123 static BOOL DefiningMacro();
124124 static BOOL IsControl();
125125 static BOOL IsMeta();