Changeset 5993 for trunk/src/user32/user32.cpp

Timestamp:

Jun 13, 2001, 12:29:46 PM (24 years ago)

Author:

sandervl

Message:

OS/2 looks changes + fixes

File:

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

trunk/src/user32/user32.cpp

@@ -1 @@
-/* $Id: user32.cpp,v 1.100 2001-06-12 17:02:36 sandervl Exp $ */
+/* $Id: user32.cpp,v 1.101 2001-06-13 10:29:45 sandervl Exp $ */
 
 /*
@@ -633 +633 @@
         *(BOOL *)pvParam = FALSE; //CB: where is the Warp 4 setting stored?
         break;
+
     case SPI_GETNONCLIENTMETRICS:
     {
         LPNONCLIENTMETRICSA lpnm = (LPNONCLIENTMETRICSA)pvParam;
                 
-        if (lpnm->cbSize == sizeof(NONCLIENTMETRICSA))
+        if (lpnm->cbSize == sizeof(NONCLIENTMETRICSA))
         {
             memset(lpnm, 0, sizeof(NONCLIENTMETRICSA));
@@ -652 +653 @@
 
             LPLOGFONTA lpLogFont = &(lpnm->lfMenuFont);
-            GetProfileStringA("Desktop", "MenuFont", "MS Sans Serif",
-                              lpLogFont->lfFaceName, LF_FACESIZE);
-
-            lpLogFont->lfHeight = -GetProfileIntA("Desktop","MenuFontSize", 13);
-            lpLogFont->lfWidth = 0;
-            lpLogFont->lfEscapement = lpLogFont->lfOrientation = 0;
-            lpLogFont->lfWeight = FW_NORMAL;
+            if(fOS2Look) {
+                GetProfileStringA("Desktop", "MenuFont", "WarpSans",
+                                  lpLogFont->lfFaceName, LF_FACESIZE);
+                lpLogFont->lfWeight = FW_BOLD;
+                lpLogFont->lfHeight = -GetProfileIntA("Desktop","MenuFontSize", 16);
+                lpLogFont->lfWidth = 0;
+                lpLogFont->lfEscapement = lpLogFont->lfOrientation = 0;
+            }
+            else {
+                GetProfileStringA("Desktop", "MenuFont", "MS Sans Serif",
+                                  lpLogFont->lfFaceName, LF_FACESIZE);
+                lpLogFont->lfWeight = FW_NORMAL;
+                lpLogFont->lfHeight = -GetProfileIntA("Desktop","MenuFontSize", 13);
+                lpLogFont->lfWidth = 0;
+                lpLogFont->lfEscapement = lpLogFont->lfOrientation = 0;
+            }
             lpLogFont->lfItalic = FALSE;
             lpLogFont->lfStrikeOut = FALSE;
@@ -677 +687 @@
             lpnm->iMenuHeight      = GetSystemMetrics(SM_CYMENU);
             lpnm->iMenuWidth       = lpnm->iMenuHeight; //TODO
-        }
+          }
         else
-        {
+        {
             dprintf(("SPI_GETNONCLIENTMETRICS: size mismatch !! (is %d; should be %d)\n", lpnm->cbSize, sizeof(NONCLIENTMETRICSA)));
             /* FIXME: SetLastError? */