Author: jpobst
Date: 2007-12-04 09:56:18 -0500 (Tue, 04 Dec 2007)
New Revision: 90682
Modified:
branches/mono-1-2-6/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
branches/mono-1-2-6/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIX11.cs
Log:
2007-12-04 Rolf Bjarne Kvinge <[EMAIL PROTECTED]>
[Backport to 1.2.6]
* XplatUIX11.cs: Make toolwindows' decorations show up without causing
any
tests to fail (hopefully).
Modified:
branches/mono-1-2-6/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
---
branches/mono-1-2-6/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2007-12-04 14:52:05 UTC (rev 90681)
+++
branches/mono-1-2-6/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
2007-12-04 14:56:18 UTC (rev 90682)
@@ -1,3 +1,8 @@
+2007-12-04 Rolf Bjarne Kvinge <[EMAIL PROTECTED]>
+ [Backport to 1.2.6]
+ * XplatUIX11.cs: Make toolwindows' decorations show up without causing
any
+ tests to fail (hopefully).
+
2007-12-03 Jonathan Pobst <[EMAIL PROTECTED]>
[Backport to 1.2.6]
* Application.cs: Let WM_CHAR messages flow through to controls
Modified:
branches/mono-1-2-6/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIX11.cs
===================================================================
---
branches/mono-1-2-6/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIX11.cs
2007-12-04 14:52:05 UTC (rev 90681)
+++
branches/mono-1-2-6/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIX11.cs
2007-12-04 14:56:18 UTC (rev 90682)
@@ -783,7 +783,7 @@
if (form != null)
cp = form.GetCreateParams ();
- if (form != null && (form.window_manager == null ||
cp.IsSet (WindowExStyles.WS_EX_TOOLWINDOW))) {
+ if (form != null && (form.window_manager == null &&
!cp.IsSet (WindowExStyles.WS_EX_TOOLWINDOW))) {
Hwnd.Borders borders = Hwnd.GetBorders (cp,
null);
Rectangle xrect = rect;
@@ -818,7 +818,7 @@
* we're painting in only)
*/
Form form = cp.control as Form;
- if (form != null && (form.window_manager == null ||
cp.IsSet (WindowExStyles.WS_EX_TOOLWINDOW))) {
+ if (form != null && (form.window_manager == null &&
!cp.IsSet (WindowExStyles.WS_EX_TOOLWINDOW))) {
Hwnd.Borders borders = Hwnd.GetBorders (cp,
null);
Size xrect = size;
@@ -843,7 +843,7 @@
*/
Size rect = new Size (xWidth, xHeight);
Form form = cp.control as Form;
- if (form != null && (form.window_manager == null ||
cp.IsSet (WindowExStyles.WS_EX_TOOLWINDOW))) {
+ if (form != null && (form.window_manager == null &&
!cp.IsSet (WindowExStyles.WS_EX_TOOLWINDOW))) {
Hwnd.Borders borders = Hwnd.GetBorders (cp,
null);
Size xrect = rect;
_______________________________________________
Mono-patches maillist - [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches