summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-07-07 14:56:01 +0100
committerCaolán McNamara <caolanm@redhat.com>2016-07-07 15:37:09 +0100
commitb67bcaa6d4cc098de58e18d31a04801a832f9012 (patch)
tree550a8652812f4767653c86ea56ad7a9f7d684e8c /vcl
parent90cf31d8fefb46adc582bc2466fae15778f2cfd7 (diff)
FloatWinPopupFlags::NoFocusClose is only set, never read
Change-Id: Ide67b9279b626d3427c93891d27378ffd1f004cc
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/window/dockmgr.cxx1
-rw-r--r--vcl/source/window/floatwin.cxx6
2 files changed, 0 insertions, 7 deletions
diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx
index 3dafc7be0532..02363f4cdb87 100644
--- a/vcl/source/window/dockmgr.cxx
+++ b/vcl/source/window/dockmgr.cxx
@@ -375,7 +375,6 @@ void DockingManager::StartPopupMode( ToolBox *pParentToolBox, const vcl::Window
void DockingManager::StartPopupMode( ToolBox *pParentToolBox, const vcl::Window *pWindow )
{
StartPopupMode( pParentToolBox, pWindow, FloatWinPopupFlags::AllowTearOff |
- FloatWinPopupFlags::NoFocusClose |
FloatWinPopupFlags::AllMouseButtonClose |
FloatWinPopupFlags::NoMouseUpClose );
}
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index a4abcfba78e9..1ab4a8fce899 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -732,15 +732,9 @@ void FloatingWindow::StartPopupMode( ToolBox* pBox, FloatWinPopupFlags nFlags )
aRect.SetPos( aPos );
nFlags |=
- FloatWinPopupFlags::NoFocusClose |
FloatWinPopupFlags::AllMouseButtonClose |
FloatWinPopupFlags::NoMouseUpClose;
-/*
- * FloatWinPopupFlags::NoKeyClose |
- * don't set since it disables closing floaters with escape
- */
-
// set Flags for positioning
if ( !(nFlags & (FloatWinPopupFlags::Down | FloatWinPopupFlags::Up |
FloatWinPopupFlags::Left | FloatWinPopupFlags::Right |