Changeset 1507 for trunk/src

Timestamp:

Oct 29, 1999, 1:51:05 AM (26 years ago)

Author:

sandervl

Message:

Focus + dialog fixes

Location:

trunk/src/user32

Files:

• win32dlg.cpp (modified) (3 diffs)
• win32wbase.cpp (modified) (6 diffs)

trunk/src/user32/win32dlg.cpp

@@ -1 @@
-/* $Id: win32dlg.cpp,v 1.20 1999-10-24 22:56:09 sandervl Exp $ */
+/* $Id: win32dlg.cpp,v 1.21 1999-10-28 23:51:05 sandervl Exp $ */
 /*
  * Win32 Dialog Code for OS/2
@@ -72 +72 @@
         /* The font height must be negative as it is a point size */
         /* (see CreateFont() documentation in the Windows SDK).   */
-        hUserFont = CreateFontW(dlgInfo.pointSize*2, 0, 0, 0,
+        hUserFont = CreateFontW(-(dlgInfo.pointSize*3)/2, 0, 0, 0,
                             dlgInfo.weight, dlgInfo.italic, FALSE,
                             FALSE, DEFAULT_CHARSET, 0, 0, PROOF_QUALITY,
@@ -80 +80 @@
             SIZE charSize;
             getCharSize(hUserFont,&charSize);
-            xBaseUnit = charSize.cx;
-            yBaseUnit = charSize.cy;
+            xUnit = charSize.cx;
+            yUnit = charSize.cy;
         }
     }

trunk/src/user32/win32wbase.cpp

@@ -1 @@
-/* $Id: win32wbase.cpp,v 1.65 1999-10-28 19:09:17 sandervl Exp $ */
+/* $Id: win32wbase.cpp,v 1.66 1999-10-28 23:51:05 sandervl Exp $ */
 /*
  * Win32 Window Base Class for OS/2
@@ -1039 +1039 @@
  ULONG win32msg;
  ULONG win32ncmsg;
+ BOOL  fClick = FALSE;
 
     dprintf(("MsgButton to (%d,%d)", ncx, ncy));
@@ -1045 +1046 @@
                 win32msg = WM_LBUTTONDOWN;
                 win32ncmsg = WM_NCLBUTTONDOWN;
+                fClick = TRUE;
                 break;
         case BUTTON_LEFTUP:
@@ -1068 +1070 @@
                 win32msg = WM_RBUTTONDOWN;
                 win32ncmsg = WM_NCRBUTTONDOWN;
+                fClick = TRUE;
                 break;
         case BUTTON_RIGHTDBLCLICK:
@@ -1087 +1090 @@
                 win32msg = WM_MBUTTONDOWN;
                 win32ncmsg = WM_NCMBUTTONDOWN;
+                fClick = TRUE;
                 break;
         case BUTTON_MIDDLEDBLCLICK:
@@ -1102 +1106 @@
                 dprintf(("Win32BaseWindow::Button: invalid msg!!!!"));
                 return 1;
+    }
+
+    if(fClick) {
+        /* Activate the window if needed */
+        HWND hwndTop = (getTopParent()) ? getTopParent()->getWindowHandle() : 0;
+
+        if (getWindowHandle() != GetActiveWindow())
+        {
+                LONG ret = SendMessageA(WM_MOUSEACTIVATE, hwndTop,
+                                        MAKELONG( HTCLIENT, win32msg ) );
+
+#if 0
+                if ((ret == MA_ACTIVATEANDEAT) || (ret == MA_NOACTIVATEANDEAT))
+                         eatMsg = TRUE;
+#endif
+                if(((ret == MA_ACTIVATE) || (ret == MA_ACTIVATEANDEAT))
+                   && hwndTop != GetForegroundWindow() )
+                {
+                      SetActiveWindow();
+                }
+        }
     }