--- a/uifw/EikStd/coctlsrc/EIKMENUB.CPP Tue Feb 02 01:00:49 2010 +0200
+++ b/uifw/EikStd/coctlsrc/EIKMENUB.CPP Fri Feb 19 23:04:46 2010 +0200
@@ -58,7 +58,7 @@
#include <touchfeedback.h>
#include <aknitemactionmenu.h>
#include "aknitemactionmenuregister.h"
-#include <aknPriv.hrh>
+#include <AknPriv.hrh>
#include "akntrace.h"
enum { EEikMenuBarTitleArrayGranularity=10 };
@@ -425,7 +425,6 @@
inline void CEikMenuBar::SetMenuHasItems()
{
iMenuFlags|=EMenuHasItems;
- iExt->StoreCollectionHighlightValue();
}
inline TBool CEikMenuBar::MenuHasPane() const
@@ -649,7 +648,7 @@
SPosition menuPos;
menuPos.iMenuId = iMenuTitleResourceId;
menuPos.iMenuCursorPos = iCursor;
- iPastMenuPosArray->AppendL(&menuPos, sizeof(menuPos));
+ iPastMenuPosArray->AppendL(menuPos);
}
void CEikMenuBar::SetCursorPositionFromArray()
@@ -959,6 +958,8 @@
return;
}
+ iExt->StoreCollectionHighlightValue();
+
if (!(iMenuFlags&EBackgroundFaded))
{
iExt->FadeBehindPopup(ETrue);