diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2017-10-08 01:28:14 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2017-10-12 01:28:29 +0200 |
| commit | 2dd1645d7cd12e8f5d8e950af3d156f8df2fa417 (patch) | |
| tree | 680f01c504a885c342782a94e9a32078a8ecb5bf /include | |
| parent | 4d1ee296def5fde9c77702d3d19d76be33cbdaad (diff) | |
allow adding a menu to a modal dialog
Change-Id: I3da2ec747f73c44bf7bcb8a7ec3d116272dc806f
Reviewed-on: https://gerrit.libreoffice.org/43252
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/dialog.hxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx index 1ff5136fb41a..9130ee2e46cd 100644 --- a/include/vcl/dialog.hxx +++ b/include/vcl/dialog.hxx @@ -54,6 +54,7 @@ private: bool mbInClose; bool mbModalMode; bool mbPaintComplete; + bool mbForceBorderWindow; InitFlag mnInitFlag; // used for deferred init VclPtr<VclButtonBox> mpActionArea; @@ -63,6 +64,7 @@ private: SAL_DLLPRIVATE void ImplInitDialogData(); SAL_DLLPRIVATE void ImplInitSettings(); + SAL_DLLPRIVATE VclPtr<vcl::Window> AddBorderWindow(vcl::Window* pParent, WinBits nBits); virtual void ApplySettings(vcl::RenderContext& rRenderContext) override; @@ -100,7 +102,7 @@ public: protected: explicit Dialog( WindowType nType ); - explicit Dialog( vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription, WindowType nType, InitFlag eFlag = InitFlag::Default ); + explicit Dialog( vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription, WindowType nType, InitFlag eFlag = InitFlag::Default, bool bBorder = false ); virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, DrawFlags nFlags ) override; virtual void settingOptimalLayoutSize(Window *pBox) override; @@ -189,7 +191,7 @@ class VCL_DLLPUBLIC ModalDialog : public Dialog { public: explicit ModalDialog( vcl::Window* pParent, WinBits nStyle = WB_STDMODAL ); - explicit ModalDialog( vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription ); + explicit ModalDialog( vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription, bool bBorder = false ); protected: using Window::Show; |