diff -r f72a12da539e -r 5315654608de menufw/menufwui/mmwidgets/inc/mmgridcontainer.h
--- a/menufw/menufwui/mmwidgets/inc/mmgridcontainer.h	Thu Dec 17 08:40:49 2009 +0200
+++ b/menufw/menufwui/mmwidgets/inc/mmgridcontainer.h	Thu Jan 07 12:39:41 2010 +0200
@@ -12,7 +12,7 @@
 * Contributors:
 *
 * Description:  CMmGridContainer declaration
-*  Version     : %version: MM_29.1.13 % << Don't touch! Updated by Synergy at check-out.
+*  Version     : %version: MM_29.1.14 % << Don't touch! Updated by Synergy at check-out.
 *
 */
 
@@ -37,7 +37,7 @@
 class CMmListBoxItemDrawer;
 
 /**
- *  Container for Multimedia Menu grid widget 
+ *  Container for Multimedia Menu grid widget
  *
  *  @code
  *  @endcode
@@ -50,29 +50,29 @@
 public:
     /**
      * Two-phased constructor.
-     * 
-     * @since S60 v5.0
-     * @param aRect Rectangle of widget control.
-     * @param aObjectProvider Object provider.
-     * @param aTemplateLibrary template library for Drawer   
-     */
-    static CMmGridContainer* NewL( const TRect& aRect, 
-        MObjectProvider* aObjectProvider, CMmTemplateLibrary* aTemplateLibrary );
-
-    /**
-     * Two-phased constructor.
-     * 
+     *
      * @since S60 v5.0
      * @param aRect Rectangle of widget control.
      * @param aObjectProvider Object provider.
      * @param aTemplateLibrary template library for Drawer
      */
-    static CMmGridContainer* NewLC( const TRect& aRect, 
+    static CMmGridContainer* NewL( const TRect& aRect,
         MObjectProvider* aObjectProvider, CMmTemplateLibrary* aTemplateLibrary );
-    
+
+    /**
+     * Two-phased constructor.
+     *
+     * @since S60 v5.0
+     * @param aRect Rectangle of widget control.
+     * @param aObjectProvider Object provider.
+     * @param aTemplateLibrary template library for Drawer
+     */
+    static CMmGridContainer* NewLC( const TRect& aRect,
+        MObjectProvider* aObjectProvider, CMmTemplateLibrary* aTemplateLibrary );
+
     /**
      * Destructor.
-     * 
+     *
      * @since S60 v5.0
      */
     virtual ~CMmGridContainer();
@@ -84,23 +84,23 @@
      * @return Pointer to grid.
      */
     CAknGrid* Grid();
-    
+
 public: // from base class CMmWidgetContainer
- 
+
     /**
      * Handle item addition.
-     * 
+     *
      * @since S60 v3.0
      */
     void HandleItemAdditionL();
-	
+
     /**
      * Handle item removal.
-     * 
+     *
      * @since S60 v3.0
      */
-    void HandleItemRemovalL(); 
-    
+    void HandleItemRemovalL();
+
     /**
      * Sets the default highlight in grid.
      *
@@ -108,7 +108,7 @@
      * @param aRedraw Is highlight to redraw.
      */
     IMPORT_C void SetDefaultHighlightL(  TBool aRedraw = ETrue  );
-    
+
     /**
      * Checks if widget is in edit mode state.
      *
@@ -116,14 +116,14 @@
      * @param aIsEditMode Is grid in edit mode state.
      */
     void SetEditModeL( TBool aIsEditMode );
-    
+
     /**
      * Derived from CCoeControl, called when container rectangle size is changed.
      *
      * @since S60 v5.0
      */
-    void SizeChanged();   
-    
+    void SizeChanged();
+
     /**
      * Gets grid model.
      *
@@ -131,7 +131,7 @@
      * @return Grid model.
      */
     CMmListBoxModel* GetMmModel();
-    
+
     /**
      * Sets empty text shown when grid is empty.
      *
@@ -139,7 +139,7 @@
      * @param aText Text to be shown when grid is empty.
      */
     IMPORT_C void SetEmptyTextL( const TDesC& aText );
-    
+
     /**
      * Sets item drawer and view background context.
      *
@@ -147,91 +147,84 @@
      * @param aBgContext Background context.
      */
     void SetItemDrawerAndViewBgContext(
-        CAknsBasicBackgroundControlContext * aBgContext );   
-    
+        CAknsBasicBackgroundControlContext * aBgContext );
+
     /**
      * Sets up the grid layout.
      *
      * @since S60 v5.0
      */
     void SetupWidgetLayoutL();
-    
+
     /**
      * Sets suite model.
-     * 
+     *
      * @since S60 v5.0
      * @param aModel Suite model.
      */
     void SetSuiteModelL( CHnSuiteModel* aModel );
-    
+
     /**
      * Set highlight visibility.
-     * 
+     *
      * @since S60 v5.0
-     * @param aVisible Visibility status. 
+     * @param aVisible Visibility status.
      */
     void SetHighlightVisibilityL( TBool aVisible );
-    
+
     /**
      * Retrieve type of widget.
-     * 
+     *
      * @since S60 v3.0
      * @return Type of widget.
-     */ 
+     */
     THnSuiteWidgetType WidgetType();
-    
-    /**
-     * Called when filp state changed.
-     * 
-     * @since S60 v3.0
-     */ 
-    void FlipStateChangedL();
-    
+
     /**
       * Draws the widget view.
       *
       * @since S60 v5.0
       */
     virtual void DrawView();
-    
+
     /**
      * Set the vertical item offset;
      * @param aOffset The offset to set to the widget.
-     * 
+     *
      * @since S60 v5.0
      */
     virtual void SetVerticalItemOffset( TInt aOffset );
 
     /**
      * Gets the current widget vertical item offset.
-     * 
+     *
      * @since S60 v5.0
      * @return The current widget vertical item offset.
      */
     virtual TInt VerticalItemOffset() const;
-    
+
     /**
      * Tells if item is visible (fully or partially).
      * Overridden from the base class CMmWidgetContainer in order to
      * provide a reliable implementation for grid.
-     * 
+     *
      * @param aItemIndex Item index.
      * @return ETrue if visible, EFalse otherwise.
      */
     TBool ItemIsVisible( TInt aItemIndex ) const;
-    
+
 private:
     /**
      * Default constructor.
-     * 
-     * @since S60 v5.0 
+     *
+     * @since S60 v5.0
      */
     CMmGridContainer();
-    
+
     /**
      * 2nd phase constructor.
-     * 
-     * @since S60 v5.0 
+     *
+     * @since S60 v5.0
      * @param aRect Rectangle of widget control.
      * @param aObjectProvider Object provider.
      * @param aTemplateLibrary template library for Drawer
@@ -247,56 +240,40 @@
      * @return Grid model.
      */
     CMmGrid* CreateGridL( CMmTemplateLibrary* aTemplateLibrary );
-    
+
     /**
 	 * Gets column count in current view.
 	 * @returns Column count in current view.
 	 */
     TInt ColumnsInCurrentView();
-    
+
     /**
      * Gets row count in current view.
      * @returns Row count in current view.
      */
     TInt RowsInCurrentView();
-    
+
     /**
 	 * Updates current view's scrollbar thumbs.
 	 */
     void UpdateViewScrollBarThumbs();
-    
-    /**
-     * Gets base default highlight in landscape mode.
-     * 
-     * @param aLayout current layout of the grid
-     * @returns default highlight
-     */
-    TInt LandscapeOrientationDefaultHighlight( TSize aLayout );
 
     /**
-     * Gets base default highlight in portrait mode.
-     * 
-     * @param aLayout current layout of the grid
-     * @returns default highlight
-     */
-    TInt PortraitOrientationDefaultHighlight( TSize aLayout );
-    
-    /**
      * Calculates offset for default highlight position based on
      * index of first visible item.
-     * 
+     *
      * @returns offset for default highlight
      */
     TInt DefaultHighlightOffset();
-    
+
 private: // Data
-	
+
     /**
      * Pointer to listbox control.
      * Own.
      */
     CMmGrid* iGrid;
-    
+
     };
 
 #endif // C_MMGRIDCONTAINER_H