Mercurial > hg > openttd

changeset 20694:d12783a922d3 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
-Codechange: Pass UCS-4 instead of UCS-2 characters to the hotkey handlers.
author Michael Lutz <michi@icosahedron.de>
date Sat, 23 Mar 2013 23:38:30 +0100
parents 2b19f1e6c882
children 0d650ab65a85
files src/hotkeys.cpp src/hotkeys.h
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/hotkeys.cpp
+++ b/src/hotkeys.cpp
@@ -337,7 +337,7 @@
 	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;
--- 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 SaveHotkeysToConfig();
 
 
-void HandleGlobalHotkeys(uint16 key, uint16 keycode);
+void HandleGlobalHotkeys(WChar key, uint16 keycode);
 
 #endif /* HOTKEYS_H */