Changeset 1199 for trunk/src/user32/defwndproc.cpp

Timestamp:

Oct 8, 1999, 9:46:54 PM (26 years ago)

Author:

sandervl

Message:

Default dialog handler fix (call default wnd handler if window ..= dialog)

File:

• trunk/src/user32/defwndproc.cpp (modified) (3 diffs)

trunk/src/user32/defwndproc.cpp

@@ -1 @@
-/* $Id: defwndproc.cpp,v 1.9 1999-10-08 18:39:34 sandervl Exp $ */
+/* $Id: defwndproc.cpp,v 1.10 1999-10-08 19:46:54 sandervl Exp $ */
 
 /*
@@ -57 +57 @@
     dialog = (Win32Dialog *)Win32BaseWindow::GetWindowFromHandle(hwnd);
 //TODO: Wrong check?
-    if(!dialog || !dialog->IsDialog()) {
-//    if(!dialog) {
+//    if(!dialog || !dialog->IsDialog()) {
+    if(!dialog) {
         dprintf(("DefDlgProcA, window %x not found", hwnd));
         return 0;
     }
-    return dialog->DefDlgProcA(Msg, wParam, lParam);
+    if(dialog->IsDialog()) 
+         return dialog->DefDlgProcA(Msg, wParam, lParam);
+    else return dialog->DefWindowProcA(Msg, wParam, lParam);
 }
 //******************************************************************************
@@ -72 +74 @@
     dialog = (Win32Dialog *)Win32BaseWindow::GetWindowFromHandle(hwnd);
 //TODO: Wrong check?
-    if(!dialog || !dialog->IsDialog()) {
-//    if(!dialog) {
+//    if(!dialog || !dialog->IsDialog()) {
+    if(!dialog) {
         dprintf(("DefDlgProcW, window %x not found", hwnd));
         return 0;
     }
-    return dialog->DefDlgProcW(Msg, wParam, lParam);
+    if(dialog->IsDialog()) 
+         return dialog->DefDlgProcW(Msg, wParam, lParam);
+    else return dialog->DefWindowProcW(Msg, wParam, lParam);
 }
 //******************************************************************************