instantobjects-cvscommit

[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;