[JVCL-Checkins] CVS: dev/JVCL3/run JvDockControlForm.pas,1.10,1.11 JvDockSupportControl.pas,1.8,1.9 JvDockTree.pas,1.7,1.8 JvDockVCStyle.pas,1.7,1.8 - wrapup of previous changes

[Robert M. <mar...@us...>]

Update of /cvsroot/jvcl/dev/JVCL3/run
In directory sc8-pr-cvs1:/tmp/cvs-serv4022/JVCL3/run

Modified Files:
	JvDockControlForm.pas JvDockSupportControl.pas JvDockTree.pas 
	JvDockVCStyle.pas 
Log Message:
wrapup of previous changes

Index: JvDockControlForm.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvDockControlForm.pas,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** JvDockControlForm.pas	9 Jan 2004 12:02:20 -0000	1.10
--- JvDockControlForm.pas	9 Jan 2004 14:38:53 -0000	1.11
***************
*** 3842,3846 ****
      SheetVisible := 0;
      if (Self is TJvDockVSNETTabPageControl) and (ParentForm.HostDockSite is TJvDockPanel) then
!       SheetVisible := Integer(TJvDockVSNETTabSheet(Pages[I]).PreviousVisible)
      else
        SheetVisible := SheetVisible + Integer(CurrentControl.Visible);
--- 3842,3846 ----
      SheetVisible := 0;
      if (Self is TJvDockVSNETTabPageControl) and (ParentForm.HostDockSite is TJvDockPanel) then
!       SheetVisible := Integer(TJvDockVSNETTabSheet(Pages[I]).OldVisible)
      else
        SheetVisible := SheetVisible + Integer(CurrentControl.Visible);
***************
*** 4118,4121 ****
--- 4118,4122 ----
    NewWidth, NewHeight: Integer;
    TempX, TempY: Double;
+   R: TRect;
  begin
    with Source do
***************
*** 4140,4149 ****
      else
      begin
!       GetWindowRect(TargetControl.Handle, DockRect);
        if TlbWinControlAccess(DragTarget).UseDockManager then
          if TargetControl is TJvDockCustomPanel then
            if (TJvDockCustomPanel(DragTarget).JvDockManager <> nil) then
              TJvDockCustomPanel(DragTarget).JvDockManager.PositionDockRect(Control,
!               DropOnControl, DropAlign, DockRect);
      end;
    end;
--- 4141,4155 ----
      else
      begin
!       GetWindowRect(TargetControl.Handle, R);
!       DockRect := R;
        if TlbWinControlAccess(DragTarget).UseDockManager then
          if TargetControl is TJvDockCustomPanel then
            if (TJvDockCustomPanel(DragTarget).JvDockManager <> nil) then
+           begin
+             R := DockRect;
              TJvDockCustomPanel(DragTarget).JvDockManager.PositionDockRect(Control,
!               DropOnControl, DropAlign, R);
!             DockRect := R;
!           end;
      end;
    end;

Index: JvDockSupportControl.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvDockSupportControl.pas,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** JvDockSupportControl.pas	9 Jan 2004 12:02:20 -0000	1.8
--- JvDockSupportControl.pas	9 Jan 2004 14:38:53 -0000	1.9
***************
*** 12,16 ****
  
  The Initial Developer of the Original Code is luxiaoban.
! Portions created by luxiaoban are Copyright (C) 2002,2003 luxiaoban.
  All Rights Reserved.
  
--- 12,16 ----
  
  The Initial Developer of the Original Code is luxiaoban.
! Portions created by luxiaoban are Copyright (C) 2002, 2003 luxiaoban.
  All Rights Reserved.
[...4284 lines suppressed...]
--- 3653,3663 ----
    if Assigned(FControl) then
    begin
!     if FLineVisible then
!       DrawLine;
      FControl := nil;
      ReleaseLineDC;
      if Assigned(FActiveControl) then
      begin
!       THackWinControl(FActiveControl).OnKeyDown := FOldKeyDown;
        FActiveControl := nil;
      end;
***************
*** 3627,3631 ****
      FOnMoved(Self);
  end;
- 
  
  end.
--- 3666,3669 ----

Index: JvDockTree.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvDockTree.pas,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** JvDockTree.pas	9 Jan 2004 12:02:20 -0000	1.7
--- JvDockTree.pas	9 Jan 2004 14:38:53 -0000	1.8
***************
*** 23,28 ****
  
  Known Issues:
! }
  {$I jvcl.inc}
  unit JvDockTree;
  
--- 23,30 ----
  
  Known Issues:
! -----------------------------------------------------------------------------}
[...4268 lines suppressed...]
        ReplacementZone := NewZone;
  
    try
!     inherited InsertNewParent(NewZone, SiblingZone, ParentOrientation, InsertLast, Update);
    finally
      Update := TempUpdate;
***************
*** 4082,4087 ****
  procedure TJvDockAdvTree.RemoveZone(Zone: TJvDockZone; Hide: Boolean);
  begin
! 
!   inherited;
  end;
  
--- 3798,3802 ----
  procedure TJvDockAdvTree.RemoveZone(Zone: TJvDockZone; Hide: Boolean);
  begin
!   inherited RemoveZone(Zone, Hide);
  end;
  

Index: JvDockVCStyle.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvDockVCStyle.pas,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** JvDockVCStyle.pas	9 Jan 2004 12:02:20 -0000	1.7
--- JvDockVCStyle.pas	9 Jan 2004 14:38:53 -0000	1.8
***************
*** 327,330 ****
--- 327,331 ----
    SysCaptionHeight: Integer;
    PanelScreenRect: TRect;
+   R: TRect;
  begin
    inherited CustomDockOver(Source, X, Y, State, Accept);
***************
*** 362,371 ****
        begin
          if ((Source.Control.DockOrientation = doVertical) or (Source.Control.HostDockSite = nil)) then
!           Source.DockRect.Bottom := Source.DockRect.Top + Source.Control.UnDockHeight - SysCaptionHeight;
        end
        else
        if DropAlign in [alLeft, alRight] then
          if (Source.Control.DockOrientation = doHorizontal) or (Source.Control.HostDockSite = nil) then
!           Source.DockRect.Right := Source.DockRect.Left + Source.Control.UnDockWidth - SysCaptionHeight;
      end;
    end;
--- 363,380 ----
        begin
          if ((Source.Control.DockOrientation = doVertical) or (Source.Control.HostDockSite = nil)) then
!         begin
!           R := Source.DockRect;
!           R.Bottom := Source.DockRect.Top + Source.Control.UnDockHeight - SysCaptionHeight;
!           Source.DockRect := R;
!         end;
        end
        else
        if DropAlign in [alLeft, alRight] then
          if (Source.Control.DockOrientation = doHorizontal) or (Source.Control.HostDockSite = nil) then
!         begin
!           R := Source.DockRect;
!           R.Right := Source.DockRect.Left + Source.Control.UnDockWidth - SysCaptionHeight;
!           Source.DockRect := R;
!         end;
      end;
    end;
***************
*** 591,596 ****
  
    MapWindowPoints(0, DockSite.Handle, DockRect, 2);
!   SetDockHeightWidthArr(0, DockSite.Height, DockSite.Width);
!   SetDockRectangles(DockRect);
  
    TempOrient := DockSiteOrientation;
--- 600,605 ----
  
    MapWindowPoints(0, DockSite.Handle, DockRect, 2);
!   InitDockHeightWidth(0, DockSite.Height, DockSite.Width);
!   InitDockRectangles(DockRect);
  
    TempOrient := DockSiteOrientation;