Author: rolf
Date: 2007-04-03 04:29:39 -0400 (Tue, 03 Apr 2007)
New Revision: 75327

Modified:
   
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms.X11Internal/ChangeLog
   
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms.X11Internal/XplatUIX11-new.cs
Log:
* XplatUIX11-new.cs: Port changes from XplatUIX11.cs

Modified: 
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms.X11Internal/ChangeLog
===================================================================
--- 
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms.X11Internal/ChangeLog
    2007-04-03 08:26:53 UTC (rev 75326)
+++ 
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms.X11Internal/ChangeLog
    2007-04-03 08:29:39 UTC (rev 75327)
@@ -1,3 +1,7 @@
+2007-04-03  Rolf Bjarne Kvinge <[EMAIL PROTECTED]> 
+
+       * XplatUIX11-new.cs: Port changes from XplatUIX11.cs
+
 2007-03-29  Everaldo Canuto  <[EMAIL PROTECTED]>
 
        * XplatUIX11-new.cs: Prevent system to open more than one balloon.

Modified: 
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms.X11Internal/XplatUIX11-new.cs
===================================================================
--- 
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms.X11Internal/XplatUIX11-new.cs
    2007-04-03 08:26:53 UTC (rev 75326)
+++ 
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms.X11Internal/XplatUIX11-new.cs
    2007-04-03 08:29:39 UTC (rev 75327)
@@ -290,21 +290,9 @@
                }
 
                // XXX this implementation should probably be shared between 
all non-win32 backends
-               internal override bool CalculateWindowRect (ref Rectangle 
ClientRect, int Style, int ExStyle, Menu menu, out Rectangle WindowRect)
+               internal override bool CalculateWindowRect (ref Rectangle 
ClientRect, CreateParams cp, Menu menu, out Rectangle WindowRect)
                {
-                       FormBorderStyle border_style;
-                       TitleStyle      title_style;
-                       bool border_static;
-                       int caption_height;
-                       int tool_caption_height;
-
-                       // XXX this method should be static on Hwnd, not X11Hwnd
-                       X11Hwnd.DeriveStyles (Style, ExStyle, out border_style, 
out border_static, out title_style,
-                                             out caption_height, out 
tool_caption_height);
-
-                       WindowRect = Hwnd.GetWindowRectangle(border_style, 
border_static, menu, title_style,
-                                                            caption_height, 
tool_caption_height,
-                                                            ClientRect);
+                       WindowRect = Hwnd.GetWindowRectangle (cp, menu, 
ClientRect);
                        return true;
                }
 

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to