diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-13 19:08:14 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-02-14 10:44:08 +0000 |
commit | 8c00536d87010b14a95e9c81f2f5f1d683e5fa70 (patch) | |
tree | 92ac779cef9c4f5adb1421f8eee51a301dc8ef61 /vcl/source/control/edit.cxx | |
parent | 5815ca4ef1126140e08f3a1d106bcadc41044505 (diff) |
Convert WindowType to scoped enum
Change-Id: I85cfe02f28729e13f2c0dd3d91cd89e6f3e3b6a9
Reviewed-on: https://gerrit.libreoffice.org/34219
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl/source/control/edit.cxx')
-rw-r--r-- | vcl/source/control/edit.cxx | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index a81ec9527ad4..95dc4d916c10 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -156,7 +156,7 @@ Edit::Edit( WindowType nType ) } Edit::Edit( vcl::Window* pParent, WinBits nStyle ) - : Control( WINDOW_EDIT ) + : Control( WindowType::EDIT ) { ImplInitEditData(); ImplInit( pParent, nStyle ); @@ -262,7 +262,7 @@ void Edit::dispose() mxDnDListener.clear(); } - SetType(WINDOW_WINDOW); + SetType(WindowType::WINDOW); mpSubEdit.disposeAndClear(); Control::dispose(); @@ -939,33 +939,33 @@ ControlType Edit::ImplGetNativeControlType() const switch (pControl->GetType()) { - case WINDOW_COMBOBOX: - case WINDOW_PATTERNBOX: - case WINDOW_NUMERICBOX: - case WINDOW_METRICBOX: - case WINDOW_CURRENCYBOX: - case WINDOW_DATEBOX: - case WINDOW_TIMEBOX: - case WINDOW_LONGCURRENCYBOX: + case WindowType::COMBOBOX: + case WindowType::PATTERNBOX: + case WindowType::NUMERICBOX: + case WindowType::METRICBOX: + case WindowType::CURRENCYBOX: + case WindowType::DATEBOX: + case WindowType::TIMEBOX: + case WindowType::LONGCURRENCYBOX: nCtrl = ControlType::Combobox; break; - case WINDOW_MULTILINEEDIT: + case WindowType::MULTILINEEDIT: if ( GetWindow( GetWindowType::Border ) != this ) nCtrl = ControlType::MultilineEditbox; else nCtrl = ControlType::EditboxNoBorder; break; - case WINDOW_EDIT: - case WINDOW_PATTERNFIELD: - case WINDOW_METRICFIELD: - case WINDOW_CURRENCYFIELD: - case WINDOW_DATEFIELD: - case WINDOW_TIMEFIELD: - case WINDOW_LONGCURRENCYFIELD: - case WINDOW_NUMERICFIELD: - case WINDOW_SPINFIELD: + case WindowType::EDIT: + case WindowType::PATTERNFIELD: + case WindowType::METRICFIELD: + case WindowType::CURRENCYFIELD: + case WindowType::DATEFIELD: + case WindowType::TIMEFIELD: + case WindowType::LONGCURRENCYFIELD: + case WindowType::NUMERICFIELD: + case WindowType::SPINFIELD: if (pControl->GetStyle() & WB_SPIN) nCtrl = ControlType::Spinbox; else @@ -2520,7 +2520,7 @@ void Edit::ImplSetSelection( const Selection& rSelection, bool bPaint ) } // #103511# notify combobox listeners of deselection - if( !maSelection && GetParent() && GetParent()->GetType() == WINDOW_COMBOBOX ) + if( !maSelection && GetParent() && GetParent()->GetType() == WindowType::COMBOBOX ) static_cast<Edit*>(GetParent())->CallEventListeners( VclEventId::ComboboxDeselect ); } } |