diff options
| author | George Hazan <ghazan@miranda.im> | 2017-09-12 12:14:57 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2017-09-12 12:14:57 +0300 |
| commit | 69409021aced78b31da0c9f2def7332a4c4b973e (patch) | |
| tree | 3d9a6607f042acb8d44ece5f3fb08a4125a94e45 /plugins/ChangeKeyboardLayout | |
| parent | e09448dd03e3647717166e92ee818e395041993a (diff) | |
Revert "Merge branch 'master' of https://github.com/miranda-ng/miranda-ng"
This reverts commit e09448dd03e3647717166e92ee818e395041993a, reversing
changes made to b0f44b16bd1138de85a5d17bb42151742f9c8298.
Diffstat (limited to 'plugins/ChangeKeyboardLayout')
| -rw-r--r-- | plugins/ChangeKeyboardLayout/src/hook_events.cpp | 4 | ||||
| -rw-r--r-- | plugins/ChangeKeyboardLayout/src/stdafx.h | 3 | ||||
| -rw-r--r-- | plugins/ChangeKeyboardLayout/src/text_operations.cpp | 8 |
3 files changed, 7 insertions, 8 deletions
diff --git a/plugins/ChangeKeyboardLayout/src/hook_events.cpp b/plugins/ChangeKeyboardLayout/src/hook_events.cpp index 6f1451a5bb..4fb45f049e 100644 --- a/plugins/ChangeKeyboardLayout/src/hook_events.cpp +++ b/plugins/ChangeKeyboardLayout/src/hook_events.cpp @@ -122,8 +122,8 @@ int ModulesLoaded(WPARAM, LPARAM) ReadPopupOptions();
// Зарегим звук
- Skin_AddSound(SND_ChangeLayout, ModuleNameW, LPGENW("Changing Layout"));
- Skin_AddSound(SND_ChangeCase, ModuleNameW, LPGENW("Changing Case"));
+ SkinAddNewSoundEx(SND_ChangeLayout, ModuleName, LPGEN("Changing Layout"));
+ SkinAddNewSoundEx(SND_ChangeCase, ModuleName, LPGEN("Changing Case"));
// Хук на нажатие клавиши
kbHook_All = SetWindowsHookEx(WH_KEYBOARD, (HOOKPROC)Keyboard_Hook, NULL, GetCurrentThreadId());
diff --git a/plugins/ChangeKeyboardLayout/src/stdafx.h b/plugins/ChangeKeyboardLayout/src/stdafx.h index b1a3bac5f5..6eb9e0fadf 100644 --- a/plugins/ChangeKeyboardLayout/src/stdafx.h +++ b/plugins/ChangeKeyboardLayout/src/stdafx.h @@ -26,8 +26,7 @@ #include "version.h"
#define MaxTextSize 64000
-#define ModuleName LPGEN("ChangeKeyboardLayout")
-#define ModuleNameW LPGENW("ChangeKeyboardLayout")
+#define ModuleName LPGEN("ChangeKeyboardLayout")
// History++ API
#define MS_HPP_EG_WINDOW "History++/ExtGrid/NewWindow"
diff --git a/plugins/ChangeKeyboardLayout/src/text_operations.cpp b/plugins/ChangeKeyboardLayout/src/text_operations.cpp index 7df6916a89..c8c44b1042 100644 --- a/plugins/ChangeKeyboardLayout/src/text_operations.cpp +++ b/plugins/ChangeKeyboardLayout/src/text_operations.cpp @@ -436,9 +436,9 @@ int ChangeLayout(HWND hTextWnd, BYTE TextOperation, BOOL CurrentWord) }
if (TextOperation == TOT_Layout)
- Skin_PlaySound(SND_ChangeLayout);
+ SkinPlaySound(SND_ChangeLayout);
else if (TextOperation == TOT_Case)
- Skin_PlaySound(SND_ChangeCase);
+ SkinPlaySound(SND_ChangeCase);
if (moOptions.CopyToClipboard)
CopyTextToClipboard(ptszMBox);
@@ -540,9 +540,9 @@ int ChangeLayout(HWND hTextWnd, BYTE TextOperation, BOOL CurrentWord) InvalidateRect(hTextWnd, NULL, FALSE);
if (TextOperation == TOT_Layout)
- Skin_PlaySound(SND_ChangeLayout);
+ SkinPlaySound(SND_ChangeLayout);
else if (TextOperation == TOT_Case)
- Skin_PlaySound(SND_ChangeCase);
+ SkinPlaySound(SND_ChangeCase);
}
return 0;
|