Changeset 2084 for trunk/src/user32/win32dlg.cpp

Timestamp:

Dec 16, 1999, 1:11:49 AM (26 years ago)

Author:

sandervl

Message:

sendmessage + hook updates + misc fixes

File:

• trunk/src/user32/win32dlg.cpp (modified) (8 diffs)

trunk/src/user32/win32dlg.cpp

@@ -1 @@
-/* $Id: win32dlg.cpp,v 1.36 1999-12-09 00:53:37 sandervl Exp $ */
+/* $Id: win32dlg.cpp,v 1.37 1999-12-16 00:11:46 sandervl Exp $ */
 /*
  * Win32 Dialog Code for OS/2
@@ -217 +217 @@
 
     if (hUserFont)
-        SendMessageA(WM_SETFONT, (WPARAM)hUserFont, 0 );
+        SendInternalMessageA(WM_SETFONT, (WPARAM)hUserFont, 0 );
 
     /* Create controls */
@@ -226 +226 @@
         hwndFocus = GetNextDlgTabItem( getWindowHandle(), 0, FALSE );
 
-        if (SendMessageA(WM_INITDIALOG, (WPARAM)hwndFocus, param))
+        if (SendInternalMessageA(WM_INITDIALOG, (WPARAM)hwndFocus, param))
              SetFocus(hwndFocus);
 
@@ -262 +262 @@
     /* Owner must be a top-level window */
     if(getOwner() == NULL) {
-     topOwner = windowDesktop;
+         topOwner = windowDesktop;
     }
     else topOwner = getOwner()->GetTopParent();
@@ -295 +295 @@
           if (!OSLibWinPeekMsg(&msg,0,0,0,MSG_NOREMOVE))
           {
-            if(!(getStyle() & DS_NOIDLEMSG))
-              topOwner->SendMessageA(WM_ENTERIDLE,MSGF_DIALOGBOX,getWindowHandle());
-            OSLibWinGetMsg(&msg,0,0,0);
-          } else OSLibWinPeekMsg(&msg,0,0,0,MSG_REMOVE);
+                if(!(getStyle() & DS_NOIDLEMSG))
+                    topOwner->SendMessageA(WM_ENTERIDLE,MSGF_DIALOGBOX,getWindowHandle());
+                OSLibWinGetMsg(&msg,0,0,0);
+          }
+          else  OSLibWinPeekMsg(&msg,0,0,0,MSG_REMOVE);
 
           if(msg.message == WM_QUIT)
           {
-            dprintf(("Win32Dialog::doDialogBox: received  WM_QUIT"));
-            break;
+                dprintf(("Win32Dialog::doDialogBox: received  WM_QUIT"));
+                break;
           }
           if (!IsDialogMessageA( getWindowHandle(), &msg))
           {
-            TranslateMessage( &msg );
-            DispatchMessageA( &msg );
+                TranslateMessage( &msg );
+                DispatchMessageA( &msg );
           }
-          if (dialogFlags & DF_END) break;
+          if (dialogFlags & DF_END)
+                break;
         }
 #else
@@ -332 +334 @@
             else {
                 if(!(getStyle() & DS_NOIDLEMSG)) {
-                    topOwner->SendMessageA(WM_ENTERIDLE, MSGF_DIALOGBOX, getWindowHandle());
+                    topOwner->SendInternalMessageA(WM_ENTERIDLE, MSGF_DIALOGBOX, getWindowHandle());
                 }
             }
@@ -1030 +1032 @@
     {
     case DWL_DLGPROC:
-            oldval = (LONG)WINPROC_GetProc(Win32DlgProc, (fUnicode) ? WIN_PROC_32W : WIN_PROC_32A);
+        oldval = (LONG)WINPROC_GetProc(Win32DlgProc, (fUnicode) ? WIN_PROC_32W : WIN_PROC_32A);
         WINPROC_SetProc((HWINDOWPROC *)&Win32DlgProc, (WNDPROC)value, (fUnicode) ? WIN_PROC_32W : WIN_PROC_32A, WIN_PROC_WINDOW);
         return oldval;
@@ -1053 +1055 @@
     {
     case DWL_DLGPROC:
-            return (ULONG)WINPROC_GetProc(Win32DlgProc, (fUnicode) ? WIN_PROC_32W : WIN_PROC_32A);
+        return (ULONG)WINPROC_GetProc(Win32DlgProc, (fUnicode) ? WIN_PROC_32W : WIN_PROC_32A);
     case DWL_MSGRESULT:
         return msgResult;