summaryrefslogtreecommitdiff
path: root/vcl/source/window
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/source/window')
-rw-r--r--vcl/source/window/brdwin.cxx6
-rw-r--r--vcl/source/window/btndlg.cxx2
-rw-r--r--vcl/source/window/dialog.cxx4
-rw-r--r--vcl/source/window/dockingarea.cxx2
-rw-r--r--vcl/source/window/dockwin.cxx6
-rw-r--r--vcl/source/window/event.cxx2
-rw-r--r--vcl/source/window/floatwin.cxx4
-rw-r--r--vcl/source/window/globalization.cxx2
-rw-r--r--vcl/source/window/layout.cxx2
-rw-r--r--vcl/source/window/menubarwindow.cxx4
-rw-r--r--vcl/source/window/menufloatingwindow.cxx2
-rw-r--r--vcl/source/window/msgbox.cxx2
-rw-r--r--vcl/source/window/splitwin.cxx6
-rw-r--r--vcl/source/window/status.cxx12
-rw-r--r--vcl/source/window/tabdlg.cxx2
-rw-r--r--vcl/source/window/tabpage.cxx4
-rw-r--r--vcl/source/window/toolbox.cxx14
-rw-r--r--vcl/source/window/window.cxx32
-rw-r--r--vcl/source/window/window2.cxx20
19 files changed, 64 insertions, 64 deletions
diff --git a/vcl/source/window/brdwin.cxx b/vcl/source/window/brdwin.cxx
index 82aa0bea8d2d..b54914f9082e 100644
--- a/vcl/source/window/brdwin.cxx
+++ b/vcl/source/window/brdwin.cxx
@@ -1980,9 +1980,9 @@ void ImplBorderWindow::Resize()
void ImplBorderWindow::StateChanged( StateChangedType nType )
{
- if ( (nType == StateChangedType::TEXT) ||
- (nType == StateChangedType::IMAGE) ||
- (nType == StateChangedType::DATA) )
+ if ( (nType == StateChangedType::Text) ||
+ (nType == StateChangedType::Image) ||
+ (nType == StateChangedType::Data) )
{
if ( IsReallyVisible() && mbFrameBorder )
{
diff --git a/vcl/source/window/btndlg.cxx b/vcl/source/window/btndlg.cxx
index 2e8532cecba7..7846e41828e8 100644
--- a/vcl/source/window/btndlg.cxx
+++ b/vcl/source/window/btndlg.cxx
@@ -234,7 +234,7 @@ void ButtonDialog::Resize()
void ButtonDialog::StateChanged( StateChangedType nType )
{
- if ( nType == StateChangedType::INITSHOW )
+ if ( nType == StateChangedType::InitShow )
{
ImplPosControls();
for (btn_iterator it = maItemList.begin(); it != maItemList.end(); ++it)
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 3381ef6f5991..e72bf4f383c8 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -635,7 +635,7 @@ Size bestmaxFrameSizeForScreenSize(const Size &rScreenSize)
void Dialog::StateChanged( StateChangedType nType )
{
- if (nType == StateChangedType::INITSHOW)
+ if (nType == StateChangedType::InitShow)
{
DoInitialLayout();
@@ -655,7 +655,7 @@ void Dialog::StateChanged( StateChangedType nType )
SystemWindow::StateChanged( nType );
- if (nType == StateChangedType::CONTROLBACKGROUND)
+ if (nType == StateChangedType::ControlBackground)
{
ImplInitSettings();
Invalidate();
diff --git a/vcl/source/window/dockingarea.cxx b/vcl/source/window/dockingarea.cxx
index e94d6073931a..24fc270a5198 100644
--- a/vcl/source/window/dockingarea.cxx
+++ b/vcl/source/window/dockingarea.cxx
@@ -135,7 +135,7 @@ void DockingAreaWindow::StateChanged( StateChangedType nType )
{
Window::StateChanged( nType );
- if ( nType == StateChangedType::VISIBLE )
+ if ( nType == StateChangedType::Visible )
ImplInvalidateMenubar( this );
}
diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx
index 3ea561f2598a..d5545623f0b6 100644
--- a/vcl/source/window/dockwin.cxx
+++ b/vcl/source/window/dockwin.cxx
@@ -742,16 +742,16 @@ void DockingWindow::StateChanged( StateChangedType nType )
{
switch(nType)
{
- case StateChangedType::INITSHOW:
+ case StateChangedType::InitShow:
DoInitialLayout();
break;
- case StateChangedType::CONTROLBACKGROUND:
+ case StateChangedType::ControlBackground:
ImplInitSettings();
Invalidate();
break;
- case StateChangedType::STYLE:
+ case StateChangedType::Style:
mbDockable = (GetStyle() & WB_DOCKABLE) != 0;
break;
diff --git a/vcl/source/window/event.cxx b/vcl/source/window/event.cxx
index bd2b36d39c39..162f3572d8cc 100644
--- a/vcl/source/window/event.cxx
+++ b/vcl/source/window/event.cxx
@@ -418,7 +418,7 @@ void Window::ImplCallInitShow()
{
mpWindowImpl->mbReallyShown = true;
mpWindowImpl->mbInInitShow = true;
- StateChanged( StateChangedType::INITSHOW );
+ StateChanged( StateChangedType::InitShow );
mpWindowImpl->mbInInitShow = false;
vcl::Window* pWindow = mpWindowImpl->mpFirstOverlap;
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index 65a5ef452458..39030b7ab122 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -551,14 +551,14 @@ bool FloatingWindow::Notify( NotifyEvent& rNEvt )
void FloatingWindow::StateChanged( StateChangedType nType )
{
- if (nType == StateChangedType::INITSHOW)
+ if (nType == StateChangedType::InitShow)
{
DoInitialLayout();
}
SystemWindow::StateChanged( nType );
- if ( nType == StateChangedType::CONTROLBACKGROUND )
+ if ( nType == StateChangedType::ControlBackground )
{
ImplInitSettings();
Invalidate();
diff --git a/vcl/source/window/globalization.cxx b/vcl/source/window/globalization.cxx
index ed9f17e746a7..980a5867094e 100644
--- a/vcl/source/window/globalization.cxx
+++ b/vcl/source/window/globalization.cxx
@@ -24,7 +24,7 @@ namespace vcl {
void Window::EnableRTL ( bool bEnable )
{
- StateChanged( StateChangedType::MIRRORING );
+ StateChanged( StateChangedType::Mirroring );
OutputDevice::EnableRTL(bEnable);
}
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index 3bfa40a049d9..ee0a0248de1b 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -1601,7 +1601,7 @@ void VclExpander::StateChanged(StateChangedType nType)
{
VclBin::StateChanged( nType );
- if (nType == StateChangedType::INITSHOW)
+ if (nType == StateChangedType::InitShow)
{
vcl::Window *pChild = get_child();
if (pChild)
diff --git a/vcl/source/window/menubarwindow.cxx b/vcl/source/window/menubarwindow.cxx
index 83754722d925..8c21f8423349 100644
--- a/vcl/source/window/menubarwindow.cxx
+++ b/vcl/source/window/menubarwindow.cxx
@@ -989,8 +989,8 @@ void MenuBarWindow::StateChanged( StateChangedType nType )
{
Window::StateChanged( nType );
- if ( ( nType == StateChangedType::CONTROLFOREGROUND ) ||
- ( nType == StateChangedType::CONTROLBACKGROUND ) )
+ if ( ( nType == StateChangedType::ControlForeground ) ||
+ ( nType == StateChangedType::ControlBackground ) )
{
ImplInitMenuWindow( this, false, true );
Invalidate();
diff --git a/vcl/source/window/menufloatingwindow.cxx b/vcl/source/window/menufloatingwindow.cxx
index e28cfff00c7a..247821ce6639 100644
--- a/vcl/source/window/menufloatingwindow.cxx
+++ b/vcl/source/window/menufloatingwindow.cxx
@@ -1160,7 +1160,7 @@ void MenuFloatingWindow::StateChanged( StateChangedType nType )
{
FloatingWindow::StateChanged( nType );
- if ( ( nType == StateChangedType::CONTROLFOREGROUND ) || ( nType == StateChangedType::CONTROLBACKGROUND ) )
+ if ( ( nType == StateChangedType::ControlForeground ) || ( nType == StateChangedType::ControlBackground ) )
{
ImplInitMenuWindow( this, false, false );
Invalidate();
diff --git a/vcl/source/window/msgbox.cxx b/vcl/source/window/msgbox.cxx
index 9f2fd75973c7..8ddba996b1a3 100644
--- a/vcl/source/window/msgbox.cxx
+++ b/vcl/source/window/msgbox.cxx
@@ -354,7 +354,7 @@ void MessBox::ImplPosControls()
void MessBox::StateChanged( StateChangedType nType )
{
- if ( nType == StateChangedType::INITSHOW )
+ if ( nType == StateChangedType::InitShow )
{
ImplPosControls();
}
diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx
index 6be4c7ea10fd..be52f6cd315d 100644
--- a/vcl/source/window/splitwin.cxx
+++ b/vcl/source/window/splitwin.cxx
@@ -2607,15 +2607,15 @@ void SplitWindow::StateChanged( StateChangedType nType )
{
switch ( nType )
{
- case StateChangedType::INITSHOW:
+ case StateChangedType::InitShow:
if ( IsUpdateMode() )
ImplCalcLayout();
break;
- case StateChangedType::UPDATEMODE:
+ case StateChangedType::UpdateMode:
if ( IsUpdateMode() && IsReallyShown() )
ImplCalcLayout();
break;
- case StateChangedType::CONTROLBACKGROUND:
+ case StateChangedType::ControlBackground:
ImplInitSettings();
Invalidate();
break;
diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx
index 37397f912471..8896cea4c09f 100644
--- a/vcl/source/window/status.cxx
+++ b/vcl/source/window/status.cxx
@@ -824,23 +824,23 @@ void StatusBar::StateChanged( StateChangedType nType )
{
Window::StateChanged( nType );
- if ( nType == StateChangedType::INITSHOW )
+ if ( nType == StateChangedType::InitShow )
ImplFormat();
- else if ( nType == StateChangedType::UPDATEMODE )
+ else if ( nType == StateChangedType::UpdateMode )
Invalidate();
- else if ( (nType == StateChangedType::ZOOM) ||
- (nType == StateChangedType::CONTROLFONT) )
+ else if ( (nType == StateChangedType::Zoom) ||
+ (nType == StateChangedType::ControlFont) )
{
mbFormat = true;
ImplInitSettings( true, false, false );
Invalidate();
}
- else if ( nType == StateChangedType::CONTROLFOREGROUND )
+ else if ( nType == StateChangedType::ControlForeground )
{
ImplInitSettings( false, true, false );
Invalidate();
}
- else if ( nType == StateChangedType::CONTROLBACKGROUND )
+ else if ( nType == StateChangedType::ControlBackground )
{
ImplInitSettings( false, false, true );
Invalidate();
diff --git a/vcl/source/window/tabdlg.cxx b/vcl/source/window/tabdlg.cxx
index e5c9061389e3..a99daecc3390 100644
--- a/vcl/source/window/tabdlg.cxx
+++ b/vcl/source/window/tabdlg.cxx
@@ -233,7 +233,7 @@ void TabDialog::dispose()
void TabDialog::StateChanged( StateChangedType nType )
{
- if ( nType == StateChangedType::INITSHOW )
+ if ( nType == StateChangedType::InitShow )
{
// Calculate the Layout only for the initialized state
if ( mbPosControls )
diff --git a/vcl/source/window/tabpage.cxx b/vcl/source/window/tabpage.cxx
index 308ca926afe7..787411221f6e 100644
--- a/vcl/source/window/tabpage.cxx
+++ b/vcl/source/window/tabpage.cxx
@@ -100,14 +100,14 @@ void TabPage::StateChanged( StateChangedType nType )
{
Window::StateChanged( nType );
- if ( nType == StateChangedType::INITSHOW )
+ if ( nType == StateChangedType::InitShow )
{
if ( GetSettings().GetStyleSettings().GetAutoMnemonic() )
ImplWindowAutoMnemonic( this );
// FIXME: no layouting, workaround some clipping issues
ImplAdjustNWFSizes();
}
- else if ( nType == StateChangedType::CONTROLBACKGROUND )
+ else if ( nType == StateChangedType::ControlBackground )
{
ImplInitSettings();
Invalidate();
diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 26590b7ab5c0..de02402ce2d3 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -4422,29 +4422,29 @@ void ToolBox::StateChanged( StateChangedType nType )
{
DockingWindow::StateChanged( nType );
- if ( nType == StateChangedType::INITSHOW )
+ if ( nType == StateChangedType::InitShow )
ImplFormat();
- else if ( nType == StateChangedType::ENABLE )
+ else if ( nType == StateChangedType::Enable )
ImplUpdateItem();
- else if ( nType == StateChangedType::UPDATEMODE )
+ else if ( nType == StateChangedType::UpdateMode )
{
if ( IsUpdateMode() )
Invalidate();
}
- else if ( (nType == StateChangedType::ZOOM) ||
- (nType == StateChangedType::CONTROLFONT) )
+ else if ( (nType == StateChangedType::Zoom) ||
+ (nType == StateChangedType::ControlFont) )
{
mbCalc = true;
mbFormat = true;
ImplInitSettings( true, false, false );
Invalidate();
}
- else if ( nType == StateChangedType::CONTROLFOREGROUND )
+ else if ( nType == StateChangedType::ControlForeground )
{
ImplInitSettings( false, true, false );
Invalidate();
}
- else if ( nType == StateChangedType::CONTROLBACKGROUND )
+ else if ( nType == StateChangedType::ControlBackground )
{
ImplInitSettings( false, false, true ); // font, foreground, background
Invalidate();
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 5c30ba0a1434..677de2ce717a 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -2023,16 +2023,16 @@ void Window::StateChanged(StateChangedType eType)
switch (eType)
{
//stuff that doesn't invalidate the layout
- case StateChangedType::CONTROLFOREGROUND:
- case StateChangedType::CONTROLBACKGROUND:
+ case StateChangedType::ControlForeground:
+ case StateChangedType::ControlBackground:
case StateChangedType::Transparent:
- case StateChangedType::UPDATEMODE:
- case StateChangedType::READONLY:
- case StateChangedType::ENABLE:
- case StateChangedType::STATE:
- case StateChangedType::DATA:
- case StateChangedType::INITSHOW:
- case StateChangedType::CONTROL_FOCUS:
+ case StateChangedType::UpdateMode:
+ case StateChangedType::ReadOnly:
+ case StateChangedType::Enable:
+ case StateChangedType::State:
+ case StateChangedType::Data:
+ case StateChangedType::InitShow:
+ case StateChangedType::ControlFocus:
break;
//stuff that does invalidate the layout
default:
@@ -2067,7 +2067,7 @@ void Window::SetStyle( WinBits nStyle )
{
mpWindowImpl->mnPrevStyle = mpWindowImpl->mnStyle;
mpWindowImpl->mnStyle = nStyle;
- StateChanged( StateChangedType::STYLE );
+ StateChanged( StateChangedType::Style );
}
}
@@ -2091,7 +2091,7 @@ void Window::SetExtendedStyle( WinBits nExtendedStyle )
}
mpWindowImpl->mnPrevExtendedStyle = mpWindowImpl->mnExtendedStyle;
mpWindowImpl->mnExtendedStyle = nExtendedStyle;
- StateChanged( StateChangedType::EXTENDEDSTYLE );
+ StateChanged( StateChangedType::ExtendedStyle );
}
}
@@ -2303,7 +2303,7 @@ void Window::Show( bool bVisible, sal_uInt16 nFlags )
mpWindowImpl->mpFrame->Show( false, false );
}
- StateChanged( StateChangedType::VISIBLE );
+ StateChanged( StateChangedType::Visible );
if ( mpWindowImpl->mbReallyVisible )
{
@@ -2391,7 +2391,7 @@ void Window::Show( bool bVisible, sal_uInt16 nFlags )
ImplCallResize();
}
- StateChanged( StateChangedType::VISIBLE );
+ StateChanged( StateChangedType::Visible );
vcl::Window* pTestParent;
if ( ImplIsOverlapWindow() )
@@ -2578,7 +2578,7 @@ void Window::Enable( bool bEnable, bool bChild )
mpWindowImpl->mbDisabled = !bEnable;
if ( mpWindowImpl->mpSysObj )
mpWindowImpl->mpSysObj->Enable( bEnable && !mpWindowImpl->mbInputDisabled );
- StateChanged( StateChangedType::ENABLE );
+ StateChanged( StateChangedType::Enable );
CallEventListeners( bEnable ? VCLEVENT_WINDOW_ENABLED : VCLEVENT_WINDOW_DISABLED );
}
@@ -3132,7 +3132,7 @@ void Window::SetUpdateMode( bool bUpdate )
{
mpWindowImpl->mbNoUpdate = !bUpdate;
- StateChanged( StateChangedType::UPDATEMODE );
+ StateChanged( StateChangedType::UpdateMode );
}
void Window::GrabFocus()
@@ -3203,7 +3203,7 @@ void Window::SetText( const OUString& rStr )
pWindow->CallEventListeners( VCLEVENT_WINDOW_FRAMETITLECHANGED, &oldTitle );
}
- StateChanged( StateChangedType::TEXT );
+ StateChanged( StateChangedType::Text );
}
OUString Window::GetText() const
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 3e14d44ad657..fa7cee61135e 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -512,7 +512,7 @@ void Window::SetZoom( const Fraction& rZoom )
if ( mpWindowImpl->maZoom != rZoom )
{
mpWindowImpl->maZoom = rZoom;
- StateChanged( StateChangedType::ZOOM );
+ StateChanged( StateChangedType::Zoom );
}
}
@@ -579,7 +579,7 @@ void Window::SetControlFont()
{
delete mpWindowImpl->mpControlFont;
mpWindowImpl->mpControlFont = NULL;
- StateChanged( StateChangedType::CONTROLFONT );
+ StateChanged( StateChangedType::ControlFont );
}
}
@@ -600,7 +600,7 @@ void Window::SetControlFont( const vcl::Font& rFont )
else
mpWindowImpl->mpControlFont = new vcl::Font( rFont );
- StateChanged( StateChangedType::CONTROLFONT );
+ StateChanged( StateChangedType::ControlFont );
}
vcl::Font Window::GetControlFont() const
@@ -620,7 +620,7 @@ void Window::SetControlForeground()
{
mpWindowImpl->maControlForeground = Color( COL_TRANSPARENT );
mpWindowImpl->mbControlForeground = false;
- StateChanged( StateChangedType::CONTROLFOREGROUND );
+ StateChanged( StateChangedType::ControlForeground );
}
}
@@ -632,7 +632,7 @@ void Window::SetControlForeground( const Color& rColor )
{
mpWindowImpl->maControlForeground = Color( COL_TRANSPARENT );
mpWindowImpl->mbControlForeground = false;
- StateChanged( StateChangedType::CONTROLFOREGROUND );
+ StateChanged( StateChangedType::ControlForeground );
}
}
else
@@ -641,7 +641,7 @@ void Window::SetControlForeground( const Color& rColor )
{
mpWindowImpl->maControlForeground = rColor;
mpWindowImpl->mbControlForeground = true;
- StateChanged( StateChangedType::CONTROLFOREGROUND );
+ StateChanged( StateChangedType::ControlForeground );
}
}
}
@@ -652,7 +652,7 @@ void Window::SetControlBackground()
{
mpWindowImpl->maControlBackground = Color( COL_TRANSPARENT );
mpWindowImpl->mbControlBackground = false;
- StateChanged( StateChangedType::CONTROLBACKGROUND );
+ StateChanged( StateChangedType::ControlBackground );
}
}
@@ -664,7 +664,7 @@ void Window::SetControlBackground( const Color& rColor )
{
mpWindowImpl->maControlBackground = Color( COL_TRANSPARENT );
mpWindowImpl->mbControlBackground = false;
- StateChanged( StateChangedType::CONTROLBACKGROUND );
+ StateChanged( StateChangedType::ControlBackground );
}
}
else
@@ -673,7 +673,7 @@ void Window::SetControlBackground( const Color& rColor )
{
mpWindowImpl->maControlBackground = rColor;
mpWindowImpl->mbControlBackground = true;
- StateChanged( StateChangedType::CONTROLBACKGROUND );
+ StateChanged( StateChangedType::ControlBackground );
}
}
}
@@ -1448,7 +1448,7 @@ void Window::queue_resize(StateChangedType eReason)
bool bSomeoneCares = queue_ungrouped_resize(this);
- if (eReason != StateChangedType::VISIBLE)
+ if (eReason != StateChangedType::Visible)
{
InvalidateSizeCache();
}
generated by cgit (git 2.34.1) at 2025-01-21 07:08:41 +0000