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

[Heiko Weiss]

CVSROOT:        /sources/dotgnu-pnet
Module name:    pnetlib
Changes by:     Heiko Weiss <brubbel>   07/07/04 08:38:49

Modified files:
        .              : ChangeLog 
        System.Windows.Forms: Form.cs 
        System.Drawing : Image.cs 

Log message:
        Form.cs: Do not destroy form, when shown Modal, only destroy handle.
        Image.cs: fixed getting size of image, if image is gif.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pnetlib/ChangeLog?cvsroot=dotgnu-pnet&r1=1.2508&r2=1.2509
http://cvs.savannah.gnu.org/viewcvs/pnetlib/System.Windows.Forms/Form.cs?cvsroot=dotgnu-pnet&r1=1.54&r2=1.55
http://cvs.savannah.gnu.org/viewcvs/pnetlib/System.Drawing/Image.cs?cvsroot=dotgnu-pnet&r1=1.13&r2=1.14

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/dotgnu-pnet/pnetlib/ChangeLog,v
retrieving revision 1.2508
retrieving revision 1.2509
diff -u -b -r1.2508 -r1.2509
--- ChangeLog   24 Jun 2007 13:43:33 -0000      1.2508
+++ ChangeLog   4 Jul 2007 08:38:48 -0000       1.2509
@@ -1,3 +1,9 @@
+2007-07-04  Heiko Weiss <address@hidden>
+
+       * System.Windows.Forms/Form.cs: Do not destroy form, when shown Modal, 
only
+       destroy handle.
+       * System.Drawing/Image.cs: fixed getting size of image, if image is gif.
+       
 2007-06-24  Klaus Treichel  <address@hidden>
 
        * runtime/Microsoft/Win32/RegistryKeyPermissionCheck.cs,

Index: System.Windows.Forms/Form.cs
===================================================================
RCS file: /sources/dotgnu-pnet/pnetlib/System.Windows.Forms/Form.cs,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -b -r1.54 -r1.55
--- System.Windows.Forms/Form.cs        13 Jul 2006 13:12:33 -0000      1.54
+++ System.Windows.Forms/Form.cs        4 Jul 2007 08:38:48 -0000       1.55
@@ -963,7 +963,10 @@
 
                                        // Enter a message loop until the 
dialog result is set.
                                        Application.InnerMessageLoop(this);
-                                       Dispose();      // must call Dispose, 
when closing the dialog
+                                       
+                                       if( toolkitWindow != null ) {
+                                               DestroyHandle(); // close handle
+                                       }
                                }
                                finally
                                {
@@ -1676,7 +1679,7 @@
                                {
                                        dialogResultIsSet = true;       // must 
be set here, or Application.InnerMessageLoop won't end
                                        OnClosed(EventArgs.Empty);
-                                       Dispose();
+                                       if( !Modal) Dispose();
                                }
                        }
 

Index: System.Drawing/Image.cs
===================================================================
RCS file: /sources/dotgnu-pnet/pnetlib/System.Drawing/Image.cs,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- System.Drawing/Image.cs     25 May 2004 10:21:11 -0000      1.13
+++ System.Drawing/Image.cs     4 Jul 2007 08:38:48 -0000       1.14
@@ -479,7 +479,7 @@
                                this.dgImage = dgImage;
                                // If we are loading an icon, set the size of 
the image
                                // to the size of the first icon
-                               if (rawFormat == ImageFormat.Icon)
+                               if (rawFormat == ImageFormat.Icon || rawFormat 
== ImageFormat.Gif )
                                {
                                        width = dgImage.GetFrame(0).Width;
                                        height = dgImage.GetFrame(0).Height;