Skip to content

W
wine-cw
Commit e6b82e76 authored by Alexandre Julliard's avatar Alexandre Julliard
Browse files
Options

Murali Pattathe

GetNextDlgGroupItem: needs to check the control parent is the main dialog. GetNextTabItem: make sure this control is visible and not disabled.
parent 8952dea4
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 1 deletion
windows/dialog.c
View file @ e6b82e76
...@@ -1794,6 +1794,13 @@ HWND WINAPI GetNextDlgGroupItem( HWND hwndDlg, HWND hwndCtrl, ...@@ -1794,6 +1794,13 @@ HWND WINAPI GetNextDlgGroupItem( HWND hwndDlg, HWND hwndCtrl,
*pWndDlg = NULL; *pWndDlg = NULL;
HWND retvalue; 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 (!(pWndDlg = WIN_FindWndPtr( hwndDlg ))) return 0;
if (hwndCtrl) if (hwndCtrl)
{ {
...@@ -1927,7 +1934,7 @@ static HWND DIALOG_GetNextTabItem( HWND hwndMain, HWND hwndDlg, HWND hwndCtrl, B ...@@ -1927,7 +1934,7 @@ static HWND DIALOG_GetNextTabItem( HWND hwndMain, HWND hwndDlg, HWND hwndCtrl, B
{ {
dsStyle = GetWindowLongA(hChildFirst,GWL_STYLE); dsStyle = GetWindowLongA(hChildFirst,GWL_STYLE);
exStyle = GetWindowLongA(hChildFirst,GWL_EXSTYLE); 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; bCtrl=TRUE;
break; break;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment