merged unicode branch (r1931) into trunk

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1939 b956fd51-792f-4845-bead-9b4dfca2ff2c

1 files changed, 13 insertions, 14 deletions

diff --git a/src/screens/UScreenOptionsGame.pas b/src/screens/UScreenOptionsGame.pas
index 0c152c41..caeaad6e 100644
--- a/src/screens/UScreenOptionsGame.pas
+++ b/src/screens/UScreenOptionsGame.pas
@@ -35,40 +35,39 @@ interface
 
 uses
   SDL,
+  UMenu,
   UDisplay,
+  UMusic,
   UFiles,
   UIni,
-  UMenu,
-  UMusic,
-  USongs,
-  UThemes;
+  UThemes,
+  USongs;
 
 type
   TScreenOptionsGame = class(TMenu)
     public
       old_Tabs, old_Sorting: integer;
       constructor Create; override;
-      function ParseInput(PressedKey: cardinal; CharCode: WideChar; PressedDown: boolean): boolean; override;
-      procedure onShow; override;
+      function ParseInput(PressedKey: cardinal; CharCode: UCS4Char; PressedDown: boolean): boolean; override;
+      procedure OnShow; override;
       procedure RefreshSongs;
   end;
 
 implementation
 
 uses
-  SysUtils,
-  UGraphic;
+  UGraphic,
+  UUnicodeUtils,
+  SysUtils;
 
-function TScreenOptionsGame.ParseInput(PressedKey: cardinal;
-                                       CharCode: WideChar;
-				       PressedDown: boolean): boolean;
+function TScreenOptionsGame.ParseInput(PressedKey: cardinal; 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;
@@ -166,7 +165,7 @@ begin
     ScreenSong.Refresh;
 end;
 
-procedure TScreenOptionsGame.onShow;
+procedure TScreenOptionsGame.OnShow;
 begin
   inherited;