diff -r 4376525cdefb -r e5618cc85d74 javauis/eswt_akn/org.eclipse.ercp.swt.s60/native/src/swtbutton.cpp --- a/javauis/eswt_akn/org.eclipse.ercp.swt.s60/native/src/swtbutton.cpp Mon Jun 21 15:32:50 2010 +0300 +++ b/javauis/eswt_akn/org.eclipse.ercp.swt.s60/native/src/swtbutton.cpp Thu Jul 15 18:31:06 2010 +0300 @@ -213,18 +213,12 @@ iButton->SetBackground(this); // Back will be drawn by ASwtControlBase::Draw // Set default color - TRgb colorNormal; + TRgb color; AknsUtils::GetCachedColor(AknsUtils::SkinInstance(), - colorNormal, + color, KAknsIIDQsnTextColors, - EAknsCIQsnTextColorsCG13); // SK - TRgb colorPressed; - AknsUtils::GetCachedColor(AknsUtils::SkinInstance(), - colorPressed, - KAknsIIDQsnTextColors, - EAknsCIQsnTextColorsCG69); // pressed SK - iButton->OverrideColorL(EColorButtonText, colorNormal); - iButton->OverrideColorL(EColorButtonTextPressed, colorPressed); + EAknsCIQsnTextColorsCG6); + iButton->OverrideColorL(EColorButtonText, color); } // --------------------------------------------------------------------------- @@ -646,13 +640,10 @@ } else { - // Reset to default color - TRgb colorNormal; AknsUtils::GetCachedColor(AknsUtils::SkinInstance(), - colorNormal, + color, KAknsIIDQsnTextColors, - EAknsCIQsnTextColorsCG13); // SK - iButton->OverrideColorL(EColorButtonText, colorNormal); + EAknsCIQsnTextColorsCG6); } if (iButton)