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

Timestamp:

Feb 5, 2002, 6:59:31 PM (24 years ago)

Author:

sandervl

Message:

message handling changes

File:

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

trunk/src/user32/win32dlg.cpp

@@ -1 @@
-/* $Id: win32dlg.cpp,v 1.75 2001-11-20 15:25:18 sandervl Exp $ */
+/* $Id: win32dlg.cpp,v 1.76 2002-02-05 17:59:00 sandervl Exp $ */
 /*
  * Win32 Dialog Code for OS/2
@@ -79 +79 @@
     }
 
+    dprintf(("Dialog style %x", LOWORD(dlgInfo.style)));
+
     /* Create custom font if needed */
     if (dlgInfo.style & DS_SETFONT)
@@ -248 +250 @@
 
     if (hUserFont)
-        SendInternalMessageA(WM_SETFONT, (WPARAM)hUserFont, 0 );
+        SendMessageA(getWindowHandle(), WM_SETFONT, (WPARAM)hUserFont, 0 );
 
     /* Create controls */
@@ -261 +263 @@
 
         HWND hwndPreInitFocus = GetFocus();
-        if(SendInternalMessageA(WM_INITDIALOG, (WPARAM)hwndFocus, param)) 
+        if(SendMessageA(getWindowHandle(), WM_INITDIALOG, (WPARAM)hwndFocus, param)) 
         {
             //SvL: Experiments in NT4 show that dialogs that are children don't
@@ -293 +295 @@
         {
             ShowWindow( SW_SHOWNORMAL );    /* SW_SHOW doesn't always work */
-            UpdateWindow( getWindowHandle() );
+////Note: this was removed in Wine
+////            UpdateWindow( getWindowHandle() );
         }
         SetLastError(ERROR_SUCCESS);
@@ -357 +360 @@
           {
                 if(!(getStyle() & DS_NOIDLEMSG))
-                    topOwner->SendMessageA(WM_ENTERIDLE,MSGF_DIALOGBOX,getWindowHandle());
+                    SendMessageA(topOwner->getWindowHandle(), WM_ENTERIDLE,MSGF_DIALOGBOX,getWindowHandle());
                 GetMessageA(&msg,0,0,0);
           }
@@ -757 +760 @@
         if ((rc == SIMPLEREGION) || (rc == COMPLEXREGION))
         {
-            HBRUSH hBrush = SendInternalMessageA(WM_CTLCOLORDLG, wParam, getWindowHandle());
+            HBRUSH hBrush = SendMessageA(getWindowHandle(), WM_CTLCOLORDLG, wParam, getWindowHandle());
             if(GetObjectType(hBrush) != OBJ_BRUSH) {
                 DefWndControlColor(CTLCOLOR_DLG, (HDC)wParam);
@@ -855 +858 @@
                 /* always make combo box hide its listbox control */
                 if( CONTROLS_IsControl( wndFocus, COMBOBOX_CONTROL ) )
-                    wndFocus->SendMessageA(CB_SHOWDROPDOWN, FALSE, 0 );
+                    SendMessageA(wndFocus->getWindowHandle(), CB_SHOWDROPDOWN, FALSE, 0 );
                 else
                 if( CONTROLS_IsControl( wndFocus, EDIT_CONTROL ) &&
                     CONTROLS_IsControl( wndFocus->getParent(), COMBOBOX_CONTROL ))
-                    wndFocus->SendMessageA(CB_SHOWDROPDOWN, FALSE, 0 );
+                    SendMessageA(wndFocus->getWindowHandle(), CB_SHOWDROPDOWN, FALSE, 0 );
                 RELEASE_WNDOBJ(wndFocus);
             }