From 1567e32d89d338fcdf7ac47f4d5fb02e1ca8c18a Mon Sep 17 00:00:00 2001 From: michi_cc Date: Mon, 5 Aug 2013 20:36:28 +0000 Subject: [PATCH] (svn r25669) -Codechange: Pass UCS-4 instead of UCS-2 characters to the hotkey handlers. --- src/hotkeys.cpp | 2 +- src/hotkeys.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/hotkeys.cpp b/src/hotkeys.cpp index bf3bb8ef26..34b8fe4d76 100644 --- a/src/hotkeys.cpp +++ b/src/hotkeys.cpp @@ -337,7 +337,7 @@ void SaveHotkeysToConfig() SaveLoadHotkeys(true); } -void HandleGlobalHotkeys(uint16 key, uint16 keycode) +void HandleGlobalHotkeys(WChar key, uint16 keycode) { for (HotkeyList **list = _hotkey_lists->Begin(); list != _hotkey_lists->End(); ++list) { if ((*list)->global_hotkey_handler == NULL) continue; diff --git a/src/hotkeys.h b/src/hotkeys.h index 19791663db..25a489b3f3 100644 --- a/src/hotkeys.h +++ b/src/hotkeys.h @@ -15,6 +15,7 @@ #include "core/smallvec_type.hpp" #include "gfx_type.h" #include "window_type.h" +#include "string_type.h" /** * All data for a single hotkey. The name (for saving/loading a configfile), @@ -67,6 +68,6 @@ void LoadHotkeysFromConfig(); void SaveHotkeysToConfig(); -void HandleGlobalHotkeys(uint16 key, uint16 keycode); +void HandleGlobalHotkeys(WChar key, uint16 keycode); #endif /* HOTKEYS_H */