From e6b82e76627595a9edd61c340759f1eda49e1986 Mon Sep 17 00:00:00 2001 From: Alexandre Julliard Date: Sun, 12 Dec 1999 20:17:59 +0000 Subject: [PATCH] Murali Pattathe GetNextDlgGroupItem: needs to check the control parent is the main dialog. GetNextTabItem: make sure this control is visible and not disabled. --- windows/dialog.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/windows/dialog.c b/windows/dialog.c index fafaafbc822..913eb85eb1a 100644 --- a/windows/dialog.c +++ b/windows/dialog.c @@ -1794,6 +1794,13 @@ HWND WINAPI GetNextDlgGroupItem( HWND hwndDlg, HWND hwndCtrl, *pWndDlg = NULL; HWND retvalue; + if(hwndCtrl) + { + /* if the hwndCtrl is the child of the control in the hwndDlg then the hwndDlg has to be the parent of the hwndCtrl */ + if(GetParent(hwndCtrl) != hwndDlg && GetParent(GetParent(hwndCtrl)) == hwndDlg) + hwndDlg = GetParent(hwndCtrl); + } + if (!(pWndDlg = WIN_FindWndPtr( hwndDlg ))) return 0; if (hwndCtrl) { @@ -1927,7 +1934,7 @@ static HWND DIALOG_GetNextTabItem( HWND hwndMain, HWND hwndDlg, HWND hwndCtrl, B { dsStyle = GetWindowLongA(hChildFirst,GWL_STYLE); exStyle = GetWindowLongA(hChildFirst,GWL_EXSTYLE); - if(dsStyle & DS_CONTROL || exStyle & WS_EX_CONTROLPARENT) + if( (dsStyle & DS_CONTROL || exStyle & WS_EX_CONTROLPARENT) && (dsStyle & WS_VISIBLE) && !(dsStyle & WS_DISABLED)) { bCtrl=TRUE; break; -- 2.11.4.GIT