include/vcl/wizdlg.hxx | 2 +- vcl/source/control/roadmapwizard.cxx | 18 +++++++++--------- vcl/source/window/builder.cxx | 10 ++++------ 3 files changed, 14 insertions(+), 16 deletions(-)
New commits: commit 1fbcca1366b0d12db7b0e1b86ea2f502773f6483 Author: Caolán McNamara <[email protected]> AuthorDate: Sun Sep 15 15:43:17 2019 +0100 Commit: Caolán McNamara <[email protected]> CommitDate: Sun Sep 15 21:06:21 2019 +0200 add WinBits and InitFlag to RoadmapWizard ctor so wizard modality and resizability flags in .ui can be honoured by VclBuilder Change-Id: I5dd40796349862261d0b67cf14bfb6a62d8c19ab Reviewed-on: https://gerrit.libreoffice.org/78948 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> diff --git a/include/vcl/wizdlg.hxx b/include/vcl/wizdlg.hxx index 56bfbda4452b..04c1041f36be 100644 --- a/include/vcl/wizdlg.hxx +++ b/include/vcl/wizdlg.hxx @@ -107,7 +107,7 @@ namespace vcl std::unique_ptr<RoadmapWizardImpl> m_xRoadmapImpl; public: - RoadmapWizard(vcl::Window* pParent); + RoadmapWizard(vcl::Window* pParent, WinBits nStyle = WB_STDDIALOG, InitFlag eFlag = InitFlag::Default); virtual ~RoadmapWizard( ) override; virtual void dispose() override; diff --git a/vcl/source/control/roadmapwizard.cxx b/vcl/source/control/roadmapwizard.cxx index b24a50013e44..b370b4969775 100644 --- a/vcl/source/control/roadmapwizard.cxx +++ b/vcl/source/control/roadmapwizard.cxx @@ -120,15 +120,15 @@ namespace vcl } //= RoadmapWizard - RoadmapWizard::RoadmapWizard(vcl::Window* pParent) - :Dialog(pParent) - ,m_pFinish(nullptr) - ,m_pCancel(nullptr) - ,m_pNextPage(nullptr) - ,m_pPrevPage(nullptr) - ,m_pHelp(nullptr) - ,m_xWizardImpl(new WizardMachineImplData) - ,m_xRoadmapImpl(new RoadmapWizardImpl) + RoadmapWizard::RoadmapWizard(vcl::Window* pParent, WinBits nStyle, InitFlag eFlag) + : Dialog(pParent, nStyle, eFlag) + , m_pFinish(nullptr) + , m_pCancel(nullptr) + , m_pNextPage(nullptr) + , m_pPrevPage(nullptr) + , m_pHelp(nullptr) + , m_xWizardImpl(new WizardMachineImplData) + , m_xRoadmapImpl(new RoadmapWizardImpl) { ImplInitData(); diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx index cc7dac554b0c..8d6203a2afa1 100644 --- a/vcl/source/window/builder.cxx +++ b/vcl/source/window/builder.cxx @@ -1744,15 +1744,13 @@ VclPtr<vcl::Window> VclBuilder::makeObject(vcl::Window *pParent, const OString & WinBits nBits = WB_MOVEABLE|WB_3DLOOK|WB_CLOSEABLE; if (extractResizable(rMap)) nBits |= WB_SIZEABLE; + Dialog::InitFlag eInit = !pParent ? Dialog::InitFlag::NoParent : Dialog::InitFlag::Default; if (name == "GtkAssistant") - { - //TODO when no bare OWizardMachine pass nBits down instead of using empty .ui - xWindow = VclPtr<vcl::RoadmapWizard>::Create(pParent); - } + xWindow = VclPtr<vcl::RoadmapWizard>::Create(pParent, nBits, eInit); else if (name == "GtkAboutDialog") - xWindow = VclPtr<vcl::AboutDialog>::Create(pParent, nBits, !pParent ? Dialog::InitFlag::NoParent : Dialog::InitFlag::Default); + xWindow = VclPtr<vcl::AboutDialog>::Create(pParent, nBits, eInit); else - xWindow = VclPtr<Dialog>::Create(pParent, nBits, !pParent ? Dialog::InitFlag::NoParent : Dialog::InitFlag::Default); + xWindow = VclPtr<Dialog>::Create(pParent, nBits, eInit); #if HAVE_FEATURE_DESKTOP if (!m_bLegacy && !extractModal(rMap)) xWindow->SetType(WindowType::MODELESSDIALOG); _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
