summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
Diffstat (limited to 'vcl')
-rw-r--r--vcl/README.lifecycle2
-rw-r--r--vcl/source/app/help.cxx2
-rw-r--r--vcl/source/window/dockmgr.cxx16
-rw-r--r--vcl/source/window/dockwin.cxx10
-rw-r--r--vcl/source/window/floatwin.cxx6
-rw-r--r--vcl/source/window/stacking.cxx6
-rw-r--r--vcl/source/window/window.cxx12
-rw-r--r--vcl/unx/generic/app/i18n_status.cxx4
-rw-r--r--vcl/workben/vcldemo.cxx2
9 files changed, 30 insertions, 30 deletions
diff --git a/vcl/README.lifecycle b/vcl/README.lifecycle
index 55ec1606ea84..6b5cbd6e8df4 100644
--- a/vcl/README.lifecycle
+++ b/vcl/README.lifecycle
@@ -25,7 +25,7 @@ various means such as DogTags to try to detect destruction of a window
between calls:
ImplDelData aDogTag( this ); // 'orrible old code
- Show( true, SHOW_NOACTIVATE );
+ Show( true, ShowFlags::NoActivate );
if( !aDogTag.IsDead() ) // did 'this' go invalid yet ?
Update();
diff --git a/vcl/source/app/help.cxx b/vcl/source/app/help.cxx
index 7014a790f789..0ad533a2272e 100644
--- a/vcl/source/app/help.cxx
+++ b/vcl/source/app/help.cxx
@@ -352,7 +352,7 @@ void HelpTextWindow::SetHelpText( const OUString& rHelpText )
void HelpTextWindow::ImplShow()
{
ImplDelData aDogTag( this );
- Show( true, SHOW_NOACTIVATE );
+ Show( true, ShowFlags::NoActivate );
if( !aDogTag.IsDead() )
Update();
}
diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx
index 52708dd7e865..84a083436445 100644
--- a/vcl/source/window/dockmgr.cxx
+++ b/vcl/source/window/dockmgr.cxx
@@ -833,7 +833,7 @@ ImplDockingWindowWrapper::~ImplDockingWindowWrapper()
{
if ( IsFloatingMode() )
{
- GetWindow()->Show( false, SHOW_NOFOCUSCHANGE );
+ GetWindow()->Show( false, ShowFlags::NoFocusChange );
SetFloatingMode( false );
}
}
@@ -1009,7 +1009,7 @@ void ImplDockingWindowWrapper::EndDocking( const Rectangle& rRect, bool bFloatMo
bool bShow = false;
if ( bFloatMode != IsFloatingMode() )
{
- GetWindow()->Show( false, SHOW_NOFOCUSCHANGE );
+ GetWindow()->Show( false, ShowFlags::NoFocusChange );
SetFloatingMode( bFloatMode );
bShow = true;
if ( bFloatMode )
@@ -1027,7 +1027,7 @@ void ImplDockingWindowWrapper::EndDocking( const Rectangle& rRect, bool bFloatMo
}
if ( bShow )
- GetWindow()->Show( true, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
+ GetWindow()->Show( true, ShowFlags::NoFocusChange | ShowFlags::NoActivate );
}
EndDockingData data( aRect, IsFloatingMode(), IsDockingCanceled() );
@@ -1104,7 +1104,7 @@ void ImplDockingWindowWrapper::StartPopupMode( ToolBox *pParentToolBox, FloatWin
if( IsFloatingMode() )
return;
- GetWindow()->Show( false, SHOW_NOFOCUSCHANGE );
+ GetWindow()->Show( false, ShowFlags::NoFocusChange );
// prepare reparenting
vcl::Window* pRealParent = GetWindow()->GetWindow( GetWindowType::Parent );
@@ -1161,7 +1161,7 @@ void ImplDockingWindowWrapper::StartPopupMode( ToolBox *pParentToolBox, FloatWin
IMPL_LINK_NOARG(ImplDockingWindowWrapper, PopupModeEnd)
{
- GetWindow()->Show( false, SHOW_NOFOCUSCHANGE );
+ GetWindow()->Show( false, ShowFlags::NoFocusChange );
// set parameter for handler before destroying floating window
ImplPopupFloatWin *pPopupFloatWin = static_cast<ImplPopupFloatWin*>(mpFloatWin.get());
@@ -1212,7 +1212,7 @@ void ImplDockingWindowWrapper::SetFloatingMode( bool bFloatMode )
if ( bFloatMode )
{
- GetWindow()->Show( false, SHOW_NOFOCUSCHANGE );
+ GetWindow()->Show( false, ShowFlags::NoFocusChange );
maDockPos = GetWindow()->GetPosPixel();
@@ -1265,13 +1265,13 @@ void ImplDockingWindowWrapper::SetFloatingMode( bool bFloatMode )
mpFloatWin = pWin;
if ( bVisible )
- GetWindow()->Show( true, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
+ GetWindow()->Show( true, ShowFlags::NoFocusChange | ShowFlags::NoActivate );
ToggleFloatingMode();
}
else
{
- GetWindow()->Show( false, SHOW_NOFOCUSCHANGE );
+ GetWindow()->Show( false, ShowFlags::NoFocusChange );
// store FloatingData in FloatingWindow
maFloatPos = mpFloatWin->GetPosPixel();
diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx
index e76b1c629809..348af892b773 100644
--- a/vcl/source/window/dockwin.cxx
+++ b/vcl/source/window/dockwin.cxx
@@ -476,7 +476,7 @@ void DockingWindow::dispose()
{
if ( IsFloatingMode() )
{
- Show( false, SHOW_NOFOCUSCHANGE );
+ Show( false, ShowFlags::NoFocusChange );
SetFloatingMode( false );
}
delete mpImplData;
@@ -675,7 +675,7 @@ void DockingWindow::EndDocking( const Rectangle& rRect, bool bFloatMode )
bool bShow = false;
if ( bool(bFloatMode) != IsFloatingMode() )
{
- Show( false, SHOW_NOFOCUSCHANGE );
+ Show( false, ShowFlags::NoFocusChange );
SetFloatingMode( bFloatMode );
bShow = true;
if ( bFloatMode && mpFloatWin )
@@ -711,7 +711,7 @@ bool DockingWindow::Close()
if ( mpWindowImpl->mxWindowPeer.is() && IsCreatedWithToolkit() )
return false;
- Show( false, SHOW_NOFOCUSCHANGE );
+ Show( false, ShowFlags::NoFocusChange );
return true;
}
@@ -790,7 +790,7 @@ void DockingWindow::SetFloatingMode( bool bFloatMode )
if ( bFloatMode )
{
- Show( false, SHOW_NOFOCUSCHANGE );
+ Show( false, ShowFlags::NoFocusChange );
sal_Int32 nBorderWidth = get_border_width();
@@ -852,7 +852,7 @@ void DockingWindow::SetFloatingMode( bool bFloatMode )
}
else
{
- Show( false, SHOW_NOFOCUSCHANGE );
+ Show( false, ShowFlags::NoFocusChange );
sal_Int32 nBorderWidth = get_border_width();
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index 6e4f2a56592f..28a40d09c062 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -639,7 +639,7 @@ void FloatingWindow::StartPopupMode( const Rectangle& rRect, FloatWinPopupFlags
{
// avoid flickering
if ( IsVisible() )
- Show( false, SHOW_NOFOCUSCHANGE );
+ Show( false, ShowFlags::NoFocusChange );
if ( IsRollUp() )
RollDown();
@@ -713,7 +713,7 @@ void FloatingWindow::StartPopupMode( const Rectangle& rRect, FloatWinPopupFlags
// force key input even without focus (useful for menus)
mbGrabFocus = true;
}
- Show( true, SHOW_NOACTIVATE );
+ Show( true, ShowFlags::NoActivate );
}
void FloatingWindow::StartPopupMode( ToolBox* pBox, FloatWinPopupFlags nFlags )
@@ -784,7 +784,7 @@ void FloatingWindow::ImplEndPopupMode( FloatWinPopupEndFlags nFlags, sal_uLong n
if ( !(nFlags & FloatWinPopupEndFlags::TearOff) ||
!(nPopupModeFlags & FloatWinPopupFlags::AllowTearOff) )
{
- Show( false, SHOW_NOFOCUSCHANGE );
+ Show( false, ShowFlags::NoFocusChange );
// maybe pass focus on to a suitable FloatingWindow
if ( nFocusId )
diff --git a/vcl/source/window/stacking.cxx b/vcl/source/window/stacking.cxx
index dc0f78e78d72..3d4fabb3e60f 100644
--- a/vcl/source/window/stacking.cxx
+++ b/vcl/source/window/stacking.cxx
@@ -413,7 +413,7 @@ void Window::ImplShowAllOverlaps()
{
if ( pOverlapWindow->mpWindowImpl->mbOverlapVisible )
{
- pOverlapWindow->Show( true, SHOW_NOACTIVATE );
+ pOverlapWindow->Show( true, ShowFlags::NoActivate );
pOverlapWindow->mpWindowImpl->mbOverlapVisible = false;
}
@@ -901,7 +901,7 @@ void Window::SetParent( vcl::Window* pNewParent )
mpWindowImpl->mpFrame->SetParent( pNewParent->mpWindowImpl->mpFrame );
bool bVisible = IsVisible();
- Show( false, SHOW_NOFOCUSCHANGE );
+ Show( false, ShowFlags::NoFocusChange );
// check if the overlap window changes
vcl::Window* pOldOverlapWindow;
@@ -1017,7 +1017,7 @@ void Window::SetParent( vcl::Window* pNewParent )
ImplGetOwnerDrawList().push_back( this );
if ( bVisible )
- Show( true, SHOW_NOFOCUSCHANGE | SHOW_NOACTIVATE );
+ Show( true, ShowFlags::NoFocusChange | ShowFlags::NoActivate );
}
sal_uInt16 Window::GetChildCount() const
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 8a5e8c737fb9..a916bc66c4d1 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -2272,7 +2272,7 @@ vcl::Font Window::GetPointFont(vcl::RenderContext& rRenderContext) const
return aFont;
}
-void Window::Show(bool bVisible, sal_uInt16 nFlags)
+void Window::Show(bool bVisible, ShowFlags nFlags)
{
if ( IsDisposed() || mpWindowImpl->mbVisible == bVisible )
return;
@@ -2332,7 +2332,7 @@ void Window::Show(bool bVisible, sal_uInt16 nFlags)
if ( ImplIsOverlapWindow() && !mpWindowImpl->mbFrame )
{
// convert focus
- if ( !(nFlags & SHOW_NOFOCUSCHANGE) && HasChildPathFocus() )
+ if ( !(nFlags & ShowFlags::NoFocusChange) && HasChildPathFocus() )
{
if ( mpWindowImpl->mpOverlapWindow->IsEnabled() &&
mpWindowImpl->mpOverlapWindow->IsInputEnabled() &&
@@ -2361,7 +2361,7 @@ void Window::Show(bool bVisible, sal_uInt16 nFlags)
aBounds.Bottom() += workaround_border;
aInvRegion = aBounds;
}
- if ( !mpWindowImpl->mbNoParentUpdate && !(nFlags & SHOW_NOPARENTUPDATE) )
+ if ( !mpWindowImpl->mbNoParentUpdate && !(nFlags & ShowFlags::NoParentUpdate) )
{
if ( !aInvRegion.IsEmpty() )
ImplInvalidateParentFrameRegion( aInvRegion );
@@ -2405,9 +2405,9 @@ void Window::Show(bool bVisible, sal_uInt16 nFlags)
// If it is a SystemWindow it automatically pops up on top of
// all other windows if needed.
- if ( ImplIsOverlapWindow() && !(nFlags & SHOW_NOACTIVATE) )
+ if ( ImplIsOverlapWindow() && !(nFlags & ShowFlags::NoActivate) )
{
- ImplStartToTop(( nFlags & SHOW_FOREGROUNDTASK ) ? TOTOP_FOREGROUNDTASK : 0 );
+ ImplStartToTop(( nFlags & ShowFlags::ForegroundTask ) ? TOTOP_FOREGROUNDTASK : 0 );
ImplFocusToTop( 0, false );
}
@@ -2455,7 +2455,7 @@ void Window::Show(bool bVisible, sal_uInt16 nFlags)
mpWindowImpl->mbPaintFrame = true;
if (!Application::GetSettings().GetMiscSettings().GetPseudoHeadless())
{
- bool bNoActivate = (nFlags & (SHOW_NOACTIVATE|SHOW_NOFOCUSCHANGE)) != 0;
+ bool bNoActivate(nFlags & (ShowFlags::NoActivate|ShowFlags::NoFocusChange));
mpWindowImpl->mpFrame->Show( true, bNoActivate );
}
if( aDogTag.IsDead() )
diff --git a/vcl/unx/generic/app/i18n_status.cxx b/vcl/unx/generic/app/i18n_status.cxx
index 896d345b45c3..f7070e55445b 100644
--- a/vcl/unx/generic/app/i18n_status.cxx
+++ b/vcl/unx/generic/app/i18n_status.cxx
@@ -246,7 +246,7 @@ void XIMStatusWindow::setPosition( SalFrame* pParent )
{
setText( OUString() );
m_pLastParent = pParent;
- Show( false, SHOW_NOACTIVATE );
+ Show( false, ShowFlags::NoActivate );
}
if( IsVisible() )
{
@@ -270,7 +270,7 @@ IMPL_LINK_NOARG(XIMStatusWindow, DelayedShowHdl)
Point aPoint = updatePosition();
pStatusFrame->SetPosSize( aPoint.X(), aPoint.Y(), m_aWindowSize.Width(), m_aWindowSize.Height(), SAL_FRAME_POSSIZE_X | SAL_FRAME_POSSIZE_Y | SAL_FRAME_POSSIZE_WIDTH | SAL_FRAME_POSSIZE_HEIGHT );
}
- Show( m_bDelayedShow && m_bOn, SHOW_NOACTIVATE );
+ Show( m_bDelayedShow && m_bOn, ShowFlags::NoActivate );
if( m_bDelayedShow )
{
XRaiseWindow( static_cast<Display*>(pData->pDisplay),
diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx
index a80409a3cbcd..7bc6270f8c2f 100644
--- a/vcl/workben/vcldemo.cxx
+++ b/vcl/workben/vcldemo.cxx
@@ -1531,7 +1531,7 @@ class DemoPopup : public FloatingWindow
SetOutputSizePixel( Size( 300, 30 ) );
SetBackground(Wallpaper(COL_YELLOW));
- Show( true, SHOW_NOACTIVATE );
+ Show( true, ShowFlags::NoActivate );
Update();
}
generated by cgit (git 2.34.1) at 2024-07-17 23:23:20 +0000