Changeset 839 for trunk/src

Timestamp:

Sep 5, 1999, 7:11:25 PM (26 years ago)

Author:

sandervl

Message:

Dialog update

Location:

trunk/src/user32/new

Files:

• pmwindow.cpp (modified) (2 diffs)
• user32.cpp (modified) (3 diffs)
• win32dlg.cpp (modified) (4 diffs)

trunk/src/user32/new/pmwindow.cpp

@@ -1 @@
-/* $Id: pmwindow.cpp,v 1.28 1999-09-04 19:51:46 sandervl Exp $ */
+/* $Id: pmwindow.cpp,v 1.29 1999-09-05 17:11:24 sandervl Exp $ */
 /*
  * Win32 Window Managment Code for OS/2
@@ -526 +526 @@
 
         if(!(fl & KC_CHAR)) {
-            dprintf(("WM_CHAR: no valid character code"));
+//            dprintf(("WM_CHAR: no valid character code"));
             goto RunDefWndProc;
         }

trunk/src/user32/new/user32.cpp

@@ -1 @@
-/* $Id: user32.cpp,v 1.18 1999-09-04 19:42:28 sandervl Exp $ */
+/* $Id: user32.cpp,v 1.19 1999-09-05 17:11:24 sandervl Exp $ */
 
 /*
@@ -174 +174 @@
 BOOL WIN32API IsRectEmpty( const RECT * lprc)
 {
-#ifdef DEBUG
-    WriteLog("USER32:  IsRectEmpty\n");
-#endif
     if (!lprc)
     {
@@ -244 +241 @@
 BOOL WIN32API SetRectEmpty( PRECT lprc)
 {
-#ifdef DEBUG
-    WriteLog("USER32:  SetRectEmpty\n");
-#endif
     if (!lprc)
     {

trunk/src/user32/new/win32dlg.cpp

@@ -1 @@
-/* $Id: win32dlg.cpp,v 1.5 1999-09-05 15:53:09 sandervl Exp $ */
+/* $Id: win32dlg.cpp,v 1.6 1999-09-05 17:11:25 sandervl Exp $ */
 /*
  * Win32 Dialog Code for OS/2
@@ -190 +190 @@
 
     /* Create controls */
+    //testesteest
     if (createControls(dlgTemplate, hInst))
     {
         /* Send initialisation messages and set focus */
         hwndFocus = GetNextDlgTabItem( getWindowHandle(), 0, FALSE );
-
-        if (::SendMessageA(hwndFocus, WM_INITDIALOG, (WPARAM)hwndFocus, param ))
-            SetFocus( hwndFocus );
-
         if (dlgInfo.style & WS_VISIBLE && !(getStyle() & WS_VISIBLE))
         {
@@ -241 +238 @@
         ShowWindow( SW_SHOW );
 
-        while (OSLibWinPeekMsg(&msg, getOS2FrameWindowHandle(), topOwner->getOS2FrameWindowHandle(),
-                               0, 0, MSG_REMOVE))
+        while (TRUE) {
 //        while (OSLibWinPeekMsg(&msg, getWindowHandle(), owner, MSGF_DIALOGBOX,
 //                                       MSG_REMOVE, !(getStyle() & DS_NOIDLEMSG), NULL ))
-        {
-            if (!IsDialogMessageA( getWindowHandle(), &msg))
+//            if(OSLibWinPeekMsg(&msg, topOwner->getOS2FrameWindowHandle(), 0, 0, MSG_REMOVE))
+            if(OSLibWinPeekMsg(&msg, 0, 0, 0, MSG_REMOVE))
             {
-                TranslateMessage( &msg );
-                DispatchMessageA( &msg );
+                if(msg.message == WM_QUIT) {
+                    dprintf(("Win32Dialog::doDialogBox: received  WM_QUIT"));
+                    break;
+                }
+                if (!IsDialogMessageA( getWindowHandle(), &msg))
+                {
+                    TranslateMessage( &msg );
+                    DispatchMessageA( &msg );
+                }
+                if (dialogFlags & DF_END) break;
             }
-            if (dialogFlags & DF_END) break;
+            else {
+                if(!(getStyle() & DS_NOIDLEMSG)) {
+                    topOwner->SendMessageA(WM_ENTERIDLE, MSGF_DIALOGBOX, getWindowHandle());
+                }
+            }
         }
         topOwner->EnableWindow( TRUE );
@@ -923 +931 @@
 BOOL Win32Dialog::endDialog(int retval)
 {
+    dialogFlags |= DF_END;
+    idResult = retval;
     return TRUE;
 }