From d12bca1cb6b7696b9816b3961f8ae681cbcecc77 Mon Sep 17 00:00:00 2001 From: inoussa Date: Fri, 18 Apr 2014 13:33:50 +0000 Subject: [PATCH] FormatSettings : Delphi compatibility. git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@2946 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- wst/trunk/imp_utils.pas | 7 +++++++ wst/trunk/wst_global.inc | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/wst/trunk/imp_utils.pas b/wst/trunk/imp_utils.pas index a7bdb7fd4..457178ddb 100644 --- a/wst/trunk/imp_utils.pas +++ b/wst/trunk/imp_utils.pas @@ -118,6 +118,13 @@ begin Result := Copy(AQualifiedName,(sepPos + 1),Length(AQualifiedName)); end; +{$IFDEF HAS_FORMAT_SETTINGS} + {$IFDEF DELPHI} +var + DefaultFormatSettings : TFormatSettings absolute FormatSettings; + {$DEFINE HAS_DEFAULT_FORMAT_SETTINGS} + {$ENDIF DELPHI} +{$ENDIF HAS_FORMAT_SETTINGS} function TranslateDotToDecimalSeperator(const Value: string) : string; var i : PtrInt; diff --git a/wst/trunk/wst_global.inc b/wst/trunk/wst_global.inc index f3542be62..124b8ada9 100644 --- a/wst/trunk/wst_global.inc +++ b/wst/trunk/wst_global.inc @@ -97,6 +97,38 @@ {$DEFINE WST_TKPOINTER} {$DEFINE WST_TKPROCEDURE} {$ENDIF} + {$IFDEF VER230} // Delphi XE2 + {$DEFINE HAS_BUILT_IN_64UINT} + {$DEFINE WST_UNICODESTRING} + {$DEFINE USE_INLINE} + {$DEFINE WST_TKCLASSREF} + {$DEFINE WST_TKPOINTER} + {$DEFINE WST_TKPROCEDURE} + {$ENDIF} + {$IFDEF VER240} // Delphi XE3 + {$DEFINE HAS_BUILT_IN_64UINT} + {$DEFINE WST_UNICODESTRING} + {$DEFINE USE_INLINE} + {$DEFINE WST_TKCLASSREF} + {$DEFINE WST_TKPOINTER} + {$DEFINE WST_TKPROCEDURE} + {$ENDIF} + {$IFDEF VER250} // Delphi XE4 + {$DEFINE HAS_BUILT_IN_64UINT} + {$DEFINE WST_UNICODESTRING} + {$DEFINE USE_INLINE} + {$DEFINE WST_TKCLASSREF} + {$DEFINE WST_TKPOINTER} + {$DEFINE WST_TKPROCEDURE} + {$ENDIF} + {$IFDEF VER260} // Delphi XE5 + {$DEFINE HAS_BUILT_IN_64UINT} + {$DEFINE WST_UNICODESTRING} + {$DEFINE USE_INLINE} + {$DEFINE WST_TKCLASSREF} + {$DEFINE WST_TKPOINTER} + {$DEFINE WST_TKPROCEDURE} + {$ENDIF} {$DEFINE WST_SEMAPHORE_TIMEOUT} {$IFDEF MSWINDOWS} {$IFNDEF WINDOWS}