diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/menu/UMenu.pas | 8 | ||||
| -rw-r--r-- | src/ultrastardx.dpr | 4 |
2 files changed, 9 insertions, 3 deletions
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); diff --git a/src/ultrastardx.dpr b/src/ultrastardx.dpr index df546274..979d4545 100644 --- a/src/ultrastardx.dpr +++ b/src/ultrastardx.dpr @@ -53,7 +53,9 @@ uses {$IFDEF Unix} cthreads, // THIS MUST be the first used unit in FPC if Threads are used!! // (see http://wiki.lazarus.freepascal.org/Multithreaded_Application_Tutorial) - {$IFNDEF DARWIN} + // cwstring crashes in FPC 2.2.2 so do not use the cwstring stuff + {.$IFNDEF DARWIN} + {$IFDEF NOIGNORE} cwstring, // Enable Unicode support. MacOSX misses some references to iconv. {$ENDIF} {$ENDIF} |