Author: rolf
Date: 2007-04-02 15:30:31 -0400 (Mon, 02 Apr 2007)
New Revision: 75299

Modified:
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
   trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIWin32.cs
Log:
* XplatUIWin32.cs: Use the previous change in SetParent for forms only.
  Makes ToolStripComboBoxes show up again.

Modified: trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog        
2007-04-02 19:20:34 UTC (rev 75298)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog        
2007-04-02 19:30:31 UTC (rev 75299)
@@ -1,3 +1,8 @@
+2007-04-02  Rolf Bjarne Kvinge <[EMAIL PROTECTED]> 
+
+       * XplatUIWin32.cs: Use the previous change in SetParent for forms only.
+         Makes ToolStripComboBoxes show up again.
+
 2007-04-02  Carlos Alberto Cortez <[EMAIL PROTECTED]>
 
        * ListView.cs: Add a hover_pending field in ListView

Modified: 
trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIWin32.cs
===================================================================
--- trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIWin32.cs  
2007-04-02 19:20:34 UTC (rev 75298)
+++ trunk/mcs/class/Managed.Windows.Forms/System.Windows.Forms/XplatUIWin32.cs  
2007-04-02 19:30:31 UTC (rev 75299)
@@ -1874,11 +1874,11 @@
                                new_style = style | WindowStyles.WS_CHILD;
                                result = Win32SetParent (handle, parent);
                        }
-                       if (style != new_style) {
+                       if (style != new_style && c is Form) {
                                Win32SetWindowLong (handle, 
WindowLong.GWL_STYLE, (uint) new_style);
                        }
                        Win32GetWindowRect (handle, out rect2);
-                       if (rect.top != rect2.top && rect.left != rect2.left) {
+                       if (rect.top != rect2.top && rect.left != rect2.left && 
c is Form) {
                                Win32SetWindowPos (handle, IntPtr.Zero, 
rect.top, rect.left, rect.Width, rect.Height, SetWindowPosFlags.SWP_NOZORDER |  
SetWindowPosFlags.SWP_NOREDRAW | SetWindowPosFlags.SWP_NOOWNERZORDER | 
SetWindowPosFlags.SWP_NOENDSCHANGING | SetWindowPosFlags.SWP_NOACTIVATE);
                        }
                        return result;

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

Reply via email to