From 77927874d012232c7ee8e3cf068d3ca154afc2a9 Mon Sep 17 00:00:00 2001
From: tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Fri, 2 May 2008 20:52:08 +0000
Subject: MacOSX patch for WideUpperChar. The cwstring Unicode manager is not
 supported at the moment because of some problems with the iconv linker
 dependencies.

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1056 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 Game/Code/Menu/UMenu.pas | 34 +++++++++++++++++++++++++++++-----
 1 file changed, 29 insertions(+), 5 deletions(-)

(limited to 'Game/Code/Menu')

diff --git a/Game/Code/Menu/UMenu.pas b/Game/Code/Menu/UMenu.pas
index eb5c49a0..126fefa1 100644
--- a/Game/Code/Menu/UMenu.pas
+++ b/Game/Code/Menu/UMenu.pas
@@ -47,6 +47,7 @@ type
 
       // interaction
       function WideCharUpperCase(wchar: WideChar) : WideString;
+      function WideStringUpperCase(wstring: WideString) : WideString;
       procedure AddInteraction(Typ, Num: integer);
       procedure SetInteraction(Num: integer);
       property Interaction: integer read SelInteraction write SetInteraction;
@@ -1563,16 +1564,39 @@ begin
   // nothing
 end;
 
+(*
+ * Wrapper for WideUpperCase. Needed because some plattforms have problems with
+ * unicode support.
+ *)
 function TMenu.WideCharUpperCase(wchar: WideChar) : WideString;
 begin
   // On Linux and MacOSX the cwstring unit is necessary for Unicode function-calls.
   // Otherwise you will get an EIntOverflow exception (thrown by unimplementedwidestring()).
+  // The Unicode manager cwstring does not work with MacOSX at the moment because
+  // of missing references to iconv. So we have to use Ansi... for the moment.
 
-  // The FPC implementation of WideUpperCase returns nil if wchar is #0 (e.g. if an arrow key is pressed)
-  if (wchar <> #0) then
-    Result := WideUpperCase(wchar)
-  else
-    Result := #0;
+  {$IFNDEF DARWIN}
+    // The FPC implementation of WideUpperCase returns nil if wchar is #0 (e.g. if an arrow key is pressed)
+    if (wchar <> #0) then
+      Result := WideUpperCase(wchar)
+    else
+      Result := #0;
+  {$ELSE}
+    Result := AnsiUpperCase(wchar)
+  {$ENDIF}
+end;
+
+(*
+ * Wrapper for WideUpperCase. Needed because some plattforms have problems with
+ * unicode support.
+ *)
+function TMenu.WideStringUpperCase(wstring: WideString) : WideString;
+begin
+  {$IFNDEF DARWIN}
+    Result := WideUpperCase(wstring)
+  {$ELSE}
+    Result := AnsiUpperCase(wstring);
+  {$ENDIF}
 end;
 
 procedure TMenu.onHide;
-- 
cgit v1.2.3