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

[Heiko Weiss]

CVSROOT:        /sources/dotgnu-pnet
Module name:    pnetlib
Changes by:     Heiko Weiss <brubbel>   06/06/08 13:57:55

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

Log message:
        fixed a bug I did 06/02

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pnetlib/ChangeLog?cvsroot=dotgnu-pnet&r1=1.2421&r2=1.2422
http://cvs.savannah.gnu.org/viewcvs/pnetlib/System.Windows.Forms/Control.cs?cvsroot=dotgnu-pnet&r1=1.123&r2=1.124

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/dotgnu-pnet/pnetlib/ChangeLog,v
retrieving revision 1.2421
retrieving revision 1.2422
diff -u -b -r1.2421 -r1.2422
--- ChangeLog   6 Jun 2006 18:25:38 -0000       1.2421
+++ ChangeLog   8 Jun 2006 13:57:55 -0000       1.2422
@@ -1,3 +1,7 @@
+2006-06-08  Heiko Weiss  <address@hidden>
+
+       * System.Windows.Forms/Control.cs: fixed a bug I did 06/02.
+
 2006-06-06  David Logan  <address@hidden>
 
        * System.Windows.Forms/ScrollBar.cs: Add settor for TopIndex. Fix

Index: System.Windows.Forms/Control.cs
===================================================================
RCS file: /sources/dotgnu-pnet/pnetlib/System.Windows.Forms/Control.cs,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -b -r1.123 -r1.124
--- System.Windows.Forms/Control.cs     2 Jun 2006 10:26:12 -0000       1.123
+++ System.Windows.Forms/Control.cs     8 Jun 2006 13:57:55 -0000       1.124
@@ -790,9 +790,6 @@
                        {
                                get
                                {
-                                       // optimized performance
-                                       if( borderStyle == BorderStyle.None ) 
return new Size( width, height );
-                                       
                                        Size offset = 
ClientToBounds(Size.Empty);
                                        return new Size(width - offset.Width, 
height - offset.Height);
                                }
@@ -2901,16 +2898,11 @@
 
                                // If our height is less than the height of an 
empty control, then we have probably been minimized and we must not layout.
                                
-                               // optimized performance
-                               if( borderStyle == BorderStyle.None ) {
-                               }
-                               else {
                                        Size offset = 
ClientToBounds(Size.Empty);
                                        if(height < offset.Height)
                                        {
                                                return;
                                        }
-                               }
 
                                // Start with the display rectangle.
                                rect = DisplayRectangle;
@@ -3550,15 +3542,9 @@
 #endif
        protected virtual void SetClientSizeCore(int x, int y)
                        {
-                               // optimized performance
-                               if( borderStyle == BorderStyle.None ) {
-                                       SetBoundsCore(left, top, x, y, 
BoundsSpecified.Size);
-                               }
-                               else {
                                        Size client = ClientToBounds(new 
Size(x, y));
                                        SetBoundsCore(left, top, client.Width, 
client.Height, BoundsSpecified.Size);
                                }
-                       }
 
        // Set a control flag.
        private void SetControlFlag(ControlFlags mask, bool value)