From beb06421d53294357184e8e761bf9fae10a0c4be Mon Sep 17 00:00:00 2001
From: tobigun <tobigun@b956fd51-792f-4845-bead-9b4dfca2ff2c>
Date: Mon, 20 Oct 2008 09:58:54 +0000
Subject: FPC 2.2.2 compatibility. USDX crashed with an error in iconv_close.
 After disabling the cwstring unit everything works fine again. Drawback:
 WideUpperCase() as other unicode support does not work anymore (cwstring was
 a dummy in 2.2.0 so this is not a big deal).

git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1462 b956fd51-792f-4845-bead-9b4dfca2ff2c
---
 src/menu/UMenu.pas | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/menu/UMenu.pas')

diff --git a/src/menu/UMenu.pas b/src/menu/UMenu.pas
index 88f00e30..16ecc658 100644
--- a/src/menu/UMenu.pas
+++ b/src/menu/UMenu.pas
@@ -1528,7 +1528,9 @@ begin
   // 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.
 
-  {$IFNDEF DARWIN}
+  // cwstring crashes in FPC 2.2.2 so do not use the cwstring stuff
+  {.$IFNDEF DARWIN}
+  {$IFDEF NOIGNORE}
     // 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)
@@ -1545,7 +1547,9 @@ end;
  *)
 function TMenu.WideStringUpperCase(wstring: WideString) : WideString;
 begin
-  {$IFNDEF DARWIN}
+  // cwstring crashes in FPC 2.2.2 so do not use the cwstring stuff
+  {.$IFNDEF DARWIN}
+  {$IFDEF NOIGNORE}
     Result := WideUpperCase(wstring)
   {$ELSE}
     Result := AnsiUpperCase(wstring);
-- 
cgit v1.2.3