diff -r 56cd8111b7f7 -r 41300fa6a67c src/gui/widgets/qmenu_p.h --- a/src/gui/widgets/qmenu_p.h Tue Jan 26 12:42:25 2010 +0200 +++ b/src/gui/widgets/qmenu_p.h Tue Feb 02 00:43:10 2010 +0200 @@ -182,6 +182,7 @@ } void init(); + static QMenuPrivate *get(QMenu *m) { return m->d_func(); } int scrollerHeight() const; //item calculations @@ -190,7 +191,7 @@ QRect actionRect(QAction *) const; mutable QVector actionRects; - mutable QWidgetList widgetItems; + mutable QHash widgetItems; void updateActionRects() const; QRect popupGeometry(const QWidget *widget) const; QRect popupGeometry(int screen = -1) const; @@ -215,6 +216,7 @@ SelectedFromKeyboard, SelectedFromElsewhere }; + QWidget *topCausedWidget() const; QAction *actionAt(QPoint p) const; void setFirstActionActive(); void setCurrentAction(QAction *, int popup = -1, SelectionReason reason = SelectedFromElsewhere, bool activateFirst = false); @@ -291,6 +293,9 @@ bool hasMouseMoved(const QPoint &globalPos); + void updateLayoutDirection(); + + //menu fading/scrolling effects bool doChildEffects;