commit e1f67b99bb9cf929c0b7482bcacaba42e1fe0ef1
author NF Stevens <norman@arcady.u-net.com> Sun Nov 08 16:44:41 1998 +0000
committer Alexandre Julliard <julliard@winehq.org> Sun Nov 08 16:44:41 1998 +0000
tree b37b9f6911b95c1c8b04c6f2b6c88ebc83c3b7f9
parent fdf6aa4eed0f3e703f800bba493d0ce7ea508f25

Fixed keystroke accelerators in dialogs which have controls containing
other controls as child windows.

windows/dialog.c

diff --git a/windows/dialog.c b/windows/dialog.c
index c4f763d..a552636 100644
--- a/windows/dialog.c
+++ b/windows/dialog.c
@@ -1010,6 +1010,7 @@
 static BOOL32 DIALOG_IsAccelerator( HWND32 hwnd, HWND32 hwndDlg, WPARAM32 vKey )
 {
     HWND32 hwndControl = hwnd;
+    HWND32 hwndNext;
     WND *wndPtr;
     BOOL32 RetVal = FALSE;
     INT32 dlgCode;
@@ -1075,11 +1076,24 @@
                     }
                 }
             }
-            hwndControl = GetWindow32( hwndControl, GW_HWNDNEXT );
-            if (!hwndControl)
-            {
-                hwndControl = GetWindow32( hwndDlg, GW_CHILD );
-            }
+	    hwndNext = GetWindow32( hwndControl, GW_CHILD );
+	    if (!hwndNext)
+	    {
+	        hwndNext = GetWindow32( hwndControl, GW_HWNDNEXT );
+	    }
+	    while (!hwndNext)
+	    {
+		hwndControl = GetParent32( hwndControl );
+		if (hwndControl == hwndDlg)
+		{
+		    hwndNext = GetWindow32( hwndDlg, GW_CHILD );
+		}
+		else
+		{
+		    hwndNext = GetWindow32( hwndControl, GW_HWNDNEXT );
+		}
+	    }
+            hwndControl = hwndNext;
         }
         while (hwndControl != hwnd);
     }