From 917901e8e33438c425aef50a0a7417f32d77b760 Mon Sep 17 00:00:00 2001
From: s_alexander <s_alexander@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Mon, 9 Nov 2009 00:27:55 +0000
Subject: merged unicode branch (r1931) into trunk

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1939 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/screens/UScreenOptionsSound.pas | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'src/screens/UScreenOptionsSound.pas')

diff --git a/src/screens/UScreenOptionsSound.pas b/src/screens/UScreenOptionsSound.pas
index aa87ceb4..7556dceb 100644
--- a/src/screens/UScreenOptionsSound.pas
+++ b/src/screens/UScreenOptionsSound.pas
@@ -34,8 +34,8 @@ interface
 {$I switches.inc}
 
 uses
-  UMenu,
   SDL,
+  UMenu,
   UDisplay,
   UMusic,
   UFiles,
@@ -46,26 +46,27 @@ type
   TScreenOptionsSound = class(TMenu)
   public
     constructor Create; override;
-    function ParseInput(PressedKey: cardinal; CharCode: widechar;
+    function ParseInput(PressedKey: Cardinal; CharCode: UCS4Char;
       PressedDown: boolean): boolean; override;
-    procedure onShow; override;
+    procedure OnShow; override;
   end;
 
 implementation
 
 uses
   UGraphic,
+  UUnicodeUtils,
   SysUtils;
 
 function TScreenOptionsSound.ParseInput(PressedKey: cardinal;
-  CharCode: widechar; PressedDown: boolean): boolean;
+  CharCode: UCS4Char; PressedDown: boolean): boolean;
 begin
   Result := true;
   if (PressedDown) then
   begin // Key Down
         // check normal keys
-    case WideCharUpperCase(CharCode)[1] of
-      'Q':
+    case UCS4UpperCase(CharCode) of
+      Ord('Q'):
       begin
         Result := false;
         Exit;
@@ -177,7 +178,7 @@ begin
   Interaction := 0;
 end;
 
-procedure TScreenOptionsSound.onShow;
+procedure TScreenOptionsSound.OnShow;
 begin
   inherited;
   Interaction := 0;
-- 
cgit v1.2.3