diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-10-18 16:00:25 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-10-19 16:28:53 +0100 |
| commit | 6f7cd8f4238060249de11c4ec7d167c439f7a781 (patch) | |
| tree | ec0679ec4271a773368fbe6a21081995741a91d4 /vcl/source/window/dialog.cxx | |
| parent | 7320d7a4a4dd0657f2d650a6f580ad399529f0f1 (diff) | |
add menubar support to vclbuilder
Change-Id: Ibe9a820f178a955eec21b96796e346d785b835b6
Diffstat (limited to 'vcl/source/window/dialog.cxx')
| -rw-r--r-- | vcl/source/window/dialog.cxx | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index c632d2ccd682..fcb40df71d7a 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -453,7 +453,7 @@ void Dialog::ImplInit( vcl::Window* pParent, WinBits nStyle, InitFlag eFlag ) (nSysWinMode & SystemWindowFlags::DIALOG) ) { // create window with a small border ? - if (mbForceBorderWindow || ((nStyle & (WB_BORDER | WB_NOBORDER | WB_MOVEABLE | WB_SIZEABLE | WB_CLOSEABLE)) == WB_BORDER )) + if ((nStyle & WB_ALLOWMENUBAR) || ((nStyle & (WB_BORDER | WB_NOBORDER | WB_MOVEABLE | WB_SIZEABLE | WB_CLOSEABLE)) == WB_BORDER)) { AddBorderWindow(pParent, nStyle); } @@ -530,7 +530,6 @@ void Dialog::ImplLOKNotifier(vcl::Window* pParent) Dialog::Dialog( WindowType nType ) : SystemWindow( nType ) - , mbForceBorderWindow(false) , mnInitFlag(InitFlag::Default) { ImplInitDialogData(); @@ -559,9 +558,8 @@ void Dialog::doDeferredInit(WinBits nBits) mbIsDeferredInit = false; } -Dialog::Dialog(vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription, WindowType nType, InitFlag eFlag, bool bBorder) +Dialog::Dialog(vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription, WindowType nType, InitFlag eFlag) : SystemWindow(nType) - , mbForceBorderWindow(bBorder) , mnInitFlag(eFlag) { ImplLOKNotifier(pParent); @@ -571,7 +569,6 @@ Dialog::Dialog(vcl::Window* pParent, const OUString& rID, const OUString& rUIXML Dialog::Dialog(vcl::Window* pParent, WinBits nStyle, InitFlag eFlag) : SystemWindow(WindowType::DIALOG) - , mbForceBorderWindow(false) , mnInitFlag(eFlag) { ImplLOKNotifier(pParent); @@ -1520,8 +1517,8 @@ VclBuilderContainer::~VclBuilderContainer() { } -ModalDialog::ModalDialog( vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription, bool bBorder ) : - Dialog(pParent, rID, rUIXMLDescription, WindowType::MODALDIALOG, InitFlag::Default, bBorder) +ModalDialog::ModalDialog( vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription ) : + Dialog(pParent, rID, rUIXMLDescription, WindowType::MODALDIALOG, InitFlag::Default) { } |