diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2016-03-15 20:44:50 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-03-16 09:27:36 +0000 |
| commit | 86f504ee014d17172267f14742b8edd5789cbbc6 (patch) | |
| tree | 6b6c78ac513e2169e9bceb7ffa99a16753a2eea5 /include | |
| parent | 84aee1ae9d4e03054dfcf5f8a9f10ecd2b0496b8 (diff) | |
Related: tdf#98637 make this a tractable problem
This is just too hard, it would all be much easier if the ActionGroup existed
right from the start of the entire process. So smuggle in to the ctor the
toplevel frame that the menubar will be inserted into so we can use its
ActionGroup from the start.
That would suggest that we could then just keep the hierarchy in sync as it is
created rather than finding opportune moments to update /generate it.
Change-Id: I550f94a994210423ab9cea1986e643056cb5bd29
Reviewed-on: https://gerrit.libreoffice.org/23287
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/menu.hxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx index 277819960347..6fd25acf169c 100644 --- a/include/vcl/menu.hxx +++ b/include/vcl/menu.hxx @@ -413,6 +413,7 @@ class VCL_DLLPUBLIC MenuBar : public Menu bool mbFloatBtnVisible : 1; bool mbHideBtnVisible : 1; bool mbDisplayable : 1; + SystemWindow* mpAssociatedSystemWindow; friend class Application; friend class Menu; @@ -431,7 +432,7 @@ protected: MenuBarWindow* getMenuBarWindow(); public: - MenuBar(); + MenuBar( SystemWindow* pAssociatedSystemWindow = nullptr ); MenuBar( const MenuBar& rMenu ); virtual ~MenuBar(); |