Changeset 3153 for trunk/src/user32/windlgmsg.cpp

Timestamp:

Mar 18, 2000, 5:13:41 PM (25 years ago)

Author:

cbratschi

Message:

merged with Corel 20000317, small icon

File:

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

trunk/src/user32/windlgmsg.cpp

@@ -1 @@
-/* $Id: windlgmsg.cpp,v 1.6 2000-02-16 14:28:25 sandervl Exp $ */
+/* $Id: windlgmsg.cpp,v 1.7 2000-03-18 16:13:41 cbratschi Exp $ */
 /*
  * Win32 dialog message APIs for OS/2
@@ -5 +5 @@
  * Copyright 1999 Sander van Leeuwen (OS/2 port & adaption)
  *
- * Based on Wine code (990815: window\dialog.c)
+ * Based on Corel WINE code (20000317: window\dialog.c)
+ * (Based on Wine code (990815: window\dialog.c))
  *
  * Copyright 1993, 1994, 1996 Alexandre Julliard
@@ -21 +22 @@
 #include "win32dlg.h"
 
-#define DBG_LOCALLOG    DBG_windlgmsg
+#define DBG_LOCALLOG    DBG_windlgmsg
 #include "dbglocal.h"
 
@@ -176 +177 @@
 }
 /***********************************************************************
+ *           DIALOG_FindMsgDestination
+ *
+ * The messages that IsDialogMessage send may not go to the dialog
+ * calling IsDialogMessage if that dialog is a child, and it has the
+ * DS_CONTROL style set.
+ * We propagate up until we hit a that does not have DS_CONTROL, or
+ * whose parent is not a dialog.
+ */
+static HWND DIALOG_FindMsgDestination( HWND hwndDlg )
+{
+    while (GetWindowLongA(hwndDlg, GWL_STYLE) & DS_CONTROL)
+    {
+        Win32BaseWindow *pParent;
+        HWND hParent = GetParent(hwndDlg);
+        if (!hParent) break;
+
+        pParent = Win32BaseWindow::GetWindowFromHandle(hParent);
+        if (!pParent) break;
+
+        if (!pParent->IsDialog())
+          break;
+
+        hwndDlg = hParent;
+    }
+
+    return hwndDlg;
+}
+
+/***********************************************************************
  *           DIALOG_IsDialogMessage
  */
-static BOOL DIALOG_IsDialogMessage( HWND hwnd, HWND hwndDlg,
-                                    UINT message, WPARAM wParam,
-                                    LPARAM lParam, BOOL *translate,
-                                    BOOL *dispatch, INT dlgCode )
+static BOOL DIALOG_IsDialogMessage( HWND hwndDlg, BOOL *translate, BOOL *dispatch, INT dlgCode, LPMSG msg )
 {
     *translate = *dispatch = FALSE;
 
-    if (message == WM_PAINT)
+    if (msg->message == WM_PAINT)
     {
         /* Apparently, we have to handle this one as well */
@@ -193 +220 @@
 
       /* Only the key messages get special processing */
-    if ((message != WM_KEYDOWN) &&
-        (message != WM_SYSCHAR) &&
-        (message != WM_CHAR))
+    if ((msg->message != WM_KEYDOWN) &&
+        (msg->message != WM_SYSCHAR) &&
+        (msg->message != WM_CHAR))
         return FALSE;
 
@@ -204 +231 @@
     }
 
-    switch(message)
+    hwndDlg = DIALOG_FindMsgDestination(hwndDlg);
+
+    switch(msg->message)
     {
     case WM_KEYDOWN:
-        switch(wParam)
+        switch(msg->wParam)
         {
         case VK_TAB:
@@ -224 +253 @@
             if (!(dlgCode & DLGC_WANTARROWS))
             {
-                BOOL fPrevious = (wParam == VK_LEFT || wParam == VK_UP);
+                BOOL fPrevious = (msg->wParam == VK_LEFT || msg->wParam == VK_UP);
                 HWND hwndNext =
                     GetNextDlgGroupItem (hwndDlg, GetFocus(), fPrevious );
@@ -252 +281 @@
 
                 }
-            }
-            return TRUE;
+
+                return TRUE;
+            }
         }
         *translate = TRUE;
@@ -263 +293 @@
 
     case WM_SYSCHAR:
-        if (DIALOG_IsAccelerator( hwnd, hwndDlg, wParam ))
+        if (DIALOG_IsAccelerator( msg->hwnd, hwndDlg, msg->wParam ))
         {
             /* don't translate or dispatch */
@@ -287 +317 @@
 
     dlgCode = SendMessageA( msg->hwnd, WM_GETDLGCODE, 0, (LPARAM)msg);
-    ret = DIALOG_IsDialogMessage( msg->hwnd, hwndDlg, msg->message,
-                                  msg->wParam, msg->lParam,
-                                  &translate, &dispatch, dlgCode );
+    ret = DIALOG_IsDialogMessage(hwndDlg,&translate,&dispatch,dlgCode,msg);
     if (translate) TranslateMessage( msg );
     if (dispatch) DispatchMessageA( msg );
@@ -306 +334 @@
 
     dlgCode = SendMessageW( msg->hwnd, WM_GETDLGCODE, 0, (LPARAM)msg);
-    ret = DIALOG_IsDialogMessage( msg->hwnd, hwndDlg, msg->message,
-                                  msg->wParam, msg->lParam,
-                                  &translate, &dispatch, dlgCode );
+    ret = DIALOG_IsDialogMessage(hwndDlg,&translate,&dispatch,dlgCode,msg);
     if (translate) TranslateMessage( msg );
     if (dispatch) DispatchMessageW( msg );