--- a/photosgallery/controllers/fetcher/src/glxfetcherdialog.cpp	Fri Feb 19 22:51:01 2010 +0200
+++ b/photosgallery/controllers/fetcher/src/glxfetcherdialog.cpp	Fri Mar 12 15:42:44 2010 +0200
@@ -342,6 +342,21 @@
     {
     TRACER("CGlxFetcherDialog::PostLayoutDynInitL");
     
+    if (!iUiUtility->IsPenSupported())
+        {
+        CEikButtonGroupContainer& cbaContainer = ButtonGroupContainer();
+        if (iMultiSelectionEnabled)
+            {
+            cbaContainer.SetCommandSetL(R_AVKON_SOFTKEYS_OK_CANCEL__MARK);
+            }
+        else
+            {
+            cbaContainer.SetCommandSetL(
+                    R_AVKON_SOFTKEYS_SELECT_CANCEL__SELECT);
+            }
+        cbaContainer.DrawNow();
+        }
+
     // Create and Display Grid widget 
     iFetcherContainer->CreateAndDisplayGridL();
     }
@@ -401,6 +416,29 @@
     }
     
 //-----------------------------------------------------------------------------
+// CGlxFetcherDialog::HandleMarkEventL
+// Callback from the container to process the mark/unmark events.
+//-----------------------------------------------------------------------------
+void CGlxFetcherDialog::HandleMarkEventL()
+    {
+    TRACER("CGlxFetcherDialog::HandleMarkEventL");
+    if ( iUiUtility->IsPenSupported() )
+        {
+        MGlxMediaList& mediaList = iFetcherContainer->MediaList();
+        CEikButtonGroupContainer& cbaContainer = ButtonGroupContainer();
+        if (mediaList.SelectionCount())
+            {
+            cbaContainer.SetCommandSetL(R_AVKON_SOFTKEYS_OK_CANCEL__MARK);
+            }
+        else
+            {
+            cbaContainer.SetCommandSetL(R_AVKON_SOFTKEYS_CANCEL);
+            }
+        cbaContainer.DrawNow();
+        }
+    }
+    
+//-----------------------------------------------------------------------------
 // CGlxFetcherDialog::CallCancelFetcherL
 // This function will be called from CGlxFetcher::CancelFetcherL
 // This will ensure exit of fetcher dialog & fetcher app