[dotgnu-pnet-commits] pnetlib/System.Windows.Forms TreeNode.cs

[Heiko Weiss]

CVSROOT:        /sources/dotgnu-pnet
Module name:    pnetlib
Branch:         
Changes by:     Heiko Weiss <address@hidden>    06/02/01 11:00:23

Modified files:
        System.Windows.Forms: TreeNode.cs 

Log message:
        .

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/dotgnu-pnet/pnetlib/System.Windows.Forms/TreeNode.cs.diff?tr1=1.10&tr2=1.11&r1=text&r2=text

Patches:
Index: pnetlib/System.Windows.Forms/TreeNode.cs
diff -u pnetlib/System.Windows.Forms/TreeNode.cs:1.10 
pnetlib/System.Windows.Forms/TreeNode.cs:1.11
--- pnetlib/System.Windows.Forms/TreeNode.cs:1.10       Wed Feb  1 10:30:34 2006
+++ pnetlib/System.Windows.Forms/TreeNode.cs    Wed Feb  1 11:00:23 2006
@@ -183,25 +183,25 @@
 
                public void Collapse()
                {
-                       if( null == treeView ) return;
-                       
                        CollapseInternal();
-                       treeView.InvalidateDown(this);
+                       if( null != treeView ) {
+                               treeView.InvalidateDown(this);
+                       }
                }
 
                // Collapse the children recursively but don't redraw.
                private void CollapseInternal()
                {
-                       if( null == treeView ) return;
-                       
                        bool selected = false;
                        // Recursively collapse, if a child was selected, mark 
to select the parent.
                        if (childCount > 0)
                        {
                                for (int i = 0; i < childCount; i++)
                                {
-                                       if (treeView.SelectedNode == 
children[i])
-                                               selected = true;
+                                       if( null != treeView ) {
+                                               if (treeView.SelectedNode == 
children[i])
+                                                       selected = true;
+                                       }
                                        children[i].CollapseInternal();
                                }
                        }
@@ -209,17 +209,17 @@
                        {
                                // Do the events.
                                TreeViewCancelEventArgs eventArgs = new 
TreeViewCancelEventArgs(this, false, TreeViewAction.Collapse);
-                               treeView.OnBeforeCollapse(eventArgs);
+                               if( null != treeView ) 
treeView.OnBeforeCollapse(eventArgs);
                                if (!eventArgs.Cancel)
                                {
                                        // The node is now collapsed.
                                        expanded = false;
-                                       treeView.OnAfterCollapse(new 
TreeViewEventArgs(this));
+                                       if( null != treeView ) 
treeView.OnAfterCollapse(new TreeViewEventArgs(this));
                                }
                        }
                        if (selected)
                        {
-                               treeView.SelectedNode = this;
+                               if( null != treeView ) treeView.SelectedNode = 
this;
                        }
                }