2008-02-05 Andreia Gaita <avidigal@novell.com>

* XplatUIWin32.cs, XplatUICarbon.cs: set the hwnd.Mapped flag when we create
the window so that the check on Control.UpdateZOrderOfChild passes on non-X
platforms. Fixes #359036

Note: Control.UpdateZOrderOfChild needs to be rewritten to not rely on
platform-specific flags.

svn path=/trunk/mcs/; revision=94975

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
index ebd21d66ee5510c57752f3ca036fb37ea0a36cea..b00294201aee5e5558829dbc4d6342d4e79fc490 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
@@ -1,3 +1,12 @@
+2008-02-05  Andreia Gaita  <avidigal@novell.com>
+
+       * XplatUIWin32.cs, XplatUICarbon.cs: set the hwnd.Mapped flag when we create 
+       the window so that the check on Control.UpdateZOrderOfChild passes on non-X
+       platforms. Fixes #359036
+       
+       Note: Control.UpdateZOrderOfChild needs to be rewritten to not rely on 
+       platform-specific flags.
+
 2008-02-05  Carlos Alberto Cortez <calberto.cortez@gmail.com>
 
        * Binding.cs: Add 2.0 BindableComponent property - just return control

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUICarbon.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUICarbon.cs
index efa187a02d3d7e5897d7fadc0e92238cd6ee7145..f3eff59a265d9cda8235ba2e1b841d1dc61a12bb 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUICarbon.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUICarbon.cs
@@ -1791,6 +1791,7 @@ namespace System.Windows.Forms {
                        HIViewSetVisible (hwnd.client_window, visible);
 
                        hwnd.visible = visible;
+                       hwnd.Mapped = true;
                        return true;
                }
                

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIWin32.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIWin32.cs
index a6bf73c87fc210abf006181e3c550cbfbbf11d38..e3fb28d7948b8ffd8ca959939d577bf519736efe 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIWin32.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIWin32.cs
@@ -1596,7 +1596,7 @@ namespace System.Windows.Forms {
                        }
 
                        hwnd.ClientWindow = WindowHandle;
-
+                       hwnd.Mapped = true;
                        Win32SetWindowLong(WindowHandle, WindowLong.GWL_USERDATA, (uint)ThemeEngine.Current.DefaultControlBackColor.ToArgb());
 
                        return WindowHandle;