pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

FPC 2.0.4 compatibility ( TFormBorderStyle is not present )

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@226 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
inoussa
2007-07-28 18:19:53 +00:00
parent 8f8b770f34
commit bd61ea0229
4 changed files with 76 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
wst/trunk/base_service_intf.pas
View File

@@ -1199,8 +1199,15 @@ const
function IsStoredPropClass(AClass : TClass;PropInfo : PPropInfo) : TPropStoreType; function IsStoredPropClass(AClass : TClass;PropInfo : PPropInfo) : TPropStoreType;
{$IFDEF FPC}
{$IFDEF FPC_211}
var var
wst_FormatSettings : TFormatSettings; wst_FormatSettings : TFormatSettings;
{$ENDIF}
{$ELSE}
var
wst_FormatSettings : TFormatSettings;
{$ENDIF}
implementation implementation
uses imp_utils; uses imp_utils;
@@ -4508,11 +4515,15 @@ end;
initialization initialization
{$IFDEF FPC} {$IFDEF FPC}
{$IFDEF FPC_211}
wst_FormatSettings := DefaultFormatSettings; wst_FormatSettings := DefaultFormatSettings;
wst_FormatSettings.DecimalSeparator := '.';
{$ENDIF}
{$ELSE} {$ELSE}
GetLocaleFormatSettings(GetThreadLocale(),wst_FormatSettings); GetLocaleFormatSettings(GetThreadLocale(),wst_FormatSettings);
{$ENDIF}
wst_FormatSettings.DecimalSeparator := '.'; wst_FormatSettings.DecimalSeparator := '.';
{$ENDIF}
TypeRegistryInstance := TTypeRegistry.Create(); TypeRegistryInstance := TTypeRegistry.Create();
SerializeOptionsRegistryInstance := TSerializeOptionsRegistry.Create(); SerializeOptionsRegistryInstance := TSerializeOptionsRegistry.Create();

34
wst/trunk/base_soap_formatter.pas
View File

@@ -746,6 +746,7 @@ function TSOAPBaseFormatter.PutFloat(
Var Var
s, frmt : string; s, frmt : string;
prcsn : Integer; prcsn : Integer;
{$IFDEF FPC} {$IFNDEF FPC_211} i : Integer; {$ENDIF}{$ENDIF}
begin begin
Case GetTypeData(ATypeInfo)^.FloatType Of Case GetTypeData(ATypeInfo)^.FloatType Of
ftSingle, ftSingle,
@@ -755,10 +756,18 @@ begin
ftExtended : prcsn := 15; ftExtended : prcsn := 15;
End; End;
frmt := '#.' + StringOfChar('#',prcsn) + 'E-0'; frmt := '#.' + StringOfChar('#',prcsn) + 'E-0';
{$IFDEF FPC}
{$IFDEF FPC_211}
s := FormatFloat(frmt,AData,wst_FormatSettings); s := FormatFloat(frmt,AData,wst_FormatSettings);
// i := Pos(',',s); {$ELSE}
//If ( i > 0 ) Then s := FormatFloat(frmt,AData);
//s[i] := '.'; i := Pos(',',s);
If ( i > 0 ) Then
s[i] := '.';
{$ENDIF}
{$ELSE}
s := FormatFloat(frmt,AData,wst_FormatSettings);
{$ENDIF}
Result := InternalPutData(AName,ATypeInfo,s); Result := InternalPutData(AName,ATypeInfo,s);
end; end;
@@ -849,7 +858,16 @@ procedure TSOAPBaseFormatter.GetFloat(
var AData : Extended var AData : Extended
); );
begin begin
AData := StrToFloatDef(Trim(GetNodeValue(AName)),0,wst_FormatSettings); {$IFDEF FPC}
{$IFDEF FPC_211}
AData := StrToFloatDef(Trim(GetNodeValue(AName)),0,wst_FormatSettings);
{$ELSE}
AData := StrToFloatDef(Trim(GetNodeValue(AName)),0);
{$ENDIF}
{$ELSE}
AData := StrToFloatDef(Trim(GetNodeValue(AName)),0,wst_FormatSettings);
{$ENDIF}
//AData := StrToFloatDef(Trim(GetNodeValue(AName)),0,wst_FormatSettings);
end; end;
procedure TSOAPBaseFormatter.GetStr( procedure TSOAPBaseFormatter.GetStr(
@@ -1656,7 +1674,15 @@ begin
end; end;
tkFloat : tkFloat :
begin begin
{$IFDEF FPC}
{$IFDEF FPC_211}
floatDt := StrToFloatDef(Trim(dataBuffer),0,wst_FormatSettings); floatDt := StrToFloatDef(Trim(dataBuffer),0,wst_FormatSettings);
{$ELSE}
floatDt := StrToFloatDef(Trim(dataBuffer),0);
{$ENDIF}
{$ELSE}
floatDt := StrToFloatDef(Trim(dataBuffer),0,wst_FormatSettings);
{$ENDIF}
case GetTypeData(ATypeInfo)^.FloatType of case GetTypeData(ATypeInfo)^.FloatType of
ftSingle : Single(AData) := floatDt; ftSingle : Single(AData) := floatDt;
ftDouble : Double(AData) := floatDt; ftDouble : Double(AData) := floatDt;

20
wst/trunk/base_xmlrpc_formatter.pas
View File

@@ -834,7 +834,16 @@ procedure TXmlRpcBaseFormatter.GetFloat(
var AData : Extended var AData : Extended
); );
begin begin
AData := StrToFloatDef(Trim(GetNodeValue(AName)),0,wst_FormatSettings); {$IFDEF FPC}
{$IFDEF FPC_211}
AData := StrToFloatDef(Trim(GetNodeValue(AName)),0,wst_FormatSettings);
{$ELSE}
AData := StrToFloatDef(Trim(GetNodeValue(AName)),0);
{$ENDIF}
{$ELSE}
AData := StrToFloatDef(Trim(GetNodeValue(AName)),0,wst_FormatSettings);
{$ENDIF}
//AData := StrToFloatDef(Trim(GetNodeValue(AName)),0,wst_FormatSettings);
end; end;
procedure TXmlRpcBaseFormatter.GetStr( procedure TXmlRpcBaseFormatter.GetStr(
@@ -1321,7 +1330,16 @@ begin
end; end;
tkFloat : tkFloat :
begin begin
{$IFDEF FPC}
{$IFDEF FPC_211}
floatDt := StrToFloatDef(Trim(dataBuffer),0,wst_FormatSettings); floatDt := StrToFloatDef(Trim(dataBuffer),0,wst_FormatSettings);
{$ELSE}
floatDt := StrToFloatDef(Trim(dataBuffer),0);
{$ENDIF}
{$ELSE}
floatDt := StrToFloatDef(Trim(dataBuffer),0,wst_FormatSettings);
{$ENDIF}
//floatDt := StrToFloatDef(Trim(dataBuffer),0,wst_FormatSettings);
case GetTypeData(ATypeInfo)^.FloatType of case GetTypeData(ATypeInfo)^.FloatType of
ftSingle : Single(AData) := floatDt; ftSingle : Single(AData) := floatDt;
ftDouble : Double(AData) := floatDt; ftDouble : Double(AData) := floatDt;

53
wst/trunk/tests/test_suite/wst_test_suite.lpi
View File

@@ -7,7 +7,7 @@
<MainUnit Value="0"/> <MainUnit Value="0"/>
<IconPath Value="./"/> <IconPath Value="./"/>
<TargetFileExt Value=".exe"/> <TargetFileExt Value=".exe"/>
<ActiveEditorIndexAtStart Value="0"/> <ActiveEditorIndexAtStart Value="2"/>
</General> </General>
<PublishOptions> <PublishOptions>
<Version Value="2"/> <Version Value="2"/>
@@ -74,8 +74,8 @@
<Filename Value="..\..\base_service_intf.pas"/> <Filename Value="..\..\base_service_intf.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<UnitName Value="base_service_intf"/> <UnitName Value="base_service_intf"/>
<CursorPos X="17" Y="4108"/> <CursorPos X="46" Y="4524"/>
<TopLine Value="4060"/> <TopLine Value="4504"/>
<EditorIndex Value="0"/> <EditorIndex Value="0"/>
<UsageCount Value="200"/> <UsageCount Value="200"/>
<Bookmarks Count="2"> <Bookmarks Count="2">
@@ -88,8 +88,8 @@
<Filename Value="..\..\base_soap_formatter.pas"/> <Filename Value="..\..\base_soap_formatter.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<UnitName Value="base_soap_formatter"/> <UnitName Value="base_soap_formatter"/>
<CursorPos X="3" Y="545"/> <CursorPos X="1" Y="1677"/>
<TopLine Value="528"/> <TopLine Value="1664"/>
<EditorIndex Value="1"/> <EditorIndex Value="1"/>
<UsageCount Value="200"/> <UsageCount Value="200"/>
<Loaded Value="True"/> <Loaded Value="True"/>
@@ -190,7 +190,7 @@
<UnitName Value="server_service_intf"/> <UnitName Value="server_service_intf"/>
<CursorPos X="54" Y="19"/> <CursorPos X="54" Y="19"/>
<TopLine Value="1"/> <TopLine Value="1"/>
<EditorIndex Value="2"/> <EditorIndex Value="3"/>
<UsageCount Value="203"/> <UsageCount Value="203"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit17> </Unit17>
@@ -281,7 +281,7 @@
<UnitName Value="test_parserdef"/> <UnitName Value="test_parserdef"/>
<CursorPos X="93" Y="76"/> <CursorPos X="93" Y="76"/>
<TopLine Value="11"/> <TopLine Value="11"/>
<UsageCount Value="172"/> <UsageCount Value="173"/>
</Unit30> </Unit30>
<Unit31> <Unit31>
<Filename Value="..\..\..\..\..\lazarusClean\fpc\2.0.4\source\rtl\inc\objpash.inc"/> <Filename Value="..\..\..\..\..\lazarusClean\fpc\2.0.4\source\rtl\inc\objpash.inc"/>
@@ -319,9 +319,11 @@
<Filename Value="..\..\base_xmlrpc_formatter.pas"/> <Filename Value="..\..\base_xmlrpc_formatter.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<UnitName Value="base_xmlrpc_formatter"/> <UnitName Value="base_xmlrpc_formatter"/>
<CursorPos X="26" Y="13"/> <CursorPos X="9" Y="1341"/>
<TopLine Value="1"/> <TopLine Value="1319"/>
<UsageCount Value="110"/> <EditorIndex Value="2"/>
<UsageCount Value="111"/>
<Loaded Value="True"/>
</Unit36> </Unit36>
<Unit37> <Unit37>
<Filename Value="..\..\ws_helper\pscanner.pp"/> <Filename Value="..\..\ws_helper\pscanner.pp"/>
@@ -443,7 +445,7 @@
<UnitName Value="wst_fpc_xml"/> <UnitName Value="wst_fpc_xml"/>
<CursorPos X="8" Y="38"/> <CursorPos X="8" Y="38"/>
<TopLine Value="11"/> <TopLine Value="11"/>
<UsageCount Value="56"/> <UsageCount Value="57"/>
</Unit54> </Unit54>
<Unit55> <Unit55>
<Filename Value="..\..\wst_global.inc"/> <Filename Value="..\..\wst_global.inc"/>
@@ -465,7 +467,7 @@
<CursorPos X="29" Y="43"/> <CursorPos X="29" Y="43"/>
<TopLine Value="3"/> <TopLine Value="3"/>
<EditorIndex Value="8"/> <EditorIndex Value="8"/>
<UsageCount Value="47"/> <UsageCount Value="48"/>
<Loaded Value="True"/> <Loaded Value="True"/>
</Unit57> </Unit57>
<Unit58> <Unit58>
@@ -473,9 +475,7 @@
<UnitName Value="fpcunit"/> <UnitName Value="fpcunit"/>
<CursorPos X="21" Y="99"/> <CursorPos X="21" Y="99"/>
<TopLine Value="84"/> <TopLine Value="84"/>
<EditorIndex Value="10"/>
<UsageCount Value="15"/> <UsageCount Value="15"/>
<Loaded Value="True"/>
</Unit58> </Unit58>
<Unit59> <Unit59>
<Filename Value="..\..\..\..\..\..\lazarus_23_215XX\fpc\source\packages\fcl-fpcunit\src\testregistry.pp"/> <Filename Value="..\..\..\..\..\..\lazarus_23_215XX\fpc\source\packages\fcl-fpcunit\src\testregistry.pp"/>
@@ -504,9 +504,7 @@
<UnitName Value="typinfo"/> <UnitName Value="typinfo"/>
<CursorPos X="79" Y="218"/> <CursorPos X="79" Y="218"/>
<TopLine Value="203"/> <TopLine Value="203"/>
<EditorIndex Value="3"/>
<UsageCount Value="12"/> <UsageCount Value="12"/>
<Loaded Value="True"/>
</Unit62> </Unit62>
<Unit63> <Unit63>
<Filename Value="..\..\..\..\..\..\lazarus_23_215XX\fpc\source\rtl\objpas\sysutils\sysstrh.inc"/> <Filename Value="..\..\..\..\..\..\lazarus_23_215XX\fpc\source\rtl\objpas\sysutils\sysstrh.inc"/>
@@ -521,28 +519,7 @@
<UsageCount Value="11"/> <UsageCount Value="11"/>
</Unit64> </Unit64>
</Units> </Units>
<JumpHistory Count="5" HistoryIndex="4"> <JumpHistory Count="0" HistoryIndex="-1"/>
<Position1>
<Filename Value="..\..\base_soap_formatter.pas"/>
<Caret Line="1" Column="1" TopLine="1"/>
</Position1>
<Position2>
<Filename Value="..\..\base_soap_formatter.pas"/>
<Caret Line="543" Column="36" TopLine="528"/>
</Position2>
<Position3>
<Filename Value="..\..\binary_streamer.pas"/>
<Caret Line="15" Column="30" TopLine="1"/>
</Position3>
<Position4>
<Filename Value="..\..\binary_streamer.pas"/>
<Caret Line="261" Column="24" TopLine="238"/>
</Position4>
<Position5>
<Filename Value="..\..\base_service_intf.pas"/>
<Caret Line="1" Column="1" TopLine="1"/>
</Position5>
</JumpHistory>
</ProjectOptions> </ProjectOptions>
<CompilerOptions> <CompilerOptions>
<Version Value="5"/> <Version Value="5"/>