--- a/uifw/EikStd/coctlsrc/aknstyluspopupmenucontent.cpp Fri Feb 19 23:04:46 2010 +0200
+++ b/uifw/EikStd/coctlsrc/aknstyluspopupmenucontent.cpp Fri Mar 12 15:43:43 2010 +0200
@@ -791,8 +791,7 @@
{
// Implementation when graphics are ready.
}
- else if ( aType == KEikMessageFadeAllWindows
- || aType == KEikDynamicLayoutVariantSwitch )
+ else if ( aType == KEikMessageFadeAllWindows )
{
if ( Observer() )
{
@@ -801,6 +800,15 @@
MCoeControlObserver::EEventRequestExit ) );
}
}
+ else if ( aType == KEikDynamicLayoutVariantSwitch )
+ {
+ if ( Observer() )
+ {
+ // this will close the stylus popup menu
+ TRAP_IGNORE( Observer()->HandleControlEventL( this,
+ MCoeControlObserver::EEventRequestCancel ) );
+ }
+ }
}
// -----------------------------------------------------------------------------
@@ -1515,10 +1523,10 @@
}
// ---------------------------------------------------------------------------
-// CAknStylusPopUpMenuContent::SelectItem
+// CAknStylusPopUpMenuContent::SelectItemL
// ---------------------------------------------------------------------------
//
-void CAknStylusPopUpMenuContent::SelectItem( TInt aItem )
+void CAknStylusPopUpMenuContent::SelectItemL( TInt aItem )
{
iCurrentItem = aItem;
if ( Observer() )
@@ -1528,8 +1536,8 @@
iExtension->iInformObserver = EFalse;
iExtension->iObserverInformed = ETrue;
}
- TRAP_IGNORE(Observer()->HandleControlEventL( this,
- MCoeControlObserver::EEventStateChanged ));
+ Observer()->HandleControlEventL( this,
+ MCoeControlObserver::EEventStateChanged );
}
}