--- a/uiacceltk/hitchcock/coretoolkit/src/HuiCanvasTextureCache.cpp Mon Mar 15 12:43:37 2010 +0200
+++ b/uiacceltk/hitchcock/coretoolkit/src/HuiCanvasTextureCache.cpp Wed Mar 31 23:03:58 2010 +0300
@@ -1932,7 +1932,18 @@
{
// For PC-lint
}
-
+ if (aFirst.iTextBoxMaxSize.iHeight < aSecond.iTextBoxMaxSize.iHeight)
+ {
+ return -1; // less than
+ }
+ else if (aFirst.iTextBoxMaxSize.iHeight > aSecond.iTextBoxMaxSize.iHeight)
+ {
+ return 1; // more than
+ }
+ else
+ {
+ // For PC-lint
+ }
// Text content
TInt textcompare = KErrNotFound;
if ( aFirst.iFindTextPtr )
@@ -2089,7 +2100,7 @@
CHuiCanvasTextureCache::CHuiCanvasTextureCache()
{
SetMemoryLevel(EHuiMemoryLevelNormal);
- CHuiStatic::Env().AddLowMemoryObserver(this);
+ CHuiStatic::Env().AddMemoryLevelObserver(this);
}
// ---------------------------------------------------------------------------
@@ -2098,7 +2109,7 @@
//
CHuiCanvasTextureCache::~CHuiCanvasTextureCache()
{
- CHuiStatic::Env().RemoveLowMemoryObserver(this);
+ CHuiStatic::Env().RemoveMemoryLevelObserver(this);
iCachedTexts.ResetAndDestroy();
iCachedImages.ResetAndDestroy();
iRecycledTextures.ResetAndDestroy();