Changeset 6327 for trunk/src

Timestamp:

Jul 14, 2001, 10:36:19 AM (24 years ago)

Author:

sandervl

Message:

query menu font from os2.ini

Location:

trunk/src/user32

Files:

• oslibprf.cpp (modified) (2 diffs)
• oslibprf.h (modified) (2 diffs)
• user32.cpp (modified) (2 diffs)

trunk/src/user32/oslibprf.cpp

@@ -1 @@
-/* $Id: oslibprf.cpp,v 1.1 2001-06-23 07:20:55 achimha Exp $ */
+/* $Id: oslibprf.cpp,v 1.2 2001-07-14 08:36:17 sandervl Exp $ */
 /*
  * Profile API wrappers for OS/2
@@ -23 +23 @@
     return PrfQueryProfileInt(hini, pszApp, pszKey, sDefault);
 }
+
+LONG OSLibPrfQueryProfileString(OSLIB_HINI hini, char *pszApp, char *pszKey, char *pszDefault, char *buffer, ULONG buflen)
+{
+    return PrfQueryProfileString(hini, pszApp, pszKey, pszDefault, buffer, buflen);
+}

trunk/src/user32/oslibprf.h

@@ -1 @@
-/* $Id: oslibprf.h,v 1.1 2001-06-23 07:20:55 achimha Exp $ */
+/* $Id: oslibprf.h,v 1.2 2001-07-14 08:36:18 sandervl Exp $ */
 /*
  * Profile API wrappers for OS/2
@@ -22 +22 @@
 
 LONG OSLibPrfQueryProfileInt(OSLIB_HINI hini, char *pszApp, char *pszKey, LONG sDefault);
+LONG OSLibPrfQueryProfileString(OSLIB_HINI hini, char *pszApp, char *pszKey, char *pszDefault, char *buffer, ULONG buflen);
 
 #endif

trunk/src/user32/user32.cpp

@@ -1 @@
-/* $Id: user32.cpp,v 1.106 2001-07-05 18:10:56 sandervl Exp $ */
+/* $Id: user32.cpp,v 1.107 2001-07-14 08:36:19 sandervl Exp $ */
 
 /*
@@ -730 +730 @@
             LPLOGFONTA lpLogFont = &(lpnm->lfMenuFont);
             if(fOS2Look) {
-                GetProfileStringA("Desktop", "MenuFont", "WarpSans",
-                                  lpLogFont->lfFaceName, LF_FACESIZE);
-                lpLogFont->lfWeight = FW_BOLD;
-                lpLogFont->lfHeight = -GetProfileIntA("Desktop","MenuFontSize", 16);
+                char fontname[128];
+                char *pszFontName;
+                BOOL fFound = TRUE;
+
+                if(OSLibPrfQueryProfileString(OSLIB_HINI_USER, "PM_SystemFonts", "Menus", "", fontname, sizeof(fontname)) == 1) {
+                    if(OSLibPrfQueryProfileString(OSLIB_HINI_USER, "PM_SystemFonts", "DefaultFont", "", fontname, sizeof(fontname)) == 1) {
+                        fFound = FALSE;
+                    }
+                }
+                if(fFound) {
+                    pszFontName = fontname;
+                    while(*pszFontName != '.' && *pszFontName != 0) pszFontName++;
+                    if(*pszFontName) {
+                        *pszFontName++ = 0;
+
+                        strncpy(lpLogFont->lfFaceName, pszFontName, sizeof(lpLogFont->lfFaceName));
+                        lpLogFont->lfFaceName[sizeof(lpLogFont->lfFaceName)-1] = 0;
+                        lpLogFont->lfWeight = FW_NORMAL;
+                        lpLogFont->lfHeight = 16; //atoi(fontname);
+                    }
+                    else fFound = FALSE;
+                }
+                if(!fFound) {
+                    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;