Changeset 254 for trunk/src

Timestamp:

Jun 30, 1999, 6:08:40 PM (26 years ago)

Author:

sandervl

Message:

SystemParameterInfoA change for default font

File:

• trunk/src/user32/user32.cpp (modified) (10 diffs)

trunk/src/user32/user32.cpp

@@ -1 @@
-/* $Id: user32.cpp,v 1.16 1999-06-26 15:07:00 sandervl Exp $ */
+/* $Id: user32.cpp,v 1.17 1999-06-30 16:08:40 sandervl Exp $ */
 
 /*
@@ -563 +563 @@
   //SvL: Correct window style (like Wine does)
   if(dwStyle & WS_CHILD) {
-        dwStyle |= WS_CLIPSIBLINGS;
-        if(!(dwStyle & WS_POPUP)) {
-                dwStyle |= WS_CAPTION;
-        }
+        dwStyle |= WS_CLIPSIBLINGS;
+        if(!(dwStyle & WS_POPUP)) {
+                dwStyle |= WS_CAPTION;
+        }
   }
   if(dwExStyle & WS_EX_DLGMODALFRAME)
   {
-        dwStyle &= ~WS_THICKFRAME;
+        dwStyle &= ~WS_THICKFRAME;
   }
 
@@ -576 +576 @@
     WriteLog("USER32:  CreateWindow: dwExStyle = %X\n", dwExStyle);
     if((int)arg2 >> 16 != 0)
-         WriteLog("USER32:  CreateWindow: classname = %s\n", arg2);
+         WriteLog("USER32:  CreateWindow: classname = %s\n", arg2);
     else WriteLog("USER32:  CreateWindow: classname = %X\n", arg2);
     WriteLog("USER32:  CreateWindow: windowname= %s\n", arg3);
@@ -626 +626 @@
     }
     if(window) {
-        window->SetWindowHandle(hwnd);
+        window->SetWindowHandle(hwnd);
     }
 
@@ -2435 +2435 @@
     return O32_IsDialogMessage(arg1, arg2);
 }
+
 //******************************************************************************
 //******************************************************************************
@@ -2940 +2941 @@
         memset(cmetric, 0, sizeof(NONCLIENTMETRICSA));
         cmetric->cbSize = sizeof(NONCLIENTMETRICSA);
+        //CB: font info not valid, needs improvements
         O32_SystemParametersInfo(SPI_GETICONTITLELOGFONT, 0, (LPVOID)&(cmetric->lfCaptionFont),0);
         O32_SystemParametersInfo(SPI_GETICONTITLELOGFONT, 0, (LPVOID)&(cmetric->lfMenuFont),0);
-        O32_SystemParametersInfo(SPI_GETICONTITLELOGFONT, 0, (LPVOID)&(cmetric->lfStatusFont),0);
+        //CB: experimental change for statusbar (and tooltips)
+
+        //O32_SystemParametersInfo(SPI_GETICONTITLELOGFONT, 0, (LPVOID)&(cmetric->lfStatusFont),0);
+        lstrcpyA(cmetric->lfStatusFont.lfFaceName,"WarpSans");
+        cmetric->lfStatusFont.lfHeight = 9;
+
         O32_SystemParametersInfo(SPI_GETICONTITLELOGFONT, 0, (LPVOID)&(cmetric->lfMessageFont),0);
         cmetric->iBorderWidth     = GetSystemMetrics(SM_CXBORDER);
@@ -4796 +4803 @@
  * Remark    :
  * Status    : UNTESTED STUB
+
  *
  * Author    : Patrick Haller [Thu, 1998/02/26 11:55]
@@ -5104 +5112 @@
  *             If the function fails, the return value is NULL. To get extended
  *               error information, call GetLastError.
+
 
  * Remark    :
@@ -6231 +6240 @@
 
 
+
 /***********************************************************************
  *           RegisterTasklist32                [USER32.436]
@@ -6462 +6472 @@
   return res;
 }
+