instantobjects-cvscommit — Generates a message for every commit made on CVS

[Instantobjects-cvscommit] Source/Core InstantPersistence.pas,1.34,1.35

[Nando D. <na...@us...>]

Update of /cvsroot/instantobjects/Source/Core
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8615/Core

Modified Files:
	InstantPersistence.pas 
Log Message:
fixed AV in InternalRefreshObjects (on behalf of Joao Morais); comment added

Index: InstantPersistence.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Core/InstantPersistence.pas,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -d -r1.34 -r1.35
*** InstantPersistence.pas	6 Apr 2005 11:04:43 -0000	1.34
--- InstantPersistence.pas	7 Apr 2005 08:11:35 -0000	1.35
***************
*** 12271,12275 ****
    if not DataSet.Active then
      Exit;
!   BusyObjects := TObjectList.Create;
    try
      for I := 0 to Pred(ObjectRowCount) do
--- 12271,12275 ----
    if not DataSet.Active then
      Exit;
!   BusyObjects := TObjectList.Create(False);
    try
      for I := 0 to Pred(ObjectRowCount) do
***************
*** 13702,13706 ****
          if PartsAttribute.IsChanged then
          begin
!           for ii:=0 to Pred(PartsAttribute.Count) do
              PartsAttribute.Items[ii];
            if Map[i].StorageKind = skExternal then
--- 13702,13708 ----
          if PartsAttribute.IsChanged then
          begin
!           // Make sure that all the items are in memory because they will be
!           // accessed later, after the database records have been deleted.
!           for ii := 0 to Pred(PartsAttribute.Count) do
              PartsAttribute.Items[ii];
            if Map[i].StorageKind = skExternal then
***************
*** 14365,14369 ****
    BusyObjects: TObjectList;
  begin
!   BusyObjects := TObjectList.Create;
    try
      for I := 0 to Pred(ObjectReferenceCount) do
--- 14367,14371 ----
    BusyObjects: TObjectList;
  begin
!   BusyObjects := TObjectList.Create(False);
    try
      for I := 0 to Pred(ObjectReferenceCount) do

[Instantobjects-cvscommit] Source/Core InstantPersistence.pas,1.33,1.34

[Nando D. <na...@us...>]

Update of /cvsroot/instantobjects/Source/Core
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv579/Core

Modified Files:
	InstantPersistence.pas 
Log Message:
fixed memory leak in TInstantCache

Index: InstantPersistence.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Core/InstantPersistence.pas,v
retrieving revision 1.33
retrieving revision 1.34
diff -C2 -d -r1.33 -r1.34
*** InstantPersistence.pas	5 Apr 2005 00:45:14 -0000	1.33
--- InstantPersistence.pas	6 Apr 2005 11:04:43 -0000	1.34
***************
*** 26,30 ****
   * Contributor(s):
   * Carlo Barazzetta, Andrea Petrelli, Nando Dessena, Steven Mitchell,
!  * Joao Morais, Cisar Coll
   *
   * ***** END LICENSE BLOCK ***** *)
--- 26,30 ----
   * Contributor(s):
   * Carlo Barazzetta, Andrea Petrelli, Nando Dessena, Steven Mitchell,
!  * Joao Morais, Cesar Coll
   *
   * ***** END LICENSE BLOCK ***** *)
***************
*** 9233,9237 ****
        Node := Enumerator.Next;
      end;
!   except
      Enumerator.Free;
    end;
--- 9233,9237 ----
        Node := Enumerator.Next;
      end;
!   finally
      Enumerator.Free;
    end;

[Instantobjects-cvscommit] Source/Core InstantPersistence.pas,1.32,1.33

[Steven M. <sr...@us...>]

Update of /cvsroot/instantobjects/Source/Core
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27614

Modified Files:
	InstantPersistence.pas 
Log Message:
Bugs fixed:
1.  Links an object to its owner in TInstantParts.InternalAdd().
2.  Change ReadPartsAttribute local procedure in 
TInstantSQLResolver.ReadAttribute() to retrieve data properly,
independent of the class (IO retrieves all properties from all tables).



Index: InstantPersistence.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Core/InstantPersistence.pas,v
retrieving revision 1.32
retrieving revision 1.33
diff -C2 -d -r1.32 -r1.33
*** InstantPersistence.pas	4 Apr 2005 22:12:48 -0000	1.32
--- InstantPersistence.pas	5 Apr 2005 00:45:14 -0000	1.33
***************
*** 6528,6531 ****
--- 6528,6532 ----
      try
        Result := ObjectReferenceList.Add(Ref);
+       SetOwnerContext(AObject);
      except
        Ref.Free;
***************
*** 13973,13977 ****
                begin
                  RefObject := TInstantObjectReference.Create(nil, True);
!                 RefObject.ReferenceObject(Metadata.ObjectClass, DataSet.Fields[1].AsString);
                  (Attribute as TInstantParts).ObjectReferenceList.Add(RefObject);
                  {PartObject := AttributeMetadata.ObjectClass.Retrieve(Fields[1].AsString, False, False, AObject.Connector);
--- 13974,13978 ----
                begin
                  RefObject := TInstantObjectReference.Create(nil, True);
!                 RefObject.ReferenceObject(DataSet.Fields[0].AsString, DataSet.Fields[1].AsString);
                  (Attribute as TInstantParts).ObjectReferenceList.Add(RefObject);
                  {PartObject := AttributeMetadata.ObjectClass.Retrieve(Fields[1].AsString, False, False, AObject.Connector);

[Instantobjects-cvscommit] Source/Core InstantCode.pas,1.13,1.14

[Steven M. <sr...@us...>]

Update of /cvsroot/instantobjects/Source/Core
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24545

Modified Files:
	InstantCode.pas 
Log Message:
Bugs fixed:
1.  Avoid sorting class attributes. It should be the DBA or developers that
determines attributes' order.


Index: InstantCode.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Core/InstantCode.pas,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** InstantCode.pas	21 Mar 2005 16:48:04 -0000	1.13
--- InstantCode.pas	5 Apr 2005 00:35:28 -0000	1.14
***************
*** 25,29 ****
   *
   * Contributor(s):
!  * Carlo Barazzetta, Adrea Petrelli, Nando Dessena, Steven Mitchell.
   * ***** END LICENSE BLOCK ***** *)
  
--- 25,31 ----
   *
   * Contributor(s):
!  * Carlo Barazzetta, Adrea Petrelli, Nando Dessena, Steven Mitchell,
!  * Joao Morais
!  *
   * ***** END LICENSE BLOCK ***** *)
  
***************
*** 4528,4532 ****
  begin
    inherited;
!   Sort;
  end;
  
--- 4530,4534 ----
  begin
    inherited;
!   //Sort;
  end;
  

[Instantobjects-cvscommit] Source/Core InstantPersistence.pas,1.31,1.32

[Steven M. <sr...@us...>]

Update of /cvsroot/instantobjects/Source/Core
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19583

Modified Files:
	InstantPersistence.pas 
Log Message:
Bug fix:
1.  When you store in a Parts Attribute an object that is not of the class that 
the PartsAtribute was defined for, but of an inherited class, then when you 
retrieve the object, those parts are NOT retrieved.


Index: InstantPersistence.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Core/InstantPersistence.pas,v
retrieving revision 1.31
retrieving revision 1.32
diff -C2 -d -r1.31 -r1.32
*** InstantPersistence.pas	4 Apr 2005 07:05:17 -0000	1.31
--- InstantPersistence.pas	4 Apr 2005 22:12:48 -0000	1.32
***************
*** 25,29 ****
   *
   * Contributor(s):
!  * Carlo Barazzetta, Andrea Petrelli, Nando Dessena, Joao Morais
   *
   * ***** END LICENSE BLOCK ***** *)
--- 25,30 ----
   *
   * Contributor(s):
!  * Carlo Barazzetta, Andrea Petrelli, Nando Dessena, Steven Mitchell,
!  * Joao Morais, Cisar Coll
   *
   * ***** END LICENSE BLOCK ***** *)
***************
*** 12711,12716 ****
    WhereStr: string;
  begin
!   WhereStr := BuildWhereStr([InstantParentClassFieldName,
!     InstantParentIdFieldName]);
    Result := Format('DELETE FROM %s WHERE %s',
      [EmbraceTable('%s'), WhereStr]);
--- 12712,12716 ----
    WhereStr: string;
  begin
!   WhereStr := BuildWhereStr([InstantParentIdFieldName]);
    Result := Format('DELETE FROM %s WHERE %s',
      [EmbraceTable('%s'), WhereStr]);
***************
*** 12722,12726 ****
    WhereStr: string;
  begin
!   WhereStr := BuildWhereStr([InstantClassFieldName, InstantIdFieldName]);
    Result := Format('DELETE FROM %s WHERE %s',
      [EmbraceTable(Map.Name), WhereStr]);
--- 12722,12726 ----
    WhereStr: string;
  begin
!   WhereStr := BuildWhereStr([InstantIdFieldName]);
    Result := Format('DELETE FROM %s WHERE %s',
      [EmbraceTable(Map.Name), WhereStr]);
***************
*** 12780,12786 ****
  begin
    FieldStr := Format('%s, %s', [EmbraceField('%s'), EmbraceField('%s')]);
!   WhereStr := Format('%s = :%s AND %s = :%s',
!     [EmbraceField(InstantClassFieldName), InstantClassFieldName,
!      EmbraceField(InstantIdFieldName), InstantIdFieldName]);
    Result := Format('SELECT %s FROM %s WHERE %s',
      [FieldStr, EmbraceTable('%s'), WhereStr]);
--- 12780,12785 ----
  begin
    FieldStr := Format('%s, %s', [EmbraceField('%s'), EmbraceField('%s')]);
!   WhereStr := Format('%s = :%s',
!     [EmbraceField(InstantIdFieldName), InstantIdFieldName]);
    Result := Format('SELECT %s FROM %s WHERE %s',
      [FieldStr, EmbraceTable('%s'), WhereStr]);
***************
*** 12794,12801 ****
    FieldStr := Format('%s, %s, %s', [EmbraceField(InstantChildClassFieldName),
      EmbraceField(InstantChildIdFieldName), EmbraceField(InstantSequenceNoFieldName)]);
!   WhereStr := Format('%s = :%s AND %s = :%s AND %s = :%s',
      [EmbraceField(InstantParentClassFieldName), InstantParentClassFieldName,
!     EmbraceField(InstantParentIdFieldName), InstantParentIdFieldName,
!     EmbraceField(InstantChildClassFieldName), InstantChildClassFieldName]);
    Result := Format('SELECT %s FROM %s WHERE %s ORDER BY %s',
      [FieldStr, EmbraceTable('%s'), WhereStr, EmbraceField(InstantSequenceNoFieldName)]);
--- 12793,12799 ----
    FieldStr := Format('%s, %s, %s', [EmbraceField(InstantChildClassFieldName),
      EmbraceField(InstantChildIdFieldName), EmbraceField(InstantSequenceNoFieldName)]);
!   WhereStr := Format('%s = :%s AND %s = :%s',
      [EmbraceField(InstantParentClassFieldName), InstantParentClassFieldName,
!      EmbraceField(InstantParentIdFieldName), InstantParentIdFieldName]); 
    Result := Format('SELECT %s FROM %s WHERE %s ORDER BY %s',
      [FieldStr, EmbraceTable('%s'), WhereStr, EmbraceField(InstantSequenceNoFieldName)]);
***************
*** 12808,12812 ****
  begin
    FieldStr := BuildFieldList(Map, [InstantUpdateCountFieldName]);
!   WhereStr := BuildWhereStr([InstantClassFieldName, InstantIdFieldName]);
    Result := Format('SELECT %s FROM %s WHERE %s',
      [FieldStr, EmbraceTable(Map.Name), WhereStr]);
--- 12806,12810 ----
  begin
    FieldStr := BuildFieldList(Map, [InstantUpdateCountFieldName]);
!   WhereStr := BuildWhereStr([InstantIdFieldName]);
    Result := Format('SELECT %s FROM %s WHERE %s',
      [FieldStr, EmbraceTable(Map.Name), WhereStr]);
***************
*** 12826,12831 ****
    AssignmentStr := BuildAssignmentList(Map,
      [InstantIdFieldName, InstantUpdateCountFieldName]);
!   WhereStr := BuildWhereStr([InstantClassFieldName]) +
!     BuildPersistentIdCriteria;
    Result := Format('UPDATE %s SET %s WHERE %s',
      [EmbraceTable(Map.Name), AssignmentStr, WhereStr]);
--- 12824,12828 ----
    AssignmentStr := BuildAssignmentList(Map,
      [InstantIdFieldName, InstantUpdateCountFieldName]);
!   WhereStr := ' (1=1) ' + BuildPersistentIdCriteria;
    Result := Format('UPDATE %s SET %s WHERE %s',
      [EmbraceTable(Map.Name), AssignmentStr, WhereStr]);

[Instantobjects-cvscommit] Source/Core InstantPersistence.pas,1.30,1.31

[Steven M. <sr...@us...>]

Update of /cvsroot/instantobjects/Source/Core
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31726

Modified Files:
	InstantPersistence.pas 
Log Message:
Bug fixed:
1.  If a master record with any detail records in external 
parts is fetched, IO raises an AV exception when the data is stored because 
UpdateExternalPartsMap procedure deletes all detail records before fetching 
them from the database.

Index: InstantPersistence.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Core/InstantPersistence.pas,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** InstantPersistence.pas	21 Mar 2005 16:48:04 -0000	1.30
--- InstantPersistence.pas	4 Apr 2005 07:05:17 -0000	1.31
***************
*** 25,29 ****
   *
   * Contributor(s):
!  * Carlo Barazzetta, Andrea Petrelli, Nando Dessena
   * ***** END LICENSE BLOCK ***** *)
  
--- 25,30 ----
   *
   * Contributor(s):
!  * Carlo Barazzetta, Andrea Petrelli, Nando Dessena, Joao Morais
!  *
   * ***** END LICENSE BLOCK ***** *)
  
***************
*** 7083,7087 ****
  function TInstantObject.AddObject(AObject: TInstantObject): Integer;
  begin
!   Result := DefaultContainer.Add(AObject)
  end;
  
--- 7084,7088 ----
  function TInstantObject.AddObject(AObject: TInstantObject): Integer;
  begin
!   Result := DefaultContainer.Add(AObject);
  end;
  
***************
*** 7539,7543 ****
      raise EInstantError.CreateFmt(SInvalidArgument, [ClassName,
        TInstantConnector.ClassName]);
!   Result := Create(Arg)
  end;
  
--- 7540,7544 ----
      raise EInstantError.CreateFmt(SInvalidArgument, [ClassName,
        TInstantConnector.ClassName]);
!   Result := Create(Arg);
  end;
  
***************
*** 7932,7936 ****
    Result := FDefaultContainer;
    if not Assigned(Result) then
!     raise EInstantError.CreateFmt(SDefaultContainerNotSpecified, [ClassName])
  end;
  
--- 7933,7937 ----
    Result := FDefaultContainer;
    if not Assigned(Result) then
!     raise EInstantError.CreateFmt(SDefaultContainerNotSpecified, [ClassName]);
  end;
  
***************
*** 8101,8105 ****
      Result := Method(Params);
    end else
!     Result := Format(SMethodNotFound, [MethodName, ClassName])
  end;
  
--- 8102,8106 ----
      Result := Method(Params);
    end else
!     Result := Format(SMethodNotFound, [MethodName, ClassName]);
  end;
  
***************
*** 13703,13706 ****
--- 13704,13709 ----
          if PartsAttribute.IsChanged then
          begin
+           for ii:=0 to Pred(PartsAttribute.Count) do
+             PartsAttribute.Items[ii];
            if Map[i].StorageKind = skExternal then
            begin

[Instantobjects-cvscommit] Source/Core InstantPresentation.pas,1.11,1.12

[Steven M. <sr...@us...>]

Update of /cvsroot/instantobjects/Source/Core
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30434

Modified Files:
	InstantPresentation.pas 
Log Message:
Bugs fixed:
1.  If you link an exposer to parts field on a selector, after the second 
opening of selector the exposer do not open anymore.
2.  If you link a Selector to a Connector and destroy the Connector, 
Selector.FConnector will continue linking to that old Connector.

Index: InstantPresentation.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Core/InstantPresentation.pas,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** InstantPresentation.pas	22 Feb 2005 08:05:03 -0000	1.11
--- InstantPresentation.pas	4 Apr 2005 07:01:13 -0000	1.12
***************
*** 25,29 ****
   *
   * Contributor(s):
!  * Carlo Barazzetta, Andrea Petrelli, Nando Dessena
   * ***** END LICENSE BLOCK ***** *)
  
--- 25,30 ----
   *
   * Contributor(s):
!  * Carlo Barazzetta, Andrea Petrelli, Nando Dessena, Joao Morais
!  *
   * ***** END LICENSE BLOCK ***** *)
  
***************
*** 1147,1151 ****
      Result := View.IndexOf(AObject)
    else
!     Result := InternalIndexOfObject(AObject)
  end;
  
--- 1148,1152 ----
      Result := View.IndexOf(AObject)
    else
!     Result := InternalIndexOfObject(AObject);
  end;
  
***************
*** 2159,2163 ****
      Result := nil
    else
!     Result := Objects[Pred(RecNo)]
  end;
  
--- 2160,2164 ----
      Result := nil
    else
!     Result := Objects[Pred(RecNo)];
  end;
  
***************
*** 2234,2243 ****
  function TInstantCustomExposer.GetLimited: Boolean;
  begin
!   Result := Accessor.Limited
  end;
  
  function TInstantCustomExposer.GetMode: TInstantAccessMode;
  begin
!   Result := Accessor.Mode
  end;
  
--- 2235,2244 ----
  function TInstantCustomExposer.GetLimited: Boolean;
  begin
!   Result := Accessor.Limited;
  end;
  
  function TInstantCustomExposer.GetMode: TInstantAccessMode;
  begin
!   Result := Accessor.Mode;
  end;
  
***************
*** 2249,2253 ****
  function TInstantCustomExposer.GetObjectClassName: string;
  begin
!   Result := Accessor.ObjectClassName
  end;
  
--- 2250,2254 ----
  function TInstantCustomExposer.GetObjectClassName: string;
  begin
!   Result := Accessor.ObjectClassName;
  end;
  
***************
*** 3647,3651 ****
  begin
    if MasterLink.Active then
!     Subject := MasterLink.Subject
    else
      Close;
--- 3648,3655 ----
  begin
    if MasterLink.Active then
!   begin
!     Subject := MasterLink.Subject;
!     Open;
!   end
    else
      Close;
***************
*** 3777,3781 ****
  function TInstantQueryAccessor.InternalGetObjectCount: Integer;
  begin
!   Result := Subject.ObjectCount
  end;
  
--- 3781,3785 ----
  function TInstantQueryAccessor.InternalGetObjectCount: Integer;
  begin
!   Result := Subject.ObjectCount;
  end;
  
***************
*** 3960,3964 ****
--- 3964,3971 ----
    inherited;
    if (Operation = opRemove) and (AComponent = Connector) then
+   begin
      Close;
+     FConnector := nil;
+   end;
  end;
  
***************
*** 3998,4002 ****
  begin
    if HasConnector then
!     Connector.StartTransaction
  end;
  
--- 4005,4009 ----
  begin
    if HasConnector then
!     Connector.StartTransaction;
  end;
  

[Instantobjects-cvscommit] Source/Design InstantClassEditor.pas,1.7,1.8

[Steven M. <sr...@us...>]

Update of /cvsroot/instantobjects/Source/Design
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1994

Modified Files:
	InstantClassEditor.pas 
Log Message:
Fixed minor bug in GetClassStorageName local function. Apply 
Remove_T_FromClassName function to class name only.

Index: InstantClassEditor.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Design/InstantClassEditor.pas,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** InstantClassEditor.pas	21 Mar 2005 16:48:06 -0000	1.7
--- InstantClassEditor.pas	4 Apr 2005 04:52:19 -0000	1.8
***************
*** 301,307 ****
        Result := Attribute.Metadata.ClassMetadata.StorageName
      else
!       Result := Attribute.Metadata.ClassMetadata.Name;
  
-     Result := Remove_T_FromClassName(Result);
    end;
  
--- 301,306 ----
        Result := Attribute.Metadata.ClassMetadata.StorageName
      else
!       Result := Remove_T_FromClassName(Attribute.Metadata.ClassMetadata.Name);
  
    end;
  

[Instantobjects-cvscommit] Source/Brokers/UIB InstantUIBConnection.pas,1.4,1.5

[Carlo B. <car...@us...>]

Update of /cvsroot/instantobjects/Source/Brokers/UIB
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6895/Source/Brokers/UIB

Modified Files:
	InstantUIBConnection.pas 
Log Message:
FDatabase.SetSubComponent(True) for TInstantUIBConnection and some other properties published.

Index: InstantUIBConnection.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Brokers/UIB/InstantUIBConnection.pas,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** InstantUIBConnection.pas	21 Feb 2005 10:22:34 -0000	1.4
--- InstantUIBConnection.pas	1 Apr 2005 15:02:53 -0000	1.5
***************
*** 29,32 ****
--- 29,34 ----
  unit InstantUIBConnection;
  
+ {$I ..\..\Core\InstantDefines.inc}
+ 
  interface
  
***************
*** 53,57 ****
--- 55,65 ----
    published
      property Database: TJvUIBDataBase read FDatabase;
+     property LoginPrompt;
      property OnLogin;
+     property Connected;
+     property AfterConnect;
+     property AfterDisconnect;
+     property BeforeConnect;
+     property BeforeDisconnect;
    end;
  
***************
*** 65,68 ****
--- 73,79 ----
    FDatabase := TJvUIBDataBase.Create(Self);
    FDatabase.Name := 'Database';
+ {$IFDEF D5+}
+   FDatabase.SetSubComponent(True);
+ {$ENDIF}
  end;
  

[Instantobjects-cvscommit] Source/Brokers/XML ioxmlK3.dpk,1.1,NONE

[Carlo B. <car...@us...>]

Update of /cvsroot/instantobjects/Source/Brokers/XML
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22170/Source/Brokers/XML

Removed Files:
	ioxmlK3.dpk 
Log Message:
DBX Broker for Kylix3.

--- ioxmlK3.dpk DELETED ---

[Instantobjects-cvscommit] Source/Brokers/DBX iodbxK3.dpk,1.1,NONE

[Carlo B. <car...@us...>]

Update of /cvsroot/instantobjects/Source/Brokers/DBX
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22170/Source/Brokers/DBX

Removed Files:
	iodbxK3.dpk 
Log Message:
DBX Broker for Kylix3.

--- iodbxK3.dpk DELETED ---

[Instantobjects-cvscommit] Source/Brokers/DBX/K3 DclIODBX.dpk,NONE,1.1 IODBX.dpk,NONE,1.1

[Carlo B. <car...@us...>]

Update of /cvsroot/instantobjects/Source/Brokers/DBX/K3
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22170/Source/Brokers/DBX/K3

Added Files:
	DclIODBX.dpk IODBX.dpk 
Log Message:
DBX Broker for Kylix3.

--- NEW FILE: DclIODBX.dpk ---
package DclIODBX;

{$R *.res}
{$R '../InstantDBX.dcr'}
{$ALIGN 8}
{$ASSERTIONS ON}
{$BOOLEVAL OFF}
{$DEBUGINFO ON}
{$EXTENDEDSYNTAX ON}
{$IMPORTEDDATA ON}
{$IOCHECKS ON}
{$LOCALSYMBOLS ON}
{$LONGSTRINGS ON}
{$OPENSTRINGS ON}
{$OPTIMIZATION ON}
{$OVERFLOWCHECKS OFF}
{$RANGECHECKS OFF}
{$REFERENCEINFO ON}
{$SAFEDIVIDE OFF}
{$STACKFRAMES OFF}
{$TYPEDADDRESS OFF}
{$VARSTRINGCHECKS ON}
{$WRITEABLECONST OFF}
{$MINENUMSIZE 1}
{$IMAGEBASE $400000}
{$DESCRIPTION 'InstantObjects DBX Design-Time Support (Kylix 3)'}
{$LIBPREFIX ''}
{$DESIGNONLY}
{$IMPLICITBUILD OFF}

requires
  IODBX;

contains
  InstantDBXReg in '../InstantDBXReg.pas';

end.

--- NEW FILE: IODBX.dpk ---
package IODBX;

{$R *.res}
{$ALIGN 8}
{$ASSERTIONS ON}
{$BOOLEVAL OFF}
{$DEBUGINFO ON}
{$EXTENDEDSYNTAX ON}
{$IMPORTEDDATA ON}
{$IOCHECKS ON}
{$LOCALSYMBOLS ON}
{$LONGSTRINGS ON}
{$OPENSTRINGS ON}
{$OPTIMIZATION ON}
{$OVERFLOWCHECKS OFF}
{$RANGECHECKS OFF}
{$REFERENCEINFO ON}
{$SAFEDIVIDE OFF}
{$STACKFRAMES OFF}
{$TYPEDADDRESS OFF}
{$VARSTRINGCHECKS ON}
{$WRITEABLECONST OFF}
{$MINENUMSIZE 1}
{$IMAGEBASE $400000}
{$DESCRIPTION 'InstantObjects DBX Run-Time Support (Kyix 3)'}
{$RUNONLY}
{$IMPLICITBUILD OFF}

requires
  IOCore;

contains
  InstantDBXConnectionDefEdit in '../InstantDBXConnectionDefEdit.pas' {InstantDBXConnectionDefEditForm},
  InstantDBX in '../InstantDBX.pas';

end.

[Instantobjects-cvscommit] Source/Brokers/XML/k3 DclIOXML.dpk,NONE,1.1 IOXML.dpk,NONE,1.1

[Carlo B. <car...@us...>]

Update of /cvsroot/instantobjects/Source/Brokers/XML/k3
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19410/Source/Brokers/XML/k3

Added Files:
	DclIOXML.dpk IOXML.dpk 
Log Message:
XML Broker for Kylix3.

--- NEW FILE: DclIOXML.dpk ---
package DclIOXML;

{$R *.res}
{$R '../InstantXML.dcr'}
{$ALIGN 8}
{$ASSERTIONS ON}
{$BOOLEVAL OFF}
{$DEBUGINFO ON}
{$EXTENDEDSYNTAX ON}
{$IMPORTEDDATA ON}
{$IOCHECKS ON}
{$LOCALSYMBOLS ON}
{$LONGSTRINGS ON}
{$OPENSTRINGS ON}
{$OPTIMIZATION ON}
{$OVERFLOWCHECKS OFF}
{$RANGECHECKS OFF}
{$REFERENCEINFO ON}
{$SAFEDIVIDE OFF}
{$STACKFRAMES OFF}
{$TYPEDADDRESS OFF}
{$VARSTRINGCHECKS ON}
{$WRITEABLECONST OFF}
{$MINENUMSIZE 1}
{$IMAGEBASE $400000}
{$DESCRIPTION 'InstantObjects XML Design-Time Support (Kylix 3)'}
{$LIBPREFIX ''}
{$DESIGNONLY}
{$IMPLICITBUILD OFF}

requires
  IOXML;

contains
  InstantXMLReg in '../InstantXMLReg.pas';

end.

--- NEW FILE: IOXML.dpk ---
package IOXML;

{$R *.res}
{$ALIGN 8}
{$ASSERTIONS ON}
{$BOOLEVAL OFF}
{$DEBUGINFO ON}
{$EXTENDEDSYNTAX ON}
{$IMPORTEDDATA ON}
{$IOCHECKS ON}
{$LOCALSYMBOLS ON}
{$LONGSTRINGS ON}
{$OPENSTRINGS ON}
{$OPTIMIZATION ON}
{$OVERFLOWCHECKS OFF}
{$RANGECHECKS OFF}
{$REFERENCEINFO ON}
{$SAFEDIVIDE OFF}
{$STACKFRAMES OFF}
{$TYPEDADDRESS OFF}
{$VARSTRINGCHECKS ON}
{$WRITEABLECONST OFF}
{$MINENUMSIZE 1}
{$IMAGEBASE $400000}
{$DESCRIPTION 'InstantObjects XML Run-Time Support (Kyix 3)'}
{$RUNONLY}
{$IMPLICITBUILD OFF}

requires
  IOCore;

contains
  InstantXMLConnectionDefEdit in '../InstantXMLConnectionDefEdit.pas' {InstantXMLConnectionDefEditForm},
  InstantXML in '../InstantXML.pas';

end.

[Instantobjects-cvscommit] Demos/PrimerCross ContactView.pas,1.6,1.7 DemoData.pas,1.4,1.5 Main.pas,1.9,1.10 PerformanceView.pas,1.8,1.9 PrimerK3.dpr,1.3,1.4 QueryView.pas,1.4,1.5

[Carlo B. <car...@us...>]

Update of /cvsroot/instantobjects/Demos/PrimerCross
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18385/Demos/PrimerCross

Modified Files:
	ContactView.pas DemoData.pas Main.pas PerformanceView.pas 
	PrimerK3.dpr QueryView.pas 
Log Message:
Changes for compatibility with Kylix3.

Index: QueryView.pas
===================================================================
RCS file: /cvsroot/instantobjects/Demos/PrimerCross/QueryView.pas,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** QueryView.pas	18 Feb 2005 09:10:40 -0000	1.4
--- QueryView.pas	21 Mar 2005 16:48:04 -0000	1.5
***************
*** 6,17 ****
    SysUtils, Classes,
  {$IFDEF MSWINDOWS}
!   Windows, Messages, Graphics, Controls, Forms, Dialogs,
    Grids, DBGrids, StdCtrls, ExtCtrls, ActnList, Menus, Buttons,
  {$ENDIF}
  {$IFDEF LINUX}
!   QGraphics, QControls, QForms, QDialogs,
    QGrids, QDBGrids, QStdCtrls, QExtCtrls, QActnList, QMenus, QButtons,
  {$ENDIF}
!   BasicView, Db, InstantPresentation, Mask;
  
  type
--- 6,17 ----
    SysUtils, Classes,
  {$IFDEF MSWINDOWS}
!   Windows, Messages, Graphics, Controls, Forms, Dialogs, Mask,
    Grids, DBGrids, StdCtrls, ExtCtrls, ActnList, Menus, Buttons,
  {$ENDIF}
  {$IFDEF LINUX}
!   QGraphics, QControls, QForms, QDialogs, QMask,
    QGrids, QDBGrids, QStdCtrls, QExtCtrls, QActnList, QMenus, QButtons,
  {$ENDIF}
!   BasicView, Db, InstantPresentation;
  
  type

Index: PerformanceView.pas
===================================================================
RCS file: /cvsroot/instantobjects/Demos/PrimerCross/PerformanceView.pas,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** PerformanceView.pas	22 Feb 2005 10:40:28 -0000	1.8
--- PerformanceView.pas	21 Mar 2005 16:48:04 -0000	1.9
***************
*** 13,25 ****
  {$IFDEF MSWINDOWS}
    Windows, Messages, Graphics, Controls, Forms, Dialogs, ToolWin, Menus,
!   ExtCtrls, StdCtrls, Contnrs, ComCtrls, TeEngine,
  {$ENDIF}
  {$IFDEF LINUX}
    QGraphics, QControls, QForms, QDialogs, QMenus,
!   QExtCtrls, QStdCtrls, QComCtrls, QTypes,
  {$ENDIF}
    Series, TeeProcs, Chart,
!   InstantPersistence, InstantPresentation, InstantClasses, Stopwatch, DB, BasicView,
!   Mask;
  
  type
--- 13,24 ----
  {$IFDEF MSWINDOWS}
    Windows, Messages, Graphics, Controls, Forms, Dialogs, ToolWin, Menus,
!   ExtCtrls, StdCtrls, Contnrs, ComCtrls, TeEngine, Mask,
  {$ENDIF}
  {$IFDEF LINUX}
    QGraphics, QControls, QForms, QDialogs, QMenus,
!   QExtCtrls, QStdCtrls, QComCtrls, QTypes, QMask,
  {$ENDIF}
    Series, TeeProcs, Chart,
!   InstantPersistence, InstantPresentation, InstantClasses, Stopwatch, DB, BasicView;
  
  type

Index: PrimerK3.dpr
===================================================================
RCS file: /cvsroot/instantobjects/Demos/PrimerCross/PrimerK3.dpr,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** PrimerK3.dpr	7 Dec 2004 08:55:53 -0000	1.3
--- PrimerK3.dpr	21 Mar 2005 16:48:04 -0000	1.4
***************
*** 1,5 ****
  (*
   *   InstantObjects
!  *   Primer Demo for Kylix 3
   *
   *)
--- 1,5 ----
  (*
   *   InstantObjects
!  *   Primer Demo for Kylix 3 with internal storage Model
   *
   *)
***************
*** 26,34 ****
   *
   * Contributor(s):
!  * Carlo Barazzetta:
!  * - cross-platform porting for Delphi & Kilix
!  * - PerformanceView form changed to make tests with UsePreparedQuery
!  * Salary attribute of type Currency added to Person
!  * PersonEdit form and random data form changed to test Graphic support
   * ***** END LICENSE BLOCK ***** *)
  
--- 26,30 ----
   *
   * Contributor(s):
!  * Carlo Barazzetta
   * ***** END LICENSE BLOCK ***** *)
  

Index: Main.pas
===================================================================
RCS file: /cvsroot/instantobjects/Demos/PrimerCross/Main.pas,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** Main.pas	22 Feb 2005 14:56:26 -0000	1.9
--- Main.pas	21 Mar 2005 16:48:04 -0000	1.10
***************
*** 493,497 ****
  begin
    Disconnect;
!   FActiveSubView.FormHide(FActiveSubView);  
  end;
  
--- 493,498 ----
  begin
    Disconnect;
!   if FActiveSubView <> nil then
!     FActiveSubView.FormHide(FActiveSubView);
  end;
  

Index: DemoData.pas
===================================================================
RCS file: /cvsroot/instantobjects/Demos/PrimerCross/DemoData.pas,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** DemoData.pas	7 Dec 2004 08:45:33 -0000	1.4
--- DemoData.pas	21 Mar 2005 16:48:03 -0000	1.5
***************
*** 16,20 ****
    SysUtils,
  {$IFDEF MSWINDOWS}
!   Windows, Dialogs,
  {$ENDIF}
  {$IFDEF LINUX}
--- 16,20 ----
    SysUtils,
  {$IFDEF MSWINDOWS}
!   Windows,
  {$ENDIF}
  {$IFDEF LINUX}

Index: ContactView.pas
===================================================================
RCS file: /cvsroot/instantobjects/Demos/PrimerCross/ContactView.pas,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** ContactView.pas	10 Feb 2005 23:06:18 -0000	1.6
--- ContactView.pas	21 Mar 2005 16:48:03 -0000	1.7
***************
*** 19,23 ****
    QGraphics, QControls, QForms, QDialogs, QTypes,
    QComCtrls, QGrids, QDBGrids, QExtCtrls, QButtons,
!   QStdCtrls, QActnList, QImgList, QMenus,
  {$ENDIF}
    BasicView, Model, InstantPresentation, InstantExplorer;
--- 19,23 ----
    QGraphics, QControls, QForms, QDialogs, QTypes,
    QComCtrls, QGrids, QDBGrids, QExtCtrls, QButtons,
!   QStdCtrls, QActnList, QImgList, QMenus, Types,
  {$ENDIF}
    BasicView, Model, InstantPresentation, InstantExplorer;

[Instantobjects-cvscommit] Source/Design InstantAbout.pas,1.5,1.6 InstantAttributeEditor.pas,1.15,1.16 InstantClassEditor.pas,1.6,1.7 InstantCommandEditor.pas,1.4,1.5 InstantDesignResources.pas,1.5,1.6 InstantDesignTools.pas,1.5,1.6 InstantDesignUtils.pas,1.7,1.8 InstantDialog.pas,1.4,1.5 InstantDualList.pas,1.4,1.5 InstantEdit.pas,1.4,1.5 InstantModelExpert.pas,1.7,1.8 InstantModelExplorer.pas,1.8,1.9 InstantOTA.pas,1.3,1.4 InstantReg.pas,1.6,1.7 InstantUnitSelect.pas,1.5,1.6 InstantWizard.pas,1.4,1.5

[Carlo B. <car...@us...>]

Update of /cvsroot/instantobjects/Source/Design
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18385/Source/Design

Modified Files:
	InstantAbout.pas InstantAttributeEditor.pas 
	InstantClassEditor.pas InstantCommandEditor.pas 
	InstantDesignResources.pas InstantDesignTools.pas 
	InstantDesignUtils.pas InstantDialog.pas InstantDualList.pas 
	InstantEdit.pas InstantModelExpert.pas 
	InstantModelExplorer.pas InstantOTA.pas InstantReg.pas 
	InstantUnitSelect.pas InstantWizard.pas 
Log Message:
Changes for compatibility with Kylix3.

Index: InstantModelExplorer.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Design/InstantModelExplorer.pas,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** InstantModelExplorer.pas	21 Mar 2005 02:09:22 -0000	1.8
--- InstantModelExplorer.pas	21 Mar 2005 16:48:06 -0000	1.9
***************
*** 31,35 ****
  unit InstantModelExplorer;
  
! {$I ..\Core\InstantDefines.inc}
  
  interface
--- 31,35 ----
  unit InstantModelExplorer;
  
! {$I ../Core/InstantDefines.inc}
  
  interface

Index: InstantEdit.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Design/InstantEdit.pas,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** InstantEdit.pas	11 Feb 2005 16:06:43 -0000	1.4
--- InstantEdit.pas	21 Mar 2005 16:48:06 -0000	1.5
***************
*** 31,35 ****
  unit InstantEdit;
  
! {$I ..\Core\InstantDefines.inc}
  
  interface
--- 31,35 ----
  unit InstantEdit;
  
! {$I ../Core/InstantDefines.inc}
  
  interface

Index: InstantCommandEditor.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Design/InstantCommandEditor.pas,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** InstantCommandEditor.pas	11 Feb 2005 16:06:43 -0000	1.4
--- InstantCommandEditor.pas	21 Mar 2005 16:48:06 -0000	1.5
***************
*** 31,35 ****
  unit InstantCommandEditor;
  
! {$I ..\Core\InstantDefines.inc}
  
  interface
--- 31,35 ----
  unit InstantCommandEditor;
  
! {$I ../Core/InstantDefines.inc}
  
  interface
***************
*** 38,47 ****
    SysUtils, Classes,
  {$IFDEF MSWINDOWS}
!   Windows, Messages, Graphics, Controls, Forms, Dialogs, StdCtrls,
  {$ENDIF}
  {$IFDEF LINUX}
!   QForms, QStdCtrls, QControls,
  {$ENDIF}
!   InstantCode, InstantCommand, ExtCtrls;
  
  type
--- 38,47 ----
    SysUtils, Classes,
  {$IFDEF MSWINDOWS}
!   Windows, Messages, Graphics, Controls, Forms, Dialogs, StdCtrls, ExtCtrls,
  {$ENDIF}
  {$IFDEF LINUX}
!   QForms, QStdCtrls, QControls, QExtCtrls,
  {$ENDIF}
!   InstantCode, InstantCommand;
  
  type

Index: InstantOTA.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Design/InstantOTA.pas,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** InstantOTA.pas	4 Aug 2004 22:43:40 -0000	1.3
--- InstantOTA.pas	21 Mar 2005 16:48:06 -0000	1.4
***************
*** 32,41 ****
  interface
  
- {$IFDEF MSWINDOWS}
- {$I ..\core\InstantDefines.inc}
- {$ENDIF}
- {$IFDEF LINUX}
  {$I ../core/InstantDefines.inc}
- {$ENDIF}
  
  {$IFDEF D7+}
--- 32,36 ----

Index: InstantDesignResources.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Design/InstantDesignResources.pas,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** InstantDesignResources.pas	11 Feb 2005 16:06:43 -0000	1.5
--- InstantDesignResources.pas	21 Mar 2005 16:48:06 -0000	1.6
***************
*** 31,35 ****
  unit InstantDesignResources;
  
! {$I ..\Core\InstantDefines.inc}
  
  interface
--- 31,35 ----
  unit InstantDesignResources;
  
! {$I ../Core/InstantDefines.inc}
  
  interface

Index: InstantDualList.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Design/InstantDualList.pas,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** InstantDualList.pas	11 Feb 2005 16:06:43 -0000	1.4
--- InstantDualList.pas	21 Mar 2005 16:48:06 -0000	1.5
***************
*** 31,35 ****
  unit InstantDualList;
  
! {$I ..\Core\InstantDefines.inc}
  
  interface
--- 31,35 ----
  unit InstantDualList;
  
! {$I ../Core/InstantDefines.inc}
  
  interface

Index: InstantModelExpert.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Design/InstantModelExpert.pas,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** InstantModelExpert.pas	11 Feb 2005 16:06:43 -0000	1.7
--- InstantModelExpert.pas	21 Mar 2005 16:48:06 -0000	1.8
***************
*** 30,34 ****
  unit InstantModelExpert;
  
! {$I ..\Core\InstantDefines.inc}
  
  {$IFDEF D7+}
--- 30,34 ----
  unit InstantModelExpert;
  
! {$I ../Core/InstantDefines.inc}
  
  {$IFDEF D7+}

Index: InstantDialog.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Design/InstantDialog.pas,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** InstantDialog.pas	11 Feb 2005 16:06:43 -0000	1.4
--- InstantDialog.pas	21 Mar 2005 16:48:06 -0000	1.5
***************
*** 31,35 ****
  unit InstantDialog;
  
! {$I ..\Core\InstantDefines.inc}
  
  interface
--- 31,35 ----
  unit InstantDialog;
  
! {$I ../Core/InstantDefines.inc}
  
  interface

Index: InstantReg.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Design/InstantReg.pas,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** InstantReg.pas	22 Feb 2005 14:25:19 -0000	1.6
--- InstantReg.pas	21 Mar 2005 16:48:06 -0000	1.7
***************
*** 37,41 ****
  implementation
  
! {$R ..\iodesimages.res}
  
  uses
--- 37,41 ----
  implementation
  
! {$R ../iodesimages.res}
  
  uses

Index: InstantWizard.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Design/InstantWizard.pas,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** InstantWizard.pas	11 Feb 2005 16:06:43 -0000	1.4
--- InstantWizard.pas	21 Mar 2005 16:48:06 -0000	1.5
***************
*** 31,35 ****
  unit InstantWizard;
  
! {$I ..\Core\InstantDefines.inc}
  
  interface
--- 31,35 ----
  unit InstantWizard;
  
! {$I ../Core/InstantDefines.inc}
  
  interface

Index: InstantAttributeEditor.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Design/InstantAttributeEditor.pas,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** InstantAttributeEditor.pas	12 Mar 2005 03:00:47 -0000	1.15
--- InstantAttributeEditor.pas	21 Mar 2005 16:48:06 -0000	1.16
***************
*** 33,37 ****
  interface
  
! {$I ..\Core\InstantDefines.inc}
  
  uses
--- 33,37 ----
  interface
  
! {$I ../Core/InstantDefines.inc}
  
  uses
***************
*** 589,591 ****
  end.
  
- 
--- 589,590 ----

Index: InstantAbout.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Design/InstantAbout.pas,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** InstantAbout.pas	11 Feb 2005 16:06:43 -0000	1.5
--- InstantAbout.pas	21 Mar 2005 16:48:06 -0000	1.6
***************
*** 31,35 ****
  unit InstantAbout;
  
! {$I ..\Core\InstantDefines.inc}
  
  interface
--- 31,35 ----
  unit InstantAbout;
  
! {$I ../Core/InstantDefines.inc}
  
  interface

Index: InstantDesignTools.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Design/InstantDesignTools.pas,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** InstantDesignTools.pas	10 Feb 2005 23:06:32 -0000	1.5
--- InstantDesignTools.pas	21 Mar 2005 16:48:06 -0000	1.6
***************
*** 35,39 ****
  uses
    Classes,
! {$I ..\core\InstantDefines.inc}
  {$IFDEF MSWINDOWS}
    {$IFDEF D6+}
--- 35,39 ----
  uses
    Classes,
! {$I ../Core/InstantDefines.inc}
  {$IFDEF MSWINDOWS}
    {$IFDEF D6+}
***************
*** 44,48 ****
  {$ENDIF}
  {$IFDEF LINUX}
- {$I ../core/InstantDefines.inc}
    DesignIntf, DesignEditors, ClxStrEdit,
  {$ENDIF}
--- 44,47 ----

Index: InstantDesignUtils.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Design/InstantDesignUtils.pas,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** InstantDesignUtils.pas	21 Mar 2005 02:09:22 -0000	1.7
--- InstantDesignUtils.pas	21 Mar 2005 16:48:06 -0000	1.8
***************
*** 31,35 ****
  unit InstantDesignUtils;
  
! {$I ..\Core\InstantDefines.inc}
  
  interface
--- 31,35 ----
  unit InstantDesignUtils;
  
! {$I ../Core/InstantDefines.inc}
  
  interface

Index: InstantUnitSelect.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Design/InstantUnitSelect.pas,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** InstantUnitSelect.pas	11 Feb 2005 16:06:43 -0000	1.5
--- InstantUnitSelect.pas	21 Mar 2005 16:48:06 -0000	1.6
***************
*** 31,35 ****
  unit InstantUnitSelect;
  
! {$I ..\Core\InstantDefines.inc}
  
  interface
--- 31,35 ----
  unit InstantUnitSelect;
  
! {$I ../Core/InstantDefines.inc}
  
  interface

Index: InstantClassEditor.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Design/InstantClassEditor.pas,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** InstantClassEditor.pas	24 Feb 2005 00:14:37 -0000	1.6
--- InstantClassEditor.pas	21 Mar 2005 16:48:06 -0000	1.7
***************
*** 31,35 ****
  unit InstantClassEditor;
  
! {$I ..\Core\InstantDefines.inc}
  
  interface
--- 31,35 ----
  unit InstantClassEditor;
  
! {$I ../Core/InstantDefines.inc}
  
  interface

[Instantobjects-cvscommit] Source/Design/K3 DclIOCore.dpk,1.2,1.3

[Carlo B. <car...@us...>]

Update of /cvsroot/instantobjects/Source/Design/K3
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18385/Source/Design/K3

Modified Files:
	DclIOCore.dpk 
Log Message:
Changes for compatibility with Kylix3.

Index: DclIOCore.dpk
===================================================================
RCS file: /cvsroot/instantobjects/Source/Design/K3/DclIOCore.dpk,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DclIOCore.dpk	22 Feb 2005 08:09:02 -0000	1.2
--- DclIOCore.dpk	21 Mar 2005 16:48:06 -0000	1.3
***************
*** 3,7 ****
--- 3,9 ----
  {$R *.res}
  {$R '../../Core/InstantPresentation.dcr'}
+ {$R '../../Core/InstantExplorer.dcr'}
  {$R '../../Core/InstantPersistence.dcr'}
+ {$R '../../Core/InstantPump.dcr'}
  {$R '../../Core/InstantConnectionManager.dcr'}
  {$ALIGN 8}
***************
*** 27,31 ****
  {$IMAGEBASE $400000}
  {$DESCRIPTION 'InstantObjects Design-Time Package (Kylix 3)'}
- {$LIBSUFFIX '_K3'}
  {$DESIGNONLY}
  {$IMPLICITBUILD OFF}
--- 29,32 ----
***************
*** 48,51 ****
--- 49,53 ----
    InstantEdit in '../InstantEdit.pas' {InstantEditForm},
    InstantModelExpert in '../InstantModelExpert.pas',
+   InstantModelExplorer in '../InstantModelExplorer.pas',
    InstantOTA in '../InstantOTA.pas',
    InstantReg in '../InstantReg.pas',

[Instantobjects-cvscommit] Source/Core InstantClasses.pas,1.5,1.6 InstantCode.pas,1.12,1.13 InstantConnectionManager.pas,1.12,1.13 InstantPersistence.pas,1.29,1.30

[Carlo B. <car...@us...>]

Update of /cvsroot/instantobjects/Source/Core
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18385/Source/Core

Modified Files:
	InstantClasses.pas InstantCode.pas 
	InstantConnectionManager.pas InstantPersistence.pas 
Log Message:
Changes for compatibility with Kylix3.

Index: InstantCode.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Core/InstantCode.pas,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** InstantCode.pas	12 Mar 2005 02:55:09 -0000	1.12
--- InstantCode.pas	21 Mar 2005 16:48:04 -0000	1.13
***************
*** 1455,1464 ****
  
  uses
- {$IFDEF MSWINDOWS}
-   Forms,
- {$ENDIF}
- {$IFDEF LINUX}
-   QForms,
- {$ENDIF}
    InstantRtti, InstantConsts, InstantUtils, DB;
  
--- 1455,1458 ----

Index: InstantPersistence.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Core/InstantPersistence.pas,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** InstantPersistence.pas	25 Feb 2005 14:48:26 -0000	1.29
--- InstantPersistence.pas	21 Mar 2005 16:48:04 -0000	1.30
***************
*** 2444,2448 ****
  {$ENDIF}
  {$IFDEF LINUX}
!   QMask, Types,
  {$ENDIF}
    TypInfo, {$IFDEF D6+}MaskUtils, Variants,{$ENDIF}
--- 2444,2448 ----
  {$ENDIF}
  {$IFDEF LINUX}
!   Types,
  {$ENDIF}
    TypInfo, {$IFDEF D6+}MaskUtils, Variants,{$ENDIF}
***************
*** 2481,2485 ****
--- 2481,2487 ----
      end;
    end;
+ {$IFDEF MSWINDOWS}
    OutputDebugString(PChar(S));
+ {$ENDIF}  
    if Assigned(InstantLogProc) then
      InstantLogProc(S);

Index: InstantClasses.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Core/InstantClasses.pas,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** InstantClasses.pas	22 Feb 2005 08:05:02 -0000	1.5
--- InstantClasses.pas	21 Mar 2005 16:48:04 -0000	1.6
***************
*** 42,46 ****
  
  uses
! {$IFDEF D5}Windows,{$ENDIF}
    Classes, InstantConsts, SysUtils;
  
--- 42,46 ----
  
  uses
! {$IFDEF VER130}Windows,{$ENDIF}
    Classes, InstantConsts, SysUtils;
  

Index: InstantConnectionManager.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Core/InstantConnectionManager.pas,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** InstantConnectionManager.pas	23 Feb 2005 11:03:01 -0000	1.12
--- InstantConnectionManager.pas	21 Mar 2005 16:48:04 -0000	1.13
***************
*** 43,47 ****
    SysUtils, Classes,
  {$IFDEF MSWINDOWS}
!   Windows, Messages, 
  {$ENDIF}
  {$IFDEF LINUX}
--- 43,47 ----
    SysUtils, Classes,
  {$IFDEF MSWINDOWS}
!   Windows,  
  {$ENDIF}
  {$IFDEF LINUX}

[Instantobjects-cvscommit] Source/Core/K3 IOCore.dpk,1.3,1.4

[Carlo B. <car...@us...>]

Update of /cvsroot/instantobjects/Source/Core/K3
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18385/Source/Core/K3

Modified Files:
	IOCore.dpk 
Log Message:
Changes for compatibility with Kylix3.

Index: IOCore.dpk
===================================================================
RCS file: /cvsroot/instantobjects/Source/Core/K3/IOCore.dpk,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** IOCore.dpk	22 Feb 2005 14:25:19 -0000	1.3
--- IOCore.dpk	21 Mar 2005 16:48:06 -0000	1.4
***************
*** 24,28 ****
  {$IMAGEBASE $400000}
  {$DESCRIPTION 'InstantObjects Run-Time Package (Kylix 3)'}
- {$LIBSUFFIX '_K3'}
  {$RUNONLY}
  {$IMPLICITBUILD OFF}
--- 24,27 ----
***************
*** 47,52 ****
    InstantPresentation in '../InstantPresentation.pas',
    InstantAccessors in '../InstantAccessors.pas',
!   InstantConnectionManagerForm in '..\InstantConnectionManagerForm.pas' {InstantConnectionManagerForm},
!   InstantConnectionManager in '..\InstantConnectionManager.pas',
    InstantImageUtils in '../InstantImageUtils.pas',
    InstantPump in '../InstantPump.pas';
--- 46,51 ----
    InstantPresentation in '../InstantPresentation.pas',
    InstantAccessors in '../InstantAccessors.pas',
!   InstantConnectionManagerForm in '../InstantConnectionManagerForm.pas' {InstantConnectionManagerForm},
!   InstantConnectionManager in '../InstantConnectionManager.pas',
    InstantImageUtils in '../InstantImageUtils.pas',
    InstantPump in '../InstantPump.pas';

[Instantobjects-cvscommit] Source/Brokers/XML/k3 - New directory

[Carlo B. <car...@us...>]

Update of /cvsroot/instantobjects/Source/Brokers/XML/k3
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16286/k3

Log Message:
Directory /cvsroot/instantobjects/Source/Brokers/XML/k3 added to the repository

[Instantobjects-cvscommit] Source/Brokers/DBX/K3 - New directory

[Carlo B. <car...@us...>]

Update of /cvsroot/instantobjects/Source/Brokers/DBX/K3
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15519/K3

Log Message:
Directory /cvsroot/instantobjects/Source/Brokers/DBX/K3 added to the repository

[Instantobjects-cvscommit] Source/ObjectFoundry OF_readme.txt,1.2,1.3

[Steven M. <sr...@us...>]

Update of /cvsroot/instantobjects/Source/ObjectFoundry
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18165

Modified Files:
	OF_readme.txt 
Log Message:
Updated to reflect changed compiler define 'MM7+' and minor changes
to the text.

Index: OF_readme.txt
===================================================================
RCS file: /cvsroot/instantobjects/Source/ObjectFoundry/OF_readme.txt,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** OF_readme.txt	18 Feb 2005 04:42:33 -0000	1.2
--- OF_readme.txt	21 Mar 2005 02:50:29 -0000	1.3
***************
*** 1,8 ****
  ObjectFoundry (for IO V2) Readme
! by Carlo Wolter/Steven Mitchell - 18 Feb 2005
  
  This file contains instructions and information for the
  Object Foundry (OF) integration between IO version 2 and 
! ModelMaker(c) versions 7 and 8.
  
  ModelMaker (MM) is an UML designer integrated with Delphi.
--- 1,10 ----
  ObjectFoundry (for IO V2) Readme
! by Carlo Wolter/Steven Mitchell - 21 Mar 2005
  
+ Introduction
+ ------------
  This file contains instructions and information for the
  Object Foundry (OF) integration between IO version 2 and 
! ModelMaker(c).
  
  ModelMaker (MM) is an UML designer integrated with Delphi.
***************
*** 18,21 ****
--- 20,25 ----
  in MM.
  
+ Compiling
+ ---------
  This DLL can be compiled using the project in this directory.
  
***************
*** 24,32 ****
    $(ProgramFiles)\ModelMakerTools\ModelMaker\x.x\Experts
  is in the project options search path 
!   (ie Project/Directories-Conditionals/SearchPath).
  This is required because in the MM experts directory there is
  a single file that is needed:
    MMToolsApi.PAS
! Also ensure that 'MM7' is defined in 'Conditional defines'.
  
  Note: The MMToolsApi.PAS file is protected by copyright of 
--- 28,39 ----
    $(ProgramFiles)\ModelMakerTools\ModelMaker\x.x\Experts
  is in the project options search path 
!   (ie Project/Options/Directories-Conditionals/SearchPath).
  This is required because in the MM experts directory there is
  a single file that is needed:
    MMToolsApi.PAS
! Also ensure that 'MM7+' is defined in the project options
! Conditional defines
!   (ie Project/Options/Directories-Conditionals/Conditional defines)
! when using version 7 or higher of MM.
  
  Note: The MMToolsApi.PAS file is protected by copyright of 
***************
*** 35,39 ****
  finding it.
  
! To operate correctly this version of OF expects and 
  generates the IO Metadata identifier tag in the class 
  metadata info as follows:
--- 42,48 ----
  finding it.
  
! Notes on Usage
! --------------
! To operate correctly, this version of OF expects and 
  generates the IO Metadata identifier tag in the class 
  metadata info as follows:
***************
*** 50,53 ****
--- 59,64 ----
  metadata identifier tag.
  
+ Feedback
+ --------
  Please report any problems to the IO news groups at 
  "news.instantobjects.org".

[Instantobjects-cvscommit] Source/Brokers/XML InstantXML.pas,1.3,1.4

[Steven M. <sr...@us...>]

Update of /cvsroot/instantobjects/Source/Brokers/XML
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6353

Modified Files:
	InstantXML.pas 
Log Message:
1.  Modified to use 'InstantDefines.inc'.
2.  Changed CreateResFmt() to CreateFmt() when raising exceptions.

Index: InstantXML.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Brokers/XML/InstantXML.pas,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** InstantXML.pas	10 Feb 2005 23:06:25 -0000	1.3
--- InstantXML.pas	21 Mar 2005 02:33:06 -0000	1.4
***************
*** 29,36 ****
  unit InstantXML;
  
  interface
  
  uses
! {$IFDEF VER130}{$DEFINE MSWINDOWS}FileCtrl,{$ENDIF}
    Classes, DB, InstantPersistence, InstantCommand, Contnrs;
  
--- 29,40 ----
  unit InstantXML;
  
+ {$I InstantDefines.inc}
+ 
  interface
  
  uses
! {$IFDEF MSWINDOWS}
!   FileCtrl,
! {$ENDIF}
    Classes, DB, InstantPersistence, InstantCommand, Contnrs;
  
***************
*** 390,394 ****
  
    if Result and (ConflictAction = caFail) then
!     raise EInstantConflict.CreateResFmt(@SUpdateConflict,
        [AObject.ClassName, AObjectId]);
  end;
--- 394,398 ----
  
    if Result and (ConflictAction = caFail) then
!     raise EInstantConflict.CreateFmt(SUpdateConflict,
        [AObject.ClassName, AObjectId]);
  end;
***************
*** 440,444 ****
      end;
    end else if Map.IsRootMap and (ConflictAction = caFail) then
!     raise EInstantConflict.CreateResFmt(@SDisposeConflict,
        [AObject.ClassName, AObject.PersistentId])
  end;
--- 444,448 ----
      end;
    end else if Map.IsRootMap and (ConflictAction = caFail) then
!     raise EInstantConflict.CreateFmt(SDisposeConflict,
        [AObject.ClassName, AObject.PersistentId])
  end;

[Instantobjects-cvscommit] Source/Brokers/XML InstantXMLConnectionDefEdit.pas,1.2,1.3

[Steven M. <sr...@us...>]

Update of /cvsroot/instantobjects/Source/Brokers/XML
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6074

Modified Files:
	InstantXMLConnectionDefEdit.pas 
Log Message:
1.  Modified to use 'InstantDefines.inc'.

Index: InstantXMLConnectionDefEdit.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Brokers/XML/InstantXMLConnectionDefEdit.pas,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** InstantXMLConnectionDefEdit.pas	10 Feb 2005 23:06:26 -0000	1.2
--- InstantXMLConnectionDefEdit.pas	21 Mar 2005 02:32:47 -0000	1.3
***************
*** 29,35 ****
  unit InstantXMLConnectionDefEdit;
  
! interface
  
! {$IFDEF VER130}{$DEFINE MSWINDOWS}{$ENDIF}
  
  uses
--- 29,35 ----
  unit InstantXMLConnectionDefEdit;
  
! {$I InstantDefines.inc}
  
! interface
  
  uses

[Instantobjects-cvscommit] Source/ObjectFoundry OFDefs.pas,1.1,1.2 OFClasses.pas,1.6,1.7 OFExpt.dpr,1.3,1.4 OFCritic.pas,1.1,1.2

[Steven M. <sr...@us...>]

Update of /cvsroot/instantobjects/Source/ObjectFoundry
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29387

Modified Files:
	OFDefs.pas OFClasses.pas OFExpt.dpr OFCritic.pas 
Log Message:
1.  Changed Define to 'D7+' as this is needed for MM8 also.
2.  Added some IFDEFs to fix compiling for MM6.2.
3.  Fixed 'TObjectFoundryCritic.GetHeadline' to match case of its ancester
'TMMDesignCritic.GetHeadLine' in OFCritic.pas.

Index: OFClasses.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/ObjectFoundry/OFClasses.pas,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** OFClasses.pas	12 Mar 2005 03:07:31 -0000	1.6
--- OFClasses.pas	21 Mar 2005 02:18:53 -0000	1.7
***************
*** 104,108 ****
      end;
      Result.Name := CountPropName;
!     Result.V9Visibility := TV9Visibility(Visibility);  // SRM - 18 Sep 2004
      Result.SetAccessSpec(rwMethod, rwNone);
      Getter := MemberAsMethod(Result.ReadMember);
--- 104,112 ----
      end;
      Result.Name := CountPropName;
! {$IFDEF MM7+}                                      // SRM begin - 16 Mar 2005
!     Result.V9Visibility := TV9Visibility(Visibility);
! {$ELSE}
!     Result.Visibility := TVisibility(Visibility);
! {$ENDIF}                                          // SRM end - 16 Mar 2005
      Result.SetAccessSpec(rwMethod, rwNone);
      Getter := MemberAsMethod(Result.ReadMember);
***************
*** 211,215 ****
        Result.DataName := CodeMethod.Proc.ResultTypeName;
      end;
!     Result.V9Visibility := TV9Visibility(Visibility);  // SRM - 18 Sep 2004
      NewBody := CodeMethod.Proc.Body.AsString;
      if Result.SectionCount = 0 then
--- 215,223 ----
        Result.DataName := CodeMethod.Proc.ResultTypeName;
      end;
! {$IFDEF MM7+}                                      // SRM begin - 16 Mar 2005
!     Result.V9Visibility := TV9Visibility(Visibility);
! {$ELSE}
!     Result.Visibility := TVisibility(Visibility);
! {$ENDIF}                                          // SRM end - 16 Mar 2005
      NewBody := CodeMethod.Proc.Body.AsString;
      if Result.SectionCount = 0 then
***************
*** 259,263 ****
    Prop.Name := Name;
    Prop.DataName := PropTypeName;
!   Prop.V9Visibility := TV9Visibility(Visibility);  // SRM - 18 Sep 2004
    TaggedStrings['StorageName'] := StorageName;
    // External part(s) options
--- 267,275 ----
    Prop.Name := Name;
    Prop.DataName := PropTypeName;
! {$IFDEF MM7+}                                      // SRM begin - 16 Mar 2005
!   Prop.V9Visibility := TV9Visibility(Visibility);
! {$ELSE}
!   Prop.Visibility := TVisibility(Visibility);
! {$ENDIF}                                          // SRM end - 16 Mar 2005
    TaggedStrings['StorageName'] := StorageName;
    // External part(s) options

Index: OFDefs.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/ObjectFoundry/OFDefs.pas,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** OFDefs.pas	2 Feb 2004 20:52:23 -0000	1.1
--- OFDefs.pas	21 Mar 2005 02:18:53 -0000	1.2
***************
*** 4,8 ****
  
  
! {$IFDEF MM7}
  uses
    MMToolsAPI, MMDiagramAPI;
--- 4,8 ----
  
  
! {$IFDEF MM7+}
  uses
    MMToolsAPI, MMDiagramAPI;

Index: OFCritic.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/ObjectFoundry/OFCritic.pas,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** OFCritic.pas	2 Feb 2004 20:52:23 -0000	1.1
--- OFCritic.pas	21 Mar 2005 02:18:53 -0000	1.2
***************
*** 17,21 ****
      function GetCriticName: WideString; override; safecall;
      function GetDescription: WideString; override; safecall;
!     function GetHeadline: WideString; override; safecall;
      procedure MsgDoubleClicked(const M: IMMMessage; var Handled: Boolean); override; safecall;
      procedure Refresh; override; safecall;
--- 17,21 ----
      function GetCriticName: WideString; override; safecall;
      function GetDescription: WideString; override; safecall;
!     function GetHeadLine: WideString; override; safecall;
      procedure MsgDoubleClicked(const M: IMMMessage; var Handled: Boolean); override; safecall;
      procedure Refresh; override; safecall;
***************
*** 55,59 ****
  end;
  
! function TObjectFoundryCritic.GetHeadline: WideString;
  begin
    Result := FHeadline;
--- 55,59 ----
  end;
  
! function TObjectFoundryCritic.GetHeadLine: WideString;
  begin
    Result := FHeadline;

Index: OFExpt.dpr
===================================================================
RCS file: /cvsroot/instantobjects/Source/ObjectFoundry/OFExpt.dpr,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** OFExpt.dpr	16 Feb 2005 06:49:00 -0000	1.3
--- OFExpt.dpr	21 Mar 2005 02:18:53 -0000	1.4
***************
*** 1,5 ****
  library OFExpt;
  
! {$R *.RES}                     
  {$R ..\Design\iodesimages.res}   
  
--- 1,5 ----
  library OFExpt;
  
! {$R *.RES}
  {$R ..\Design\iodesimages.res}   
  

[Instantobjects-cvscommit] Source/Design InstantDesignUtils.pas,1.6,1.7 InstantModelExplorer.pas,1.7,1.8

[Steven M. <sr...@us...>]

Update of /cvsroot/instantobjects/Source/Design
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24288

Modified Files:
	InstantDesignUtils.pas InstantModelExplorer.pas 
Log Message:
Changed the code so that the 'assignable typed constants' compiler
directive is not required in Core Designtime package and OF dll.

Index: InstantModelExplorer.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Design/InstantModelExplorer.pas,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** InstantModelExplorer.pas	25 Feb 2005 18:32:21 -0000	1.7
--- InstantModelExplorer.pas	21 Mar 2005 02:09:22 -0000	1.8
***************
*** 630,636 ****
  
    function AddClass(Node: TTreeNode; AClass: TInstantCodeClass;
!     Text: string): TTreeNode;
!   const
!     Level: Integer = 0;
    var
      I: Integer;
--- 630,634 ----
  
    function AddClass(Node: TTreeNode; AClass: TInstantCodeClass;
!     Text: string; var Level: Integer): TTreeNode;
    var
      I: Integer;
***************
*** 671,675 ****
          for I := 0 to Pred(SubItems.Count) do
            SubNodes.Add(AddClass(Result,
!             TInstantCodeClass(SubItems.Objects[I]), SubItems[I]));
          RemoveInvalidNodes(Result, SubNodes);
        finally
--- 669,673 ----
          for I := 0 to Pred(SubItems.Count) do
            SubNodes.Add(AddClass(Result,
!             TInstantCodeClass(SubItems.Objects[I]), SubItems[I], Level));
          RemoveInvalidNodes(Result, SubNodes);
        finally
***************
*** 690,694 ****
--- 688,694 ----
    FirstNode: TTreeNode;
    I: Integer;
+   Level: Integer;
  begin
+   Level := 0;
    FSelectedNode := nil;
    ModelView.Items.BeginUpdate;
***************
*** 712,716 ****
            AClass := Model.Classes[I];
            if (Style = msRelations) or not Assigned(AClass.BaseClass) then
!             Nodes.Add(AddClass(nil, AClass, ''));
          end;
          ModelView.AlphaSort;
--- 712,716 ----
            AClass := Model.Classes[I];
            if (Style = msRelations) or not Assigned(AClass.BaseClass) then
!             Nodes.Add(AddClass(nil, AClass, '', Level));
          end;
          ModelView.AlphaSort;

Index: InstantDesignUtils.pas
===================================================================
RCS file: /cvsroot/instantobjects/Source/Design/InstantDesignUtils.pas,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** InstantDesignUtils.pas	24 Feb 2005 00:17:06 -0000	1.6
--- InstantDesignUtils.pas	21 Mar 2005 02:09:22 -0000	1.7
***************
*** 55,76 ****
    SysUtils, TypInfo;
  
  procedure Busy(Enable: Boolean);
- const
-   Cursor: TCursor = 0;
-   Count: Integer = 0;
  begin
    if Enable then
    begin
!     if Count = 0 then
      begin
!       Cursor := Screen.Cursor;
        Screen.Cursor := crHourglass;
      end;
!     Inc(Count);
!   end else if Count > 0 then
    begin
!     Dec(Count);
!     if Count = 0 then
!       Screen.Cursor := Cursor;
    end;
  end;
--- 55,77 ----
    SysUtils, TypInfo;
  
+ var
+   __SaveCursor: TCursor = 0;
+   __BusyCount: Integer = 0;
+ 
  procedure Busy(Enable: Boolean);
  begin
    if Enable then
    begin
!     if __BusyCount = 0 then
      begin
!       __SaveCursor := Screen.Cursor;
        Screen.Cursor := crHourglass;
      end;
!     Inc(__BusyCount);
!   end else if __BusyCount > 0 then
    begin
!     Dec(__BusyCount);
!     if __BusyCount = 0 then
!       Screen.Cursor := __SaveCursor;
    end;
  end;