[dotgnu-pnet-commits] pnetlib ./ChangeLog System.Windows.Forms/TreeNo...

[Heiko Weiss]

CVSROOT:        /sources/dotgnu-pnet
Module name:    pnetlib
Branch:         
Changes by:     Heiko Weiss <address@hidden>    06/02/01 10:30:34

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

Log message:
        fixed some NullReferenceException

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

Patches:
Index: pnetlib/ChangeLog
diff -u pnetlib/ChangeLog:1.2348 pnetlib/ChangeLog:1.2349
--- pnetlib/ChangeLog:1.2348    Thu Jan 19 11:14:46 2006
+++ pnetlib/ChangeLog   Wed Feb  1 10:30:33 2006
@@ -1,3 +1,7 @@
+2006-02-01  Heiko Weiss <address@hidden>
+
+       * System.Windows.Forms/TreeNode.cs: fixed some NullReferenceException
+
 2006-01-19  Heiko Weiss <address@hidden>
 
        * runtime/System/Threading/Timer.cs: fixed bug, if system time was 
changed
Index: pnetlib/System.Windows.Forms/TreeNode.cs
diff -u pnetlib/System.Windows.Forms/TreeNode.cs:1.9 
pnetlib/System.Windows.Forms/TreeNode.cs:1.10
--- pnetlib/System.Windows.Forms/TreeNode.cs:1.9        Tue Nov 22 10:14:09 2005
+++ pnetlib/System.Windows.Forms/TreeNode.cs    Wed Feb  1 10:30:34 2006
@@ -108,6 +108,8 @@
 
                public void BeginEdit()
                {
+                       if( null == treeView ) return;
+                       
                        if (treeView.toolkitWindow != null)
                        {
                                if (!treeView.LabelEdit)
@@ -126,6 +128,7 @@
                {
                        get
                        {
+                               if( null == treeView ) return new Rectangle( 
0,0,0,0 );
                                return treeView.GetNodeBounds(this);
                        }
                }
@@ -180,6 +183,8 @@
 
                public void Collapse()
                {
+                       if( null == treeView ) return;
+                       
                        CollapseInternal();
                        treeView.InvalidateDown(this);
                }
@@ -187,6 +192,8 @@
                // 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)
@@ -226,6 +233,8 @@
 
                public void EnsureVisible()
                {
+                       if( null == treeView ) return;
+                       
                        TreeView.NodeEnumerator nodes;
                        int nodeFromTop;
                        int nodeNo;
@@ -593,6 +602,8 @@
                {
                        get
                        {
+                               if( null == treeView ) return null;
+                               
                                bool pastThis = false;
                                TreeView.NodeEnumerator nodes = new 
TreeView.NodeEnumerator(treeView.nodes);
                                while (nodes.MoveNext())
@@ -675,6 +686,8 @@
                {
                        get
                        {
+                               if( null == treeView ) return null;
+                               
                                TreeNode visibleNode = null;
                                TreeView.NodeEnumerator nodes = new 
TreeView.NodeEnumerator(treeView.nodes);
                                while (nodes.MoveNext())