--- a/calendarui/regionalplugins/calenregionalutil/inc/calenextrarowformatter.h Tue Aug 31 15:13:43 2010 +0300
+++ b/calendarui/regionalplugins/calenregionalutil/inc/calenextrarowformatter.h Wed Sep 01 12:32:31 2010 +0100
@@ -21,7 +21,7 @@
#include <e32base.h>
-#include "CalenLunarLocalizedInfo.h"
+#include "calenlunarlocalizedinfo.h"
#include "CalendarVariant.hrh"
#include "calendarui_debug.h"
@@ -34,10 +34,22 @@
IMPORT_C virtual ~CCalenExtraRowFormatter();
- IMPORT_C TPtrC FormatExtraRowInformationL(
- CCalenLunarLocalizedInfo& aLocInfo,
- RArray<CCalenLunarLocalizedInfo::TField>& aPrioritizedFields
- );
+ IMPORT_C TPtrC FormatExtraRowInformationL( CCalenLunarLocalizedInfo& aLocInfo,
+ RArray<CCalenLunarLocalizedInfo::TField>& aPrioritizedFields,
+ TInt aMaxWidth,
+ const CFont& aFont
+
+ , TBool aTwoLines
+
+ );
+
+private:
+ TBool TryToFitL( const TDesC& aStr, TInt aMaxWidth, const CFont& aFont
+
+ , TBool aTwoLines
+
+ );
+
private: // own methods
CCalenExtraRowFormatter();