mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

honour closeable flag

Browse Source 
Change-Id: I4b37d6698d3ebd6449c5ba797784b49cc7b2cada
Reviewed-on: https://gerrit.libreoffice.org/81757
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara
2019-10-30 10:40:13 +00:00
parent c9858b725b
commit 07d78b38fb
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
vcl/source/window/builder.cxx
View File

@@ -1748,9 +1748,11 @@ VclPtr<vcl::Window> VclBuilder::makeObject(vcl::Window *pParent, const OString &
// WB_ALLOWMENUBAR because we don't know in advance if we will encounter // WB_ALLOWMENUBAR because we don't know in advance if we will encounter
// a menubar, and menubars need a BorderWindow in the toplevel, and // a menubar, and menubars need a BorderWindow in the toplevel, and
// such border windows need to be in created during the dialog ctor // such border windows need to be in created during the dialog ctor
WinBits nBits = WB_MOVEABLE|WB_3DLOOK|WB_CLOSEABLE|WB_ALLOWMENUBAR; WinBits nBits = WB_MOVEABLE|WB_3DLOOK|WB_ALLOWMENUBAR;
if (extractResizable(rMap)) if (extractResizable(rMap))
nBits |= WB_SIZEABLE; nBits |= WB_SIZEABLE;
if (extractCloseable(rMap))
nBits |= WB_CLOSEABLE;
Dialog::InitFlag eInit = !pParent ? Dialog::InitFlag::NoParent : Dialog::InitFlag::Default; Dialog::InitFlag eInit = !pParent ? Dialog::InitFlag::NoParent : Dialog::InitFlag::Default;
if (name == "GtkAssistant") if (name == "GtkAssistant")
xWindow = VclPtr<vcl::RoadmapWizard>::Create(pParent, nBits, eInit); xWindow = VclPtr<vcl::RoadmapWizard>::Create(pParent, nBits, eInit);