From aae09b331b5645b458556543d02b60266a3e68d0 Mon Sep 17 00:00:00 2001 From: Katarina Behrens Date: Tue, 15 May 2018 16:29:15 +0200 Subject: Expose menu bar of the main window and some addional work on activating menus Change-Id: I0c4d87dc158f3253aa97d151385fce14551c11b9 --- vcl/inc/qt5/Qt5Frame.hxx | 3 +++ vcl/inc/qt5/Qt5Menu.hxx | 5 +++++ 2 files changed, 8 insertions(+) (limited to 'vcl/inc/qt5') diff --git a/vcl/inc/qt5/Qt5Frame.hxx b/vcl/inc/qt5/Qt5Frame.hxx index 8772ee7bbfcc..1f881d706881 100644 --- a/vcl/inc/qt5/Qt5Frame.hxx +++ b/vcl/inc/qt5/Qt5Frame.hxx @@ -28,6 +28,7 @@ class Qt5Graphics; class Qt5Instance; +class Qt5Menu; class QWidget; class QPaintDevice; class QImage; @@ -55,6 +56,8 @@ class VCLPLUG_QT5_PUBLIC Qt5Frame : public SalFrame Qt5Frame* m_pParent; PointerStyle m_ePointerStyle; + Qt5Menu* m_pSalMenu; + bool m_bDefaultSize; bool m_bDefaultPos; diff --git a/vcl/inc/qt5/Qt5Menu.hxx b/vcl/inc/qt5/Qt5Menu.hxx index cf7a715f5911..1c0f03b3342c 100644 --- a/vcl/inc/qt5/Qt5Menu.hxx +++ b/vcl/inc/qt5/Qt5Menu.hxx @@ -12,6 +12,7 @@ #include class MenuItemList; +class QMenuBar; class Qt5MenuItem; class Qt5Frame; @@ -24,6 +25,10 @@ private: Qt5Frame* mpFrame; bool mbMenuBar; + QMenuBar* mpQMenuBar; + + void ActivateAllSubMenus( Menu* pMenuBar ); + public: Qt5Menu( bool bMenuBar ); virtual ~Qt5Menu() override; -- cgit