[JVCL-Checkins] CVS: jvcl/source JvInspector.pas,1.25,1.26

[Marcel B. <jed...@us...>]

Update of /cvsroot/jvcl/jvcl/source
In directory sc8-pr-cvs1:/tmp/cvs-serv20748/jvcl/source

Modified Files:
	JvInspector.pas 
Log Message:
Mantis 560 and 561

Index: JvInspector.pas
===================================================================
RCS file: /cvsroot/jvcl/jvcl/source/JvInspector.pas,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** JvInspector.pas	25 Dec 2002 10:53:42 -0000	1.25
--- JvInspector.pas	29 Dec 2002 12:43:10 -0000	1.26
***************
*** 56,59 ****
--- 56,60 ----
    sJvInspNoGenReg = 'Unable to create generic item registration list.';
    sJvInspPaintNotActive = 'Painter is not the active painter of the specified inspector.';
+   sJvInspPaintOnlyUsedOnce = 'Inspector painter can only be linked to one inspector.';
  
  const
***************
*** 2625,2628 ****
--- 2626,2634 ----
      Painter.Setup(Canvas);
      Painter.Paint;
+   end
+   else
+   begin
+     Canvas.Brush.Color := Color;
+     Canvas.FillRect(ClientRect);
    end;
  end;
***************
*** 2849,2854 ****
--- 2855,2868 ----
    if (Value <> Painter) then
    begin
+     if Value <> nil then
+     begin
+       if (Value.Inspector <> nil) and (Value.Inspector <> Self) then
+         raise EJvInspector.Create(sJvInspPaintOnlyUsedOnce);
+     end;
      if Painter <> nil then
+     begin
        Painter.RemoveFreeNotification(Self);
+       Painter.SetInspector(nil);
+     end;
      FPainter := Value;
      if Painter <> nil then
***************
*** 3650,3657 ****
  procedure TJvInspectorPainter.SetInspector(const AInspector: TJvCustomInspector);
  begin
!   if AInspector.Painter <> Self then
      raise EJvInspector.Create(sJvInspPaintNotActive);
    if AInspector <> Inspector then
    begin
      FInspector := AInspector;
    end;
--- 3664,3673 ----
  procedure TJvInspectorPainter.SetInspector(const AInspector: TJvCustomInspector);
  begin
!   if (AInspector <> nil) and (AInspector.Painter <> Self) then
      raise EJvInspector.Create(sJvInspPaintNotActive);
    if AInspector <> Inspector then
    begin
+     if (Inspector <> nil) and (AInspector <> nil) then
+       raise EJvInspector.Create(sJvInspPaintOnlyUsedOnce);
      FInspector := AInspector;
    end;