From: Remko B. <rem...@us...> - 2005-03-27 14:56:39
|
Update of /cvsroot/jvcl/dev/JVCL3/run In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15686 Modified Files: JvDockVSNetStyle.pas Log Message: Nil checks; mantis #2803 Index: JvDockVSNetStyle.pas =================================================================== RCS file: /cvsroot/jvcl/dev/JVCL3/run/JvDockVSNetStyle.pas,v retrieving revision 1.54 retrieving revision 1.55 diff -C2 -d -r1.54 -r1.55 *** JvDockVSNetStyle.pas 23 Mar 2005 00:16:04 -0000 1.54 --- JvDockVSNetStyle.pas 27 Mar 2005 14:56:29 -0000 1.55 *************** *** 3664,3676 **** procedure TJvDockVSChannel.InternalInsertControl(AWinControl: TWinControl); begin ! VSPopupPanel.JvDockManager.InsertControl(AWinControl, alNone, nil); ! AWinControl.FreeNotification(Self); end; procedure TJvDockVSChannel.InternalRemoveControl(AWinControl: TWinControl); begin ! AWinControl.RemoveFreeNotification(Self); ! if Assigned(VSPopupPanel) and VSPopupPanel.UseDockManager then ! VSPopupPanel.JvDockManager.RemoveControl(AWinControl); end; --- 3664,3683 ---- procedure TJvDockVSChannel.InternalInsertControl(AWinControl: TWinControl); begin ! if Assigned(AWinControl) then ! begin ! if Assigned(VSPopupPanel) and VSPopupPanel.UseDockManager and (VSPopupPanel.JvDockManager <> nil) then ! VSPopupPanel.JvDockManager.InsertControl(AWinControl, alNone, nil); ! AWinControl.FreeNotification(Self); ! end; end; procedure TJvDockVSChannel.InternalRemoveControl(AWinControl: TWinControl); begin ! if Assigned(AWinControl) then ! begin ! AWinControl.RemoveFreeNotification(Self); ! if Assigned(VSPopupPanel) and VSPopupPanel.UseDockManager and (VSPopupPanel.JvDockManager <> nil) then ! VSPopupPanel.JvDockManager.RemoveControl(AWinControl); ! end; end; |