diff -r d5e927d5853b -r 7cee158cb8cd javauis/lcdui_akn/lcdui/inc/CMIDChoiceGroupModel.h --- a/javauis/lcdui_akn/lcdui/inc/CMIDChoiceGroupModel.h Tue Sep 14 21:06:50 2010 +0300 +++ b/javauis/lcdui_akn/lcdui/inc/CMIDChoiceGroupModel.h Wed Sep 15 12:05:25 2010 +0300 @@ -53,6 +53,9 @@ virtual void HandleChoiceGroupModelEventL( CMIDChoiceGroupModel* aModel, TChoiceGroupModelEvent aEvent) = 0; +#ifdef RD_JAVA_S60_RELEASE_9_2 + virtual TBool IsControlOnFormHighlighted() = 0; +#endif // RD_JAVA_S60_RELEASE_9_2 }; @@ -159,7 +162,11 @@ // NOTE that the indices in the array and the item strings should // be synchronised. The selection icon is always at index // 0 (selected) and 1 (not selected) +#ifdef RD_JAVA_S60_RELEASE_9_2 + void UpdateIconArrayL(TBool aHighlighted); +#else void UpdateIconArrayL(); +#endif // RD_JAVA_S60_RELEASE_9_2 // Returns true if there is at least one item that has icon TBool HasIcons() const; @@ -183,6 +190,13 @@ CGulIcon* iIconSelected; CGulIcon* iIconNotSelected; +#ifdef RD_JAVA_S60_RELEASE_9_2 + // The same icons as above, but used when whole ChoiceGroup + // gets highlighted on Form + CGulIcon* iIconSelectedHighlighted; + CGulIcon* iIconNotSelectedHighlighted; +#endif // RD_JAVA_S60_RELEASE_9_2 + // Dummy icon for elements that have no icon CGulIcon* iIconDummy;