[Instantobjects-cvscommit] SF.net SVN: instantobjects:[847] trunk/Source

[<dav...@us...>]

Revision: 847
          http://instantobjects.svn.sourceforge.net/instantobjects/revision/?rev=847&view=rev
Author:   davidvtaylor
Date:     2009-08-19 05:55:45 +0000 (Wed, 19 Aug 2009)

Log Message:
-----------
Fixes to restore compatibility with the Delphi 7 compiler
- Remove unsupported DFM properties: Padding and ExplicitTop, ExplicitWidth etc. 
- Fix some minor Model Explorer screen layout issues
- Add conditionals around "inline" directive (D2006+ only)
- Add missing validation units to IOCore package
- Fix incomplete changes to DBX3 broker (transaction logic was broken)

Modified Paths:
--------------
    trunk/Source/Brokers/DBX/InstantDBX.pas
    trunk/Source/Core/D7/IOCore.dpk
    trunk/Source/Core/InstantClasses.pas
    trunk/Source/Core/InstantRtti.pas
    trunk/Source/Design/InstantModelExplorer.dfm
    trunk/Source/Design/InstantModelImport.dfm

Modified: trunk/Source/Brokers/DBX/InstantDBX.pas
===================================================================
--- trunk/Source/Brokers/DBX/InstantDBX.pas	2009-08-18 20:52:36 UTC (rev 846)
+++ trunk/Source/Brokers/DBX/InstantDBX.pas	2009-08-19 05:55:45 UTC (rev 847)
@@ -912,12 +912,11 @@
 
 procedure TInstantDBX3Transaction.Start;
 begin
-  if FTransactionDesc.TransactionID = MAXLONG then
+  if FTransactionDesc.TransactionID = high(FTransactionDesc.TransactionID) then
     FTransactionDesc.TransactionID := 1
   else
     FTransactionDesc.TransactionID := FTransactionDesc.TransactionID + 1;
-  FTransactionDesc.IsolationLevel :=
-    TransIsolationLevelMap[Database.TransIsolation];
+  FTransactionDesc.IsolationLevel := xilREADCOMMITTED;
   Connector.Connection.StartTransaction(FTransactionDesc);
 end;
 {$ENDIF}

Modified: trunk/Source/Core/D7/IOCore.dpk
===================================================================
--- trunk/Source/Core/D7/IOCore.dpk	2009-08-18 20:52:36 UTC (rev 846)
+++ trunk/Source/Core/D7/IOCore.dpk	2009-08-19 05:55:45 UTC (rev 847)
@@ -58,6 +58,8 @@
   InstantDBBuilderFormUnit in '..\InstantDBBuilderFormUnit.pas' {InstantDBBuilderForm},
   InstantTypes in '..\InstantTypes.pas',
   InstantBrokers in '..\InstantBrokers.pas',
-  InstantMetadata in '..\InstantMetadata.pas';
+  InstantMetadata in '..\InstantMetadata.pas',
+  InstantValidation in '..\InstantValidation.pas',
+  InstantStandardValidators in '..\InstantStandardValidators.pas';
 
 end.

Modified: trunk/Source/Core/InstantClasses.pas
===================================================================
--- trunk/Source/Core/InstantClasses.pas	2009-08-18 20:52:36 UTC (rev 846)
+++ trunk/Source/Core/InstantClasses.pas	2009-08-19 05:55:45 UTC (rev 847)
@@ -194,7 +194,7 @@
     procedure WriteProperties(AObject: TPersistent);
     {$IFNDEF UNICODE}
     procedure WriteString(const Value: string);
-    procedure WriteUTF8Str(const Value: string); inline;
+    procedure WriteUTF8Str(const Value: string); {$IFDEF D10+}inline;{$ENDIF}
     {$ENDIF}
     procedure WriteValue(Value: TValueType);
     property Stream: TStream read FStream;

Modified: trunk/Source/Core/InstantRtti.pas
===================================================================
--- trunk/Source/Core/InstantRtti.pas	2009-08-18 20:52:36 UTC (rev 846)
+++ trunk/Source/Core/InstantRtti.pas	2009-08-19 05:55:45 UTC (rev 847)
@@ -78,7 +78,7 @@
 procedure InstantSetProperty(AObject: TObject; PropPath: string; Value: Variant);
 function InstantIsDefaultPropertyValue(Instance: TObject;
   PropInfo: PPropInfo): Boolean;
-function InstantGetPropName(PropInfo: PPropInfo): string; {$IFNDEF D12+}inline;{$ENDIF}
+function InstantGetPropName(PropInfo: PPropInfo): string; {$IFDEF D10+}{$IFNDEF D12+}inline;{$ENDIF}{$ENDIF}
 
 implementation
 

Modified: trunk/Source/Design/InstantModelExplorer.dfm
===================================================================
--- trunk/Source/Design/InstantModelExplorer.dfm	2009-08-18 20:52:36 UTC (rev 846)
+++ trunk/Source/Design/InstantModelExplorer.dfm	2009-08-19 05:55:45 UTC (rev 847)
@@ -42,9 +42,10 @@
     Left = 0
     Top = 0
     Width = 410
-    Height = 27
+    Height = 29
     BorderWidth = 1
     ButtonHeight = 23
+    Flat = True
     Images = ActionImages
     ParentShowHint = False
     ShowHint = True
@@ -95,15 +96,12 @@
     Align = alBottom
     BevelOuter = bvNone
     Constraints.MinHeight = 45
-    Padding.Left = 3
-    Padding.Right = 3
-    Padding.Bottom = 3
     TabOrder = 2
     Visible = False
     object AttributeCaptionPanel: TPanel
-      Left = 3
+      Left = 0
       Top = 0
-      Width = 404
+      Width = 410
       Height = 25
       Align = alTop
       BevelOuter = bvLowered

Modified: trunk/Source/Design/InstantModelImport.dfm
===================================================================
--- trunk/Source/Design/InstantModelImport.dfm	2009-08-18 20:52:36 UTC (rev 846)
+++ trunk/Source/Design/InstantModelImport.dfm	2009-08-19 05:55:45 UTC (rev 847)
@@ -1,9 +1,7 @@
 inherited InstantModelImportForm: TInstantModelImportForm
+  Width = 424
+  Height = 154
   Caption = 'Import Model'
-  ClientHeight = 120
-  ClientWidth = 416
-  ExplicitWidth = 424
-  ExplicitHeight = 154
   PixelsPerInch = 96
   TextHeight = 13
   object Label1: TLabel [0]
@@ -23,11 +21,8 @@
   inherited ButtonPanel: TPanel
     Top = 79
     Width = 416
-    ExplicitTop = 79
-    ExplicitWidth = 416
     inherited ButtonBevel: TBevel
       Width = 416
-      ExplicitWidth = 416
     end
     object ImportButton: TButton
       Left = 246