OS/2 bustage - nsFontMetricsOS2.cpp

gfx/src/os2/nsFontMetricsOS2.cpp

@@ -599,13 +599,13 @@ nsFontMetricsOS2::SetFontHandle( HPS aPS, nsFontOS2* aFont )
    // Encoding:
    //  There doesn't seem to be any encoding stuff yet, so guess.
    //  (XXX unicode hack; use same codepage as converter!)
-  nsCAutoString name;
-  mLangGroup->ToString(name);
+  const char* langGroup;
+  mLangGroup->GetUTF8String(&langGroup);
   for (int j=0; j < eCharset_COUNT; j++ )
   {
-    if (name.get()[0] == gCharsetInfo[j].mLangGroup[0])
+    if (langGroup[0] == gCharsetInfo[j].mLangGroup[0])
     {
-      if (!strcmp(name.get(), gCharsetInfo[j].mLangGroup))
+      if (strcmp(langGroup, gCharsetInfo[j].mLangGroup) == 0)
       {
         mConvertCodePage = gCharsetInfo[j].mCodePage;
         break;

gfx/src/os2/nsRenderingContextOS2.cpp

@@ -126,7 +126,7 @@ nsRenderingContextOS2::nsRenderingContextOS2()
   mSurface = nsnull;
   mPS = 0;
   mMainSurface = nsnull;
-  mColor = NS_RGB( 0, 0, 0);
+  mColor = 0xffffffff;
   mFontMetrics = nsnull;
   mLineStyle = nsLineStyle_kSolid;
   mPreservedInitialClipRegion = PR_FALSE;
@@ -134,10 +134,10 @@ nsRenderingContextOS2::nsRenderingContextOS2()
 
   // Need to enforce setting color values for first time. Make cached values different from current ones.
   mCurrFontMetrics = mFontMetrics + 1;
-  mCurrTextColor   = mColor + 1;
-  mCurrLineColor   = mColor + 1;
+  mCurrTextColor   = 0xffffffff;
+  mCurrLineColor   = 0xffffffff;
   mCurrLineStyle   = (nsLineStyle)((int)mLineStyle + 1);
-  mCurrFillColor   = mColor + 1;
+  mCurrFillColor   = 0xffffffff;
 
   mStateCache = new nsVoidArray();
   mRightToLeftText = PR_FALSE;
@@ -293,10 +293,10 @@ nsresult nsRenderingContextOS2::SetupPS (void)
 
    // Need to enforce setting color values for first time. Make cached values different from current ones.
    mCurrFontMetrics = mFontMetrics + 1;
-   mCurrTextColor   = mColor + 1;
-   mCurrLineColor   = mColor + 1;
+   mCurrTextColor   = 0xffffffff;
+   mCurrLineColor   = 0xffffffff;
    mCurrLineStyle   = (nsLineStyle)((int)mLineStyle + 1);
-   mCurrFillColor   = mColor + 1;
+   mCurrFillColor   = 0xffffffff;
 
    return NS_OK;
 }
@@ -885,7 +885,7 @@ LONG nsRenderingContextOS2::GetGPIColor (void)
 
 void nsRenderingContextOS2::SetupLineColorAndStyle (void)
 {
-   if (mColor != mCurrLineColor)
+   if ((mColor != mCurrLineColor) || (mCurrLineColor == 0xffffffff))
    {
       LINEBUNDLE lineBundle;
       lineBundle.lColor = GetGPIColor ();
@@ -915,7 +915,7 @@ void nsRenderingContextOS2::SetupLineColorAndStyle (void)
 
 void nsRenderingContextOS2::SetupFillColor (void)
 {
-   if (mColor != mCurrFillColor)
+   if ((mColor != mCurrFillColor) || (mCurrFillColor == 0xffffffff))
    {
       AREABUNDLE areaBundle;
       areaBundle.lColor = GetGPIColor ();
@@ -2549,7 +2549,7 @@ void nsRenderingContextOS2::SetupFontAndColor (void)
       }
    }
 
-   if (mColor != mCurrTextColor)
+   if ((mColor != mCurrTextColor) || (mCurrTextColor == 0xffffffff))
    {
       CHARBUNDLE cBundle;
       cBundle.lColor = GetGPIColor ();
@@ -2563,6 +2563,7 @@ void nsRenderingContextOS2::SetupFontAndColor (void)
 
       mCurrTextColor = mColor;
    }
+
 }
 
 void nsRenderingContextOS2::PushClipState(void)