# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1268572185 0
# Node ID b7b15c777cb3d83f3fb69c13ff035c03f64a8bd7
# Parent  3f8d60e82782560dec5084b6f5f4daadf5fcd90b# Parent  57ec1f1a7fd2f822317a802130242a57fa01e591
Automatic merge from PDK_3.0.h

diff -r 3f8d60e82782 -r b7b15c777cb3 extras/calcsoft/src/CalcOutSheet.cpp
--- a/extras/calcsoft/src/CalcOutSheet.cpp	Mon Mar 08 21:43:29 2010 +0000
+++ b/extras/calcsoft/src/CalcOutSheet.cpp	Sun Mar 14 13:09:45 2010 +0000
@@ -780,20 +780,20 @@
   
     if ( aType == KEikDynamicLayoutVariantSwitch )
         {
-        if ( AknLayoutUtils::PenEnabled() )
-            {
-            ScrollToBottomL();
-            }
-        }
-	if(aType == KAknsMessageSkinChange)
-	{
-		if( AknLayoutUtils::PenEnabled()  )
-        {
-        	delete(iSBFrame);
-    		iSBFrame = NULL;
-	
-		    UpdateScrollIndicatorL();
-        }
-	}
+        if (AknLayoutUtils::PenEnabled())
+			{
+			ScrollToBottomL();
+			}
+		}
+	if ( aType == KAknsMessageSkinChange || aType == KEikMessageUnfadeWindows )
+		{
+		if (AknLayoutUtils::PenEnabled())
+			{
+			delete (iSBFrame);
+			iSBFrame = NULL;
+
+			UpdateScrollIndicatorL();
+			}
+		}
 }
 //  End of File  
diff -r 3f8d60e82782 -r b7b15c777cb3 extras/converter/Ui/Src/CCnvMainForm.cpp
--- a/extras/converter/Ui/Src/CCnvMainForm.cpp	Mon Mar 08 21:43:29 2010 +0000
+++ b/extras/converter/Ui/Src/CCnvMainForm.cpp	Sun Mar 14 13:09:45 2010 +0000
@@ -269,6 +269,15 @@
 				break;
 				}
 			}
+		if ( iTypePopupCtrl->SelectionMode() ==  CAknPopupField::EAknPopupFieldSelectionListMode ||
+				iUnit1PopupCtrl->SelectionMode() == CAknPopupField::EAknPopupFieldSelectionListMode ||
+				iUnit2PopupCtrl->SelectionMode() == CAknPopupField::EAknPopupFieldSelectionListMode)
+			{
+			aMenuPane->SetItemDimmed( ECmdSetCurrency, ETrue );
+			aMenuPane->SetItemDimmed( ECmdSetType, ETrue );
+			aMenuPane->SetItemDimmed( ECmdSetUnit, ETrue );
+			aMenuPane->SetItemDimmed( ECmdRates, ETrue );
+			}
 		}
 	}