mirror of
https://github.com/reactos/reactos.git
synced 2025-08-05 00:55:48 +00:00
[User32]
- When active or inactive set the appropriate action so the correct keyboard mode can be returned. svn path=/trunk/; revision=51833
This commit is contained in:
parent
3d6ff1e532
commit
2a4c54d85c
1 changed files with 8 additions and 2 deletions
|
@ -39,7 +39,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(user32);
|
||||||
|
|
||||||
#define DF_END 0x0001
|
#define DF_END 0x0001
|
||||||
#define DF_OWNERENABLED 0x0002
|
#define DF_OWNERENABLED 0x0002
|
||||||
#define DF_DIALOGACTIVE 0x4000
|
#define DF_DIALOGACTIVE 0x4000 // ReactOS
|
||||||
#define DWLP_ROS_DIALOGINFO (DWLP_USER+sizeof(ULONG_PTR))
|
#define DWLP_ROS_DIALOGINFO (DWLP_USER+sizeof(ULONG_PTR))
|
||||||
#define GETDLGINFO(hwnd) DIALOG_get_info(hwnd, FALSE)
|
#define GETDLGINFO(hwnd) DIALOG_get_info(hwnd, FALSE)
|
||||||
#define SETDLGINFO(hwnd, info) SetWindowLongPtrW((hwnd), DWLP_ROS_DIALOGINFO, (LONG_PTR)(info))
|
#define SETDLGINFO(hwnd, info) SetWindowLongPtrW((hwnd), DWLP_ROS_DIALOGINFO, (LONG_PTR)(info))
|
||||||
|
@ -1143,7 +1143,13 @@ static LRESULT DEFDLG_Proc( HWND hwnd, UINT msg, WPARAM wParam,
|
||||||
return DefWindowProcA( hwnd, msg, wParam, lParam );
|
return DefWindowProcA( hwnd, msg, wParam, lParam );
|
||||||
|
|
||||||
case WM_ACTIVATE:
|
case WM_ACTIVATE:
|
||||||
NtUserSetThreadState(DF_DIALOGACTIVE,DF_DIALOGACTIVE);
|
{ // ReactOS
|
||||||
|
DWORD dwSetFlag;
|
||||||
|
HWND hwndparent = DIALOG_FindMsgDestination( hwnd );
|
||||||
|
// if WA_CLICK/ACTIVE ? set dialog is active.
|
||||||
|
dwSetFlag = wParam ? DF_DIALOGACTIVE : 0;
|
||||||
|
if (hwndparent != hwnd) NtUserSetThreadState(dwSetFlag, DF_DIALOGACTIVE);
|
||||||
|
}
|
||||||
if (wParam) DEFDLG_RestoreFocus( hwnd );
|
if (wParam) DEFDLG_RestoreFocus( hwnd );
|
||||||
else DEFDLG_SaveFocus( hwnd );
|
else DEFDLG_SaveFocus( hwnd );
|
||||||
return 0;
|
return 0;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue