2008-01-26 Ivan N. Zlatev <contact@i-nz.net>

	 * PropertryGridView.cs: Ops.

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

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/ChangeLog
index 6acacd864db34c3e98e605f00f608f11433ef6c4..8a07f0ab4b1a1f7cb18cc55d2edb0b73b69588fe 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,7 @@
+2008-01-26  Ivan N. Zlatev  <contact@i-nz.net>
+
+        * PropertryGridView.cs: Ops.
+
 2008-01-26  Ivan N. Zlatev  <contact@i-nz.net>
 
         * PropertyGridView.cs: Close dropdown form if the owner form is

diff --git a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PropertyGridView.cs b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PropertyGridView.cs
index 5b9c11a18b504cb0ef47e7950b2a9cff439c7445..dd414792a71c157334d86531554babc305b73ad9 100644 (file)
--- a/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PropertyGridView.cs
+++ b/mcs/class/Managed.Windows.Forms/System.Windows.Forms/PropertyGridView.cs
@@ -868,10 +868,10 @@ namespace System.Windows.Forms.PropertyGridInternal {
                                             msg.message == Msg.WM_LBUTTONDOWN ||
                                             msg.message == Msg.WM_MBUTTONDOWN ||
                                             msg.message == Msg.WM_RBUTTONDOWN ||
-                                            msg.message == Msg.WM_ACTIVATE ||
-                                            HwndInControl (owner, msg.hwnd) && // owner form moved
-                                            msg.message == Msg.WM_NCPAINT)
-                                           && !HwndInControl (dropdown_form, msg.hwnd)) {
+                                            msg.message == Msg.WM_ACTIVATE) &&
+                                            !HwndInControl (dropdown_form, msg.hwnd) ||
+                                            (msg.message == Msg.WM_NCPAINT && // owner form moved
+                                             HwndInControl (owner, msg.hwnd))) {
                                                if (msg.message == Msg.WM_NCPAINT) {
                                                        Message m = Message.Create (msg.hwnd, (int)msg.message, msg.wParam, msg.lParam);
                                                        XplatUI.DefWndProc (ref m);