diff -r e5618cc85d74 -r 6c158198356e javauis/eswt_akn/org.eclipse.ercp.swt.s60/native/inc/swtcaptionedcontrol.h
--- a/javauis/eswt_akn/org.eclipse.ercp.swt.s60/native/inc/swtcaptionedcontrol.h	Thu Jul 15 18:31:06 2010 +0300
+++ b/javauis/eswt_akn/org.eclipse.ercp.swt.s60/native/inc/swtcaptionedcontrol.h	Thu Aug 19 09:48:13 2010 +0300
@@ -114,11 +114,6 @@
     void DoSetSize(const TSize& aSize);
 
     /**
-     * Default foreground setter.
-     */
-    void SetDefaultForegroundL();
-
-    /**
      * Get the children of the current contained control.
      * @param aAllChildren returned array of children.
      * @param aParent parent for which the children will be returned.
@@ -148,6 +143,8 @@
      */
     void SwtHandleResourceChangeL(TInt aType);
 
+    void UpdateTextColor();
+
 // From CCoeControl
 public:
     TInt CountComponentControls() const;
@@ -186,6 +183,7 @@
     MSwtCaptionedControl* CaptionedControlInterface() const;
     void UpdateDoNotDrawFlag();
     void SetForegroundL(const MSwtColor* aColor);
+    void HandleHighlightChange();
 
 // From ASwtControlBase
 protected:
@@ -261,9 +259,9 @@
 
     /**
      * Current custom foreground.
-     * Not Own.
+     * Not own.
      */
-    const MSwtColor* iForegroundColor;
+    const MSwtColor* iCustomFg;
 
     /**
      * Can be the child or null.