diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-08-03 20:49:22 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-08-21 17:38:19 +0200 |
| commit | feccd4363b46d28b084d344815b335bcabfac6d6 (patch) | |
| tree | 91b9188f4dcbd7250c05260ee5068db78ecc3047 /vcl | |
| parent | 10e972c5fba698b287b6f19d7b249e38b18f8895 (diff) | |
hook GtkAssistant buildable to RoadmapWizard
Change-Id: I486ee35423be33f0f78780a43afa324aa66f5f26
Reviewed-on: https://gerrit.libreoffice.org/76904
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/window/builder.cxx | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index 61be22e10d70..3b7db3eea3ab 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -38,6 +38,7 @@ #include <vcl/menubtn.hxx> #include <vcl/mnemonic.hxx> #include <vcl/prgsbar.hxx> +#include <vcl/roadmapwizard.hxx> #include <vcl/scrbar.hxx> #include <vcl/svapp.hxx> #include <vcl/svtabbx.hxx> @@ -1640,7 +1641,7 @@ VclPtr<vcl::Window> VclBuilder::makeObject(vcl::Window *pParent, const OString & pParent->GetType() == WindowType::VERTICALTABCONTROL)) { bool bTopLevel(name == "GtkDialog" || name == "GtkMessageDialog" || - name == "GtkWindow" || name == "GtkPopover"); + name == "GtkWindow" || name == "GtkPopover" || name == "GtkAssistant"); if (!bTopLevel) { if (pParent->GetType() == WindowType::TABCONTROL) @@ -1686,12 +1687,17 @@ VclPtr<vcl::Window> VclBuilder::makeObject(vcl::Window *pParent, const OString & extractButtonImage(id, rMap, name == "GtkRadioButton"); VclPtr<vcl::Window> xWindow; - if (name == "GtkDialog" || name == "GtkAboutDialog") + if (name == "GtkDialog" || name == "GtkAboutDialog" || name == "GtkAssistant") { WinBits nBits = WB_MOVEABLE|WB_3DLOOK|WB_CLOSEABLE; if (extractResizable(rMap)) nBits |= WB_SIZEABLE; - if (name == "GtkAboutDialog") + if (name == "GtkAssistant") + { + //TODO when no bare OWizardMachine pass nBits down instead of using empty .ui + xWindow = VclPtr<vcl::RoadmapWizard>::Create(pParent); + } + else if (name == "GtkAboutDialog") xWindow = VclPtr<vcl::AboutDialog>::Create(pParent, nBits, !pParent ? Dialog::InitFlag::NoParent : Dialog::InitFlag::Default); else xWindow = VclPtr<Dialog>::Create(pParent, nBits, !pParent ? Dialog::InitFlag::NoParent : Dialog::InitFlag::Default); |