[JVCL-Checkins] dev/JVCL3/run JvDockControlForm.pas,1.50,1.51 JvDockTree.pas,1.19,1.20 - Mantis #1807: Cont.

[Remko B. <rem...@us...>]

Update of /cvsroot/jvcl/dev/JVCL3/run
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29948

Modified Files:
	JvDockControlForm.pas JvDockTree.pas 
Log Message:
Mantis #1807: Cont.


Index: JvDockTree.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvDockTree.pas,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** JvDockTree.pas	1 Sep 2004 15:06:37 -0000	1.19
--- JvDockTree.pas	26 Sep 2004 22:41:09 -0000	1.20
***************
*** 2989,2993 ****
      with Stream do
      begin
!       Read(Level, SizeOf(Level));
        if Level = TreeStreamEndFlag then
          Break;
--- 2989,2993 ----
      with Stream do
      begin
!       if Read(Level, SizeOf(Level)) <> SizeOf(Level) then Break;
        if Level = TreeStreamEndFlag then
          Break;

Index: JvDockControlForm.pas
===================================================================
RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvDockControlForm.pas,v
retrieving revision 1.50
retrieving revision 1.51
diff -C2 -d -r1.50 -r1.51
*** JvDockControlForm.pas	23 Sep 2004 22:48:54 -0000	1.50
--- JvDockControlForm.pas	26 Sep 2004 22:41:08 -0000	1.51
***************
*** 3202,3210 ****
      FTabDockClass := TJvDockClient(Source).FTabDockClass;
      FParentVisible := TJvDockClient(Source).FParentVisible;
!     FNCPopupMenu := TJvDockClient(Source).FNCPopupMenu;
      FDirectDrag := TJvDockClient(Source).FDirectDrag;
      FShowHint := TJvDockClient(Source).FShowHint;
      FCanFloat := TJvDockClient(Source).FCanFloat;
      FDockLevel := TJvDockClient(Source).DockLevel;
    end
    else
--- 3202,3212 ----
      FTabDockClass := TJvDockClient(Source).FTabDockClass;
      FParentVisible := TJvDockClient(Source).FParentVisible;
!     NCPopupMenu := TJvDockClient(Source).FNCPopupMenu;
      FDirectDrag := TJvDockClient(Source).FDirectDrag;
      FShowHint := TJvDockClient(Source).FShowHint;
      FCanFloat := TJvDockClient(Source).FCanFloat;
      FDockLevel := TJvDockClient(Source).DockLevel;
+     { (rb) Why not call TJvDockBaseControl.Assign, ie inherited? }
+     DockStyle := TJvDockClient(Source).DockStyle;
    end
    else