Kaydet (Commit) d6e5c52c authored tarafından Caolán McNamara's avatar Caolán McNamara

NoParent condition reversed

regression from...

commit 39078c24
Author: Noel Grandin <noel@peralex.com>
Date:   Wed May 6 14:07:17 2015 +0200

    cleanup DIALOG_NO_PARENT, follow on to tdf#91090

    remove the DIALOG_NO_PARENT abomination and replace it with a flags
    parameter

Change-Id: I1955531b41b01623ca94155c60794ae1771849ff
üst da492758
......@@ -364,8 +364,9 @@ void Dialog::ImplInit( vcl::Window* pParent, WinBits nStyle, InitFlag eFlag )
// Now, all Dialogs are per default system windows !!!
nStyle |= WB_SYSTEMWINDOW;
// parent is NULL: get the default Dialog parent
if ( !pParent )
if (eFlag == InitFlag::NoParent)
pParent = NULL;
else if (!pParent) // parent is NULL: get the default Dialog parent
{
pParent = Application::GetDefDialogParent();
if ( !pParent && !(nStyle & WB_SYSTEMWINDOW) )
......@@ -392,8 +393,6 @@ void Dialog::ImplInit( vcl::Window* pParent, WinBits nStyle, InitFlag eFlag )
}
}
}
else if( eFlag == InitFlag::Default )
pParent = NULL;
if ( !pParent || (nStyle & WB_SYSTEMWINDOW) ||
(pParent->mpWindowImpl->mpFrameData->mbNeedSysWindow && !(nSysWinMode & SystemWindowFlags::NOAUTOMODE)) ||
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment