From efd5eaf7b49a3ea046e416835a7297d4b1a9d530 Mon Sep 17 00:00:00 2001
From: mattias <nc-gaertnma@netcologne.de>
Date: Sun, 25 Jul 2004 22:54:38 +0000
Subject: [PATCH] fixed fpc 1.0.10 compilation

git-svn-id: trunk@5711 -
---
 ideintf/propedits.pp    |  2 +-
 lcl/controls.pp         |  7 +++++++
 lcl/forms.pp            |  4 ++++
 lcl/inipropstorage.pas  |  5 +++++
 lcl/propertystorage.pas | 13 +++++++++----
 lcl/xmlpropstorage.pas  |  4 ++++
 6 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/ideintf/propedits.pp b/ideintf/propedits.pp
index 81c81cdd5d..a5c5bc01d8 100644
--- a/ideintf/propedits.pp
+++ b/ideintf/propedits.pp
@@ -3220,7 +3220,7 @@ end;
 function TListPropertyEditor.GetElementName(Element: TListElementPropertyEditor
   ): shortstring;
 begin
-
+  Result:='';
 end;
 
 procedure TListPropertyEditor.GetElementProperties(
diff --git a/lcl/controls.pp b/lcl/controls.pp
index b54718295a..603dc90bdb 100644
--- a/lcl/controls.pp
+++ b/lcl/controls.pp
@@ -1608,12 +1608,14 @@ type
   end;
 
 
+  {$IFNDEF VER1_0}
   { TControlPropertyStorage }
 
   TControlPropertyStorage = class(TCustomPropertyStorage)
   protected
     procedure GetPropertyList(List : TStrings); override;
   end;
+  {$ENDIF not VER1_0}
 
 
   { TDockZone }
@@ -2335,6 +2337,7 @@ begin
   if Assigned(FOnChange) then FOnChange(Self);
 end;
 
+{$IFNDEF VER1_0}
 { TControlPropertyStorage }
 
 procedure TControlPropertyStorage.GetPropertyList(List: TStrings);
@@ -2363,6 +2366,7 @@ begin
     end;
   end;
 end;
+{$ENDIF not VER1_0}
 
 initialization
 
@@ -2384,6 +2388,9 @@ end.
 { =============================================================================
 
   $Log$
+  Revision 1.230  2004/07/25 22:54:38  mattias
+  fixed fpc 1.0.10 compilation
+
   Revision 1.229  2004/07/25 15:39:55  mattias
   added rx components  from Michal Van Canneyt
 
diff --git a/lcl/forms.pp b/lcl/forms.pp
index 3708e8b91c..754f67328a 100644
--- a/lcl/forms.pp
+++ b/lcl/forms.pp
@@ -994,6 +994,7 @@ type
   end;
   
   
+  {$IFNDEF VER1_0}
   { TFormPropertyStorage }
   
   TFormPropertyStorage = class(TControlPropertyStorage)
@@ -1004,6 +1005,7 @@ type
     constructor Create(TheOwner: TComponent); override;
     destructor Destroy; override;
   end;
+  {$ENDIF not VER1_0}
 
 
 {$IFNDEF UseFCLDataModule}
@@ -1546,6 +1548,7 @@ end;
 {$I applicationproperties.inc}
 
 //==============================================================================
+  {$IFNDEF VER1_0}
 { TFormPropertyStorage }
 
 procedure TFormPropertyStorage.FormFirstShow(Sender: TObject);
@@ -1577,6 +1580,7 @@ begin
   inherited Destroy;
 end;
 
+{$ENDIF not VER1_0}
 //==============================================================================
 
 {$I hintwindow.inc}
diff --git a/lcl/inipropstorage.pas b/lcl/inipropstorage.pas
index e8b2531999..873335c9c7 100644
--- a/lcl/inipropstorage.pas
+++ b/lcl/inipropstorage.pas
@@ -19,6 +19,7 @@ unit IniPropStorage;
 
 interface
 
+{$IFNDEF VER1_0}
 uses
   Classes, SysUtils, Forms, IniFiles, PropertyStorage;
 
@@ -62,6 +63,8 @@ Type
     property OnRestoreProperties;
   end;
 
+{$ENDIF not VER1_0}
+
 Procedure Register;
 
 
@@ -75,6 +78,7 @@ begin
   {$ENDIF}
 end;
 
+{$IFNDEF VER1_0}
 { Should move to strutils when 1.9.6 is out. }
 
 function FindPart(const HelpWilds, InputStr: string): Integer;
@@ -292,5 +296,6 @@ begin
   end;
 end;
 
+{$ENDIF not VER1_0}
 end.
 
diff --git a/lcl/propertystorage.pas b/lcl/propertystorage.pas
index 54586c2669..6d8f28bf47 100644
--- a/lcl/propertystorage.pas
+++ b/lcl/propertystorage.pas
@@ -19,6 +19,7 @@ unit PropertyStorage;
 
 interface
 
+{$IFNDEF VER1_0}
 uses
   Classes, SysUtils, RTLConst
   {$IFDEF EnableSessionProps}, RTTIUtils{$ENDIF};
@@ -160,10 +161,10 @@ Type
     property OnRestoreProperties : TNotifyEvent read FOnRestoreProperties  write FOnRestoreProperties;
   end;
   
-
+{$ENDIF not VER1_0}
 implementation
 
-
+{$IFNDEF VER1_0}
 function XorEncode(const Key, Source: string): string;
 var
   I: Integer;
@@ -609,17 +610,19 @@ begin
 end;
 
 procedure TCustomPropertyStorage.FinishPropertyList(List: TStrings);
+{$IFDEF EnableSessionProps}
 var
   i: Integer;
   CompName: string;
   PropName: string;
   ARoot: TComponent;
   AComponent: TComponent;
+{$ENDIF}
 begin
+  {$IFDEF EnableSessionProps}
   // set Objects (i.e. the component of each property)
   ARoot:=Root;
   for i:=List.Count-1 downto 0 do begin
-    {$IFDEF EnableSessionProps}
     if ParseStoredItem(List[I], CompName, PropName) then begin
       if CompareText(ARoot.Name,CompName)=0 then
         List.Objects[i]:=ARoot
@@ -633,8 +636,8 @@ begin
     end else begin
       List.Delete(i);
     end;
-    {$ENDIF}
   end;
+  {$ENDIF}
 end;
 
 function TCustomPropertyStorage.DoReadInteger(const Section, Ident: String;
@@ -714,5 +717,7 @@ begin
   StoredValues.StoredValue[AName] := Value;
 end;
 
+{$ENDIF not VER1_0}
+
 end.
 
diff --git a/lcl/xmlpropstorage.pas b/lcl/xmlpropstorage.pas
index a0894e63a5..0333f8ef13 100644
--- a/lcl/xmlpropstorage.pas
+++ b/lcl/xmlpropstorage.pas
@@ -19,6 +19,7 @@ unit XMLPropStorage;
 
 interface
 
+{$IFNDEF VER1_0}
 uses
   Classes, SysUtils, Forms, PropertyStorage, XMLCfg, DOM;
 
@@ -62,6 +63,7 @@ type
     property OnSaveProperties;
     property OnRestoreProperties;
   end;
+{$ENDIF not VER1_0}
 
 procedure Register;
 
@@ -76,6 +78,7 @@ begin
   {$ENDIF}
 end;
 
+{$IFNDEF VER1_0}
 { TCustomXMLPropStorage }
 
 procedure TCustomXMLPropStorage.StorageNeeded(ReadOnly: Boolean);
@@ -166,4 +169,5 @@ begin
     Node.Free;
 end;
 
+{$ENDIF not VER1_0}
 end.