Changeset 8968

Timestamp:

Aug 8, 2002, 2:34:37 PM (23 years ago)

Author:

sandervl

Message:

PF: Fix for handling VK_RETURN in dialogs

File:

• trunk/src/user32/windlgmsg.cpp (modified) (2 diffs)

trunk/src/user32/windlgmsg.cpp ¶

@@ -1 @@
-/* $Id: windlgmsg.cpp,v 1.15 2002-07-01 11:33:09 sandervl Exp $ */
+/* $Id: windlgmsg.cpp,v 1.16 2002-08-08 12:34:37 sandervl Exp $ */
 /*
  * Win32 dialog message APIs for OS/2
@@ -276 +276 @@
                 if (HIWORD(dw) == DC_HASDEFID)
                 {
-                  //@PF If DEFID button is disabled do not press it!    
                   if (IsWindowEnabled(GetDlgItem(hwndDlg, LOWORD(dw)))) 
+                  {
                        SendMessageA( hwndDlg, WM_COMMAND,
                                      MAKEWPARAM( LOWORD(dw), BN_CLICKED ),
                                     (LPARAM)GetDlgItem(hwndDlg, LOWORD(dw)));
+                  }
                 }
                 else
                 {
-                    SendMessageA( hwndDlg, WM_COMMAND, IDOK,
+                    // @@PF Win2k here behaves this way: checks focus and then
+                    // if it is button clicks it, I also added enabled check
+                    HWND hwndCtrl = GetFocus();
+                    if (SendMessageA(hwndCtrl, WM_GETDLGCODE, 0, 0) & DLGC_UNDEFPUSHBUTTON)
+                    {
+                       if (IsWindowEnabled(hwndCtrl))
+                         SendMessageA( hwndDlg, WM_COMMAND,
+                                       MAKEWPARAM( GetDlgCtrlID(hwndCtrl), BN_CLICKED ),
+                                       (LPARAM)hwndCtrl);
+                    }
+                    else
+                       SendMessageA( hwndDlg, WM_COMMAND, IDOK,
                                     (LPARAM)GetDlgItem( hwndDlg, IDOK ) );
-
                 }