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

[Heiko Weiss]

CVSROOT:        /sources/dotgnu-pnet
Module name:    pnetlib
Changes by:     Heiko Weiss <brubbel>   06/11/06 11:45:21

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

Log message:
        fixed null ref exception

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pnetlib/ChangeLog?cvsroot=dotgnu-pnet&r1=1.2455&r2=1.2456
http://cvs.savannah.gnu.org/viewcvs/pnetlib/System.Windows.Forms/ControlToolkitMgr.cs?cvsroot=dotgnu-pnet&r1=1.2&r2=1.3

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/dotgnu-pnet/pnetlib/ChangeLog,v
retrieving revision 1.2455
retrieving revision 1.2456
diff -u -b -r1.2455 -r1.2456
--- ChangeLog   3 Nov 2006 06:23:36 -0000       1.2455
+++ ChangeLog   6 Nov 2006 11:45:21 -0000       1.2456
@@ -1,3 +1,7 @@
+2006-11-06  Heiko Weiss <address@hidden>
+
+       * System.Windows.Forms/ControlToolkitMgr.cs: fixed null ref exception.
+
 2006-11-03  Heiko Weiss <address@hidden>
 
        * System.Windows.Forms/TextBox.cs: fixed index out of range exception.

Index: System.Windows.Forms/ControlToolkitMgr.cs
===================================================================
RCS file: 
/sources/dotgnu-pnet/pnetlib/System.Windows.Forms/ControlToolkitMgr.cs,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- System.Windows.Forms/ControlToolkitMgr.cs   6 Apr 2006 10:06:16 -0000       
1.2
+++ System.Windows.Forms/ControlToolkitMgr.cs   6 Nov 2006 11:45:21 -0000       
1.3
@@ -57,7 +57,8 @@
                                );
                }
                
-               if(parent != null )
+               // Check parent Toolkit too, might be null in some difficult 
cases. 
+               if(parent != null && parent.Toolkit != null )
                {
                        return parent.Toolkit.CreateChildWindow
                                        (parent, x, y, w, h, new 
ControlWeakRef(control) );