--- a/src/hbcore/gui/hbmenu_p.h	Thu May 27 13:10:59 2010 +0300
+++ b/src/hbcore/gui/hbmenu_p.h	Fri Jun 11 13:58:22 2010 +0300
@@ -54,14 +54,14 @@
     void changeToOptionsMenu();
     HbMenuItem *subMenuItem();
     void setSubMenuItem(HbMenuItem *menuItem);
-    void closeMenuAfterOrientationChange();
+    void closeMenu();
     void closeMenuRecursively(HbAction* menuAction);
 
     void _q_triggerAction(HbMenuItem *currentItem);
     void _q_onActionTriggered();
     void _q_subMenuItemTriggered(HbAction *action);
     void _q_subMenuTimedOut();
-    void _q_handleMenuAfterOrientationChange();
+    void _q_handleMenuClose();
     void actionAdded(QActionEvent *actionEvent);
     void actionRemoved(QActionEvent *actionEvent);
     void actionChanged(QActionEvent *actionEvent);
@@ -72,7 +72,6 @@
     HbMenuListView *menuItemView;
     HbAction *subMenuAction;
     HbMenu *activeSubMenu;
-    HbAction *resultAction;
     bool actionTriggered;
     bool menuTimedOut(HbMenu* menu);
 
@@ -85,6 +84,7 @@
 
     QPointer<QObject> receiverToDisconnectOnClose;
     QByteArray memberToDisconnectOnClose;
+    int mNumberOfColumns;
 
 private:
     static bool menuEffectsLoaded;