From 5fa28a0ed09ecb7afa527f73cd1874f2215715f8 Mon Sep 17 00:00:00 2001 From: "mkaply%us.ibm.com" Date: Tue, 7 Nov 2000 22:17:55 +0000 Subject: [PATCH] #59396 r=jkobal, a=blizzard Using wrong value for nsLookAndFeel, and wrong font checks --- gfx/src/os2/nsFontMetricsOS2.cpp | 4 ++-- widget/src/os2/nsLookAndFeel.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gfx/src/os2/nsFontMetricsOS2.cpp b/gfx/src/os2/nsFontMetricsOS2.cpp index 500afe33766f..d16a0e0e31ce 100644 --- a/gfx/src/os2/nsFontMetricsOS2.cpp +++ b/gfx/src/os2/nsFontMetricsOS2.cpp @@ -730,10 +730,10 @@ HDC ps = NULL; HDC hdc = GpiQueryDevice( hps); long res[ 2]; DevQueryCaps( hdc, CAPS_HORIZONTAL_FONT_RES, 2, res); - pMetrics = getMetrics( lFonts, szFamily, hps); + pMetrics = getMetrics( lFonts, fh->fattrs.szFacename, hps); for( i = 0; i < lFonts; i++) - if( !stricmp( szFamily, pMetrics[ i].szFamilyname) && + if( !stricmp( fh->fattrs.szFacename, pMetrics[ i].szFacename) && pMetrics[ i].sNominalPointSize / 10 == points && pMetrics[ i].sXDeviceRes == res[0] && pMetrics[ i].sYDeviceRes == res[1]) break; diff --git a/widget/src/os2/nsLookAndFeel.cpp b/widget/src/os2/nsLookAndFeel.cpp index ce5603e6140f..cd0b73bcb667 100644 --- a/widget/src/os2/nsLookAndFeel.cpp +++ b/widget/src/os2/nsLookAndFeel.cpp @@ -140,7 +140,7 @@ NS_IMETHODIMP nsLookAndFeel::GetColor(const nsColorID aID, nscolor &aColor) idx = SYSCLR_INACTIVETITLE; break; case eColor_inactivecaptiontext: - idx = SYSCLR_INACTIVETITLE; + idx = SYSCLR_INACTIVETITLETEXT; break; case eColor_infobackground: aColor = NS_RGB( 255, 255, 228);