Dmitry Timoshkov : comctl32: Make sure that the focus is set to an existing property sheet button.
Alexandre Julliard
julliard at winehq.org
Thu Jul 22 12:09:33 CDT 2010
Module: wine
Branch: master
Commit: 1bf5e12e9593b7c8cfd14a2c114c17371737f2c3
URL: http://source.winehq.org/git/wine.git/?a=commit;h=1bf5e12e9593b7c8cfd14a2c114c17371737f2c3
Author: Dmitry Timoshkov <dmitry at codeweavers.com>
Date: Thu Jul 22 17:50:41 2010 +0900
comctl32: Make sure that the focus is set to an existing property sheet button.
---
dlls/comctl32/propsheet.c | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c
index 45c7fe3..3e313ba 100644
--- a/dlls/comctl32/propsheet.c
+++ b/dlls/comctl32/propsheet.c
@@ -3411,9 +3411,14 @@ PROPSHEET_DialogProc(HWND hwnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
psInfo->hwnd = hwnd;
SetWindowLongPtrW(hwnd, DWLP_USER, (DWORD_PTR)psInfo);
- /* set up the Next and Back buttons by default */
- PROPSHEET_SetWizButtons(hwnd, PSWIZB_BACK|PSWIZB_NEXT);
- SetFocus(GetDlgItem(hwnd, IDC_NEXT_BUTTON));
+ if (psInfo->ppshheader.dwFlags & INTRNL_ANY_WIZARD)
+ {
+ /* set up the Next and Back buttons by default */
+ PROPSHEET_SetWizButtons(hwnd, PSWIZB_BACK|PSWIZB_NEXT);
+ SetFocus(GetDlgItem(hwnd, IDC_NEXT_BUTTON));
+ }
+ else
+ SetFocus(GetDlgItem(hwnd, IDOK));
/* Set up fonts */
SystemParametersInfoW (SPI_GETICONTITLELOGFONT, 0, &logFont, 0);
More information about the wine-cvs
mailing list