- WideStringUpperCase moved to UUnicodeUtils.pas

- WideCharUpperCase removed as single characters (code-point) can be represented by two WideChars (surrogates). Convert to UCS4 instead (one code-point <-> one UCS4Char).
- UCS4 functions added to UUUnicodeUtils
- string replaced with UTF8String (although it's just a typedef) to mark UTF8 strings.

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

1 files changed, 22 insertions, 21 deletions

diff --git a/unicode/src/screens/UScreenEditSub.pas b/unicode/src/screens/UScreenEditSub.pas
index 167d94b4..4189ec74 100644
--- a/unicode/src/screens/UScreenEditSub.pas
+++ b/unicode/src/screens/UScreenEditSub.pas
@@ -33,25 +33,25 @@ interface
 {$I switches.inc}
 
 uses
-    UMenu,
-    UMusic,
-    SDL,
-    SysUtils,
-    UFiles,
-    UTime,
-    USongs,
-    USong,
-    UIni,
-    ULog,
-    UTexture,
-    UMenuText,
-    UEditorLyrics,
-    Math,
-    gl,
-    {$IFDEF UseMIDIPort}
-    MidiOut,
-    {$ENDIF}
-    UThemes;
+  UMenu,
+  UMusic,
+  SDL,
+  SysUtils,
+  UFiles,
+  UTime,
+  USongs,
+  USong,
+  UIni,
+  ULog,
+  UTexture,
+  UMenuText,
+  UEditorLyrics,
+  Math,
+  gl,
+  {$IFDEF UseMIDIPort}
+  MidiOut,
+  {$ENDIF}
+  UThemes;
 
 type
   TScreenEditSub = class(TMenu)
@@ -130,7 +130,8 @@ uses
   UDraw,
   UMain,
   USkins,
-  ULanguage;
+  ULanguage,
+  UUnicodeUtils;
 
 // Method for input parsing. If False is returned, GetNextWindow
 // should be checked to know the next window to load;
@@ -150,7 +151,7 @@ begin
 
   If (PressedDown) then begin // Key Down
     // check normal keys
-    case WideCharUpperCase(CharCode)[1] of
+    case WideStringUpperCase(CharCode)[1] of
       'Q':
         begin
           Result := false;