summaryrefslogtreecommitdiff
path: root/vcl/source/control
diff options
context:
space:
mode:
Diffstat (limited to 'vcl/source/control')
-rw-r--r--vcl/source/control/button.cxx6
-rw-r--r--vcl/source/control/combobox.cxx8
-rw-r--r--vcl/source/control/ctrl.cxx4
-rw-r--r--vcl/source/control/field.cxx36
-rw-r--r--vcl/source/control/field2.cxx36
-rw-r--r--vcl/source/control/ilstbox.cxx6
-rw-r--r--vcl/source/control/longcurr.cxx12
-rw-r--r--vcl/source/control/lstbox.cxx6
-rw-r--r--vcl/source/control/scrbar.cxx2
-rw-r--r--vcl/source/control/spinbtn.cxx2
-rw-r--r--vcl/source/control/spinfld.cxx6
-rw-r--r--vcl/source/control/tabctrl.cxx4
12 files changed, 64 insertions, 64 deletions
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 8712c22a14fe..afef44381368 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -1496,7 +1496,7 @@ bool PushButton::PreNotify( NotifyEvent& rNEvt )
{
const MouseEvent* pMouseEvt = NULL;
- if( (rNEvt.GetType() == EVENT_MOUSEMOVE) && (pMouseEvt = rNEvt.GetMouseEvent()) != NULL )
+ if( (rNEvt.GetType() == MouseNotifyEvent::MOUSEMOVE) && (pMouseEvt = rNEvt.GetMouseEvent()) != NULL )
{
if( pMouseEvt->IsEnterWindow() || pMouseEvt->IsLeaveWindow() )
{
@@ -2623,7 +2623,7 @@ bool RadioButton::PreNotify( NotifyEvent& rNEvt )
{
const MouseEvent* pMouseEvt = NULL;
- if( (rNEvt.GetType() == EVENT_MOUSEMOVE) && (pMouseEvt = rNEvt.GetMouseEvent()) != NULL )
+ if( (rNEvt.GetType() == MouseNotifyEvent::MOUSEMOVE) && (pMouseEvt = rNEvt.GetMouseEvent()) != NULL )
{
if( !pMouseEvt->GetButtons() && !pMouseEvt->IsSynthetic() && !pMouseEvt->IsModifierChanged() )
{
@@ -3557,7 +3557,7 @@ bool CheckBox::PreNotify( NotifyEvent& rNEvt )
{
const MouseEvent* pMouseEvt = NULL;
- if( (rNEvt.GetType() == EVENT_MOUSEMOVE) && (pMouseEvt = rNEvt.GetMouseEvent()) != NULL )
+ if( (rNEvt.GetType() == MouseNotifyEvent::MOUSEMOVE) && (pMouseEvt = rNEvt.GetMouseEvent()) != NULL )
{
if( !pMouseEvt->GetButtons() && !pMouseEvt->IsSynthetic() && !pMouseEvt->IsModifierChanged() )
{
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index 329e48a1237b..d35a64bf3006 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -690,7 +690,7 @@ bool ComboBox::PreNotify( NotifyEvent& rNEvt )
bool ComboBox::Notify( NotifyEvent& rNEvt )
{
bool nDone = false;
- if( ( rNEvt.GetType() == EVENT_KEYINPUT ) && ( rNEvt.GetWindow() == mpSubEdit )
+ if( ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT ) && ( rNEvt.GetWindow() == mpSubEdit )
&& !IsReadOnly() )
{
KeyEvent aKeyEvt = *rNEvt.GetKeyEvent();
@@ -737,14 +737,14 @@ bool ComboBox::Notify( NotifyEvent& rNEvt )
break;
}
}
- else if ( (rNEvt.GetType() == EVENT_LOSEFOCUS) && mpFloatWin )
+ else if ( (rNEvt.GetType() == MouseNotifyEvent::LOSEFOCUS) && mpFloatWin )
{
if( mpFloatWin->HasChildPathFocus() )
mpSubEdit->GrabFocus();
else if ( mpFloatWin->IsInPopupMode() && !HasChildPathFocus( true ) )
mpFloatWin->EndPopupMode();
}
- else if( (rNEvt.GetType() == EVENT_COMMAND) &&
+ else if( (rNEvt.GetType() == MouseNotifyEvent::COMMAND) &&
(rNEvt.GetCommandEvent()->GetCommand() == COMMAND_WHEEL) &&
(rNEvt.GetWindow() == mpSubEdit) )
{
@@ -762,7 +762,7 @@ bool ComboBox::Notify( NotifyEvent& rNEvt )
nDone = false; // don't eat this event, let the default handling happen (i.e. scroll the context)
}
}
- else if( ( rNEvt.GetType() == EVENT_MOUSEBUTTONDOWN ) && ( rNEvt.GetWindow() == &mpImplLB->GetMainWindow() ) )
+ else if( ( rNEvt.GetType() == MouseNotifyEvent::MOUSEBUTTONDOWN ) && ( rNEvt.GetWindow() == &mpImplLB->GetMainWindow() ) )
{
mpSubEdit->GrabFocus();
}
diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx
index 3654cbd51b48..612bf94fc2a0 100644
--- a/vcl/source/control/ctrl.cxx
+++ b/vcl/source/control/ctrl.cxx
@@ -243,7 +243,7 @@ OUString Control::GetDisplayText() const
bool Control::Notify( NotifyEvent& rNEvt )
{
- if ( rNEvt.GetType() == EVENT_GETFOCUS )
+ if ( rNEvt.GetType() == MouseNotifyEvent::GETFOCUS )
{
if ( !mbHasControlFocus )
{
@@ -256,7 +256,7 @@ bool Control::Notify( NotifyEvent& rNEvt )
}
else
{
- if ( rNEvt.GetType() == EVENT_LOSEFOCUS )
+ if ( rNEvt.GetType() == MouseNotifyEvent::LOSEFOCUS )
{
vcl::Window* pFocusWin = Application::GetFocusWindow();
if ( !pFocusWin || !ImplIsWindowOrChild( pFocusWin ) )
diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index 73d8e9a97a76..bd03aadfd947 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -772,7 +772,7 @@ NumericField::~NumericField()
bool NumericField::PreNotify( NotifyEvent& rNEvt )
{
- if ( (rNEvt.GetType() == EVENT_KEYINPUT) && !rNEvt.GetKeyEvent()->GetKeyCode().IsMod2() )
+ if ( (rNEvt.GetType() == MouseNotifyEvent::KEYINPUT) && !rNEvt.GetKeyEvent()->GetKeyCode().IsMod2() )
{
if ( ImplNumericProcessKeyInput( GetField(), *rNEvt.GetKeyEvent(), IsStrictFormat(), IsUseThousandSep(), ImplGetLocaleDataWrapper() ) )
return true;
@@ -783,9 +783,9 @@ bool NumericField::PreNotify( NotifyEvent& rNEvt )
bool NumericField::Notify( NotifyEvent& rNEvt )
{
- if ( rNEvt.GetType() == EVENT_GETFOCUS )
+ if ( rNEvt.GetType() == MouseNotifyEvent::GETFOCUS )
MarkToBeReformatted( false );
- else if ( rNEvt.GetType() == EVENT_LOSEFOCUS )
+ else if ( rNEvt.GetType() == MouseNotifyEvent::LOSEFOCUS )
{
if ( MustBeReformatted() && (!GetText().isEmpty() || !IsEmptyFieldValueEnabled()) )
Reformat();
@@ -909,7 +909,7 @@ NumericBox::~NumericBox()
bool NumericBox::PreNotify( NotifyEvent& rNEvt )
{
- if ( (rNEvt.GetType() == EVENT_KEYINPUT) && !rNEvt.GetKeyEvent()->GetKeyCode().IsMod2() )
+ if ( (rNEvt.GetType() == MouseNotifyEvent::KEYINPUT) && !rNEvt.GetKeyEvent()->GetKeyCode().IsMod2() )
{
if ( ImplNumericProcessKeyInput( GetField(), *rNEvt.GetKeyEvent(), IsStrictFormat(), IsUseThousandSep(), ImplGetLocaleDataWrapper() ) )
return true;
@@ -920,9 +920,9 @@ bool NumericBox::PreNotify( NotifyEvent& rNEvt )
bool NumericBox::Notify( NotifyEvent& rNEvt )
{
- if ( rNEvt.GetType() == EVENT_GETFOCUS )
+ if ( rNEvt.GetType() == MouseNotifyEvent::GETFOCUS )
MarkToBeReformatted( false );
- else if ( rNEvt.GetType() == EVENT_LOSEFOCUS )
+ else if ( rNEvt.GetType() == MouseNotifyEvent::LOSEFOCUS )
{
if ( MustBeReformatted() && (!GetText().isEmpty() || !IsEmptyFieldValueEnabled()) )
Reformat();
@@ -1655,7 +1655,7 @@ sal_Int64 MetricField::GetLast( FieldUnit eOutUnit ) const
bool MetricField::PreNotify( NotifyEvent& rNEvt )
{
- if ( (rNEvt.GetType() == EVENT_KEYINPUT) && !rNEvt.GetKeyEvent()->GetKeyCode().IsMod2() )
+ if ( (rNEvt.GetType() == MouseNotifyEvent::KEYINPUT) && !rNEvt.GetKeyEvent()->GetKeyCode().IsMod2() )
{
if ( ImplMetricProcessKeyInput( GetField(), *rNEvt.GetKeyEvent(), IsStrictFormat(), IsUseThousandSep(), ImplGetLocaleDataWrapper() ) )
return true;
@@ -1666,9 +1666,9 @@ bool MetricField::PreNotify( NotifyEvent& rNEvt )
bool MetricField::Notify( NotifyEvent& rNEvt )
{
- if ( rNEvt.GetType() == EVENT_GETFOCUS )
+ if ( rNEvt.GetType() == MouseNotifyEvent::GETFOCUS )
MarkToBeReformatted( false );
- else if ( rNEvt.GetType() == EVENT_LOSEFOCUS )
+ else if ( rNEvt.GetType() == MouseNotifyEvent::LOSEFOCUS )
{
if ( MustBeReformatted() && (!GetText().isEmpty() || !IsEmptyFieldValueEnabled()) )
Reformat();
@@ -1756,7 +1756,7 @@ MetricBox::~MetricBox()
bool MetricBox::PreNotify( NotifyEvent& rNEvt )
{
- if ( (rNEvt.GetType() == EVENT_KEYINPUT) && !rNEvt.GetKeyEvent()->GetKeyCode().IsMod2() )
+ if ( (rNEvt.GetType() == MouseNotifyEvent::KEYINPUT) && !rNEvt.GetKeyEvent()->GetKeyCode().IsMod2() )
{
if ( ImplMetricProcessKeyInput( GetField(), *rNEvt.GetKeyEvent(), IsStrictFormat(), IsUseThousandSep(), ImplGetLocaleDataWrapper() ) )
return true;
@@ -1767,9 +1767,9 @@ bool MetricBox::PreNotify( NotifyEvent& rNEvt )
bool MetricBox::Notify( NotifyEvent& rNEvt )
{
- if ( rNEvt.GetType() == EVENT_GETFOCUS )
+ if ( rNEvt.GetType() == MouseNotifyEvent::GETFOCUS )
MarkToBeReformatted( false );
- else if ( rNEvt.GetType() == EVENT_LOSEFOCUS )
+ else if ( rNEvt.GetType() == MouseNotifyEvent::LOSEFOCUS )
{
if ( MustBeReformatted() && (!GetText().isEmpty() || !IsEmptyFieldValueEnabled()) )
Reformat();
@@ -1986,7 +1986,7 @@ CurrencyField::~CurrencyField()
bool CurrencyField::PreNotify( NotifyEvent& rNEvt )
{
- if ( (rNEvt.GetType() == EVENT_KEYINPUT) && !rNEvt.GetKeyEvent()->GetKeyCode().IsMod2() )
+ if ( (rNEvt.GetType() == MouseNotifyEvent::KEYINPUT) && !rNEvt.GetKeyEvent()->GetKeyCode().IsMod2() )
{
if ( ImplCurrencyProcessKeyInput( GetField(), *rNEvt.GetKeyEvent(), IsStrictFormat(), IsUseThousandSep(), ImplGetLocaleDataWrapper() ) )
return true;
@@ -1997,9 +1997,9 @@ bool CurrencyField::PreNotify( NotifyEvent& rNEvt )
bool CurrencyField::Notify( NotifyEvent& rNEvt )
{
- if ( rNEvt.GetType() == EVENT_GETFOCUS )
+ if ( rNEvt.GetType() == MouseNotifyEvent::GETFOCUS )
MarkToBeReformatted( false );
- else if ( rNEvt.GetType() == EVENT_LOSEFOCUS )
+ else if ( rNEvt.GetType() == MouseNotifyEvent::LOSEFOCUS )
{
if ( MustBeReformatted() && (!GetText().isEmpty() || !IsEmptyFieldValueEnabled()) )
Reformat();
@@ -2068,7 +2068,7 @@ CurrencyBox::~CurrencyBox()
bool CurrencyBox::PreNotify( NotifyEvent& rNEvt )
{
- if ( (rNEvt.GetType() == EVENT_KEYINPUT) && !rNEvt.GetKeyEvent()->GetKeyCode().IsMod2() )
+ if ( (rNEvt.GetType() == MouseNotifyEvent::KEYINPUT) && !rNEvt.GetKeyEvent()->GetKeyCode().IsMod2() )
{
if ( ImplCurrencyProcessKeyInput( GetField(), *rNEvt.GetKeyEvent(), IsStrictFormat(), IsUseThousandSep(), ImplGetLocaleDataWrapper() ) )
return true;
@@ -2079,9 +2079,9 @@ bool CurrencyBox::PreNotify( NotifyEvent& rNEvt )
bool CurrencyBox::Notify( NotifyEvent& rNEvt )
{
- if ( rNEvt.GetType() == EVENT_GETFOCUS )
+ if ( rNEvt.GetType() == MouseNotifyEvent::GETFOCUS )
MarkToBeReformatted( false );
- else if ( rNEvt.GetType() == EVENT_LOSEFOCUS )
+ else if ( rNEvt.GetType() == MouseNotifyEvent::LOSEFOCUS )
{
if ( MustBeReformatted() && (!GetText().isEmpty() || !IsEmptyFieldValueEnabled()) )
Reformat();
diff --git a/vcl/source/control/field2.cxx b/vcl/source/control/field2.cxx
index 326b94673b5f..0a651c7f191c 100644
--- a/vcl/source/control/field2.cxx
+++ b/vcl/source/control/field2.cxx
@@ -826,7 +826,7 @@ PatternField::~PatternField()
bool PatternField::PreNotify( NotifyEvent& rNEvt )
{
- if ( (rNEvt.GetType() == EVENT_KEYINPUT) && !rNEvt.GetKeyEvent()->GetKeyCode().IsMod2() )
+ if ( (rNEvt.GetType() == MouseNotifyEvent::KEYINPUT) && !rNEvt.GetKeyEvent()->GetKeyCode().IsMod2() )
{
if ( ImplPatternProcessKeyInput( GetField(), *rNEvt.GetKeyEvent(), GetEditMask(), GetLiteralMask(),
IsStrictFormat(), GetFormatFlags(),
@@ -839,9 +839,9 @@ bool PatternField::PreNotify( NotifyEvent& rNEvt )
bool PatternField::Notify( NotifyEvent& rNEvt )
{
- if ( rNEvt.GetType() == EVENT_GETFOCUS )
+ if ( rNEvt.GetType() == MouseNotifyEvent::GETFOCUS )
MarkToBeReformatted( false );
- else if ( rNEvt.GetType() == EVENT_LOSEFOCUS )
+ else if ( rNEvt.GetType() == MouseNotifyEvent::LOSEFOCUS )
{
if ( MustBeReformatted() && (!GetText().isEmpty() || !IsEmptyFieldValueEnabled()) )
Reformat();
@@ -876,7 +876,7 @@ PatternBox::~PatternBox()
bool PatternBox::PreNotify( NotifyEvent& rNEvt )
{
- if ( (rNEvt.GetType() == EVENT_KEYINPUT) && !rNEvt.GetKeyEvent()->GetKeyCode().IsMod2() )
+ if ( (rNEvt.GetType() == MouseNotifyEvent::KEYINPUT) && !rNEvt.GetKeyEvent()->GetKeyCode().IsMod2() )
{
if ( ImplPatternProcessKeyInput( GetField(), *rNEvt.GetKeyEvent(), GetEditMask(), GetLiteralMask(),
IsStrictFormat(), GetFormatFlags(),
@@ -889,9 +889,9 @@ bool PatternBox::PreNotify( NotifyEvent& rNEvt )
bool PatternBox::Notify( NotifyEvent& rNEvt )
{
- if ( rNEvt.GetType() == EVENT_GETFOCUS )
+ if ( rNEvt.GetType() == MouseNotifyEvent::GETFOCUS )
MarkToBeReformatted( false );
- else if ( rNEvt.GetType() == EVENT_LOSEFOCUS )
+ else if ( rNEvt.GetType() == MouseNotifyEvent::LOSEFOCUS )
{
if ( MustBeReformatted() && (!GetText().isEmpty() || !IsEmptyFieldValueEnabled()) )
Reformat();
@@ -1822,7 +1822,7 @@ DateField::~DateField()
bool DateField::PreNotify( NotifyEvent& rNEvt )
{
- if ( (rNEvt.GetType() == EVENT_KEYINPUT) && IsStrictFormat() &&
+ if ( (rNEvt.GetType() == MouseNotifyEvent::KEYINPUT) && IsStrictFormat() &&
( GetExtDateFormat() != XTDATEF_SYSTEM_LONG ) &&
!rNEvt.GetKeyEvent()->GetKeyCode().IsMod2() )
{
@@ -1835,9 +1835,9 @@ bool DateField::PreNotify( NotifyEvent& rNEvt )
bool DateField::Notify( NotifyEvent& rNEvt )
{
- if ( rNEvt.GetType() == EVENT_GETFOCUS )
+ if ( rNEvt.GetType() == MouseNotifyEvent::GETFOCUS )
MarkToBeReformatted( false );
- else if ( rNEvt.GetType() == EVENT_LOSEFOCUS )
+ else if ( rNEvt.GetType() == MouseNotifyEvent::LOSEFOCUS )
{
if ( MustBeReformatted() )
{
@@ -1925,7 +1925,7 @@ DateBox::~DateBox()
bool DateBox::PreNotify( NotifyEvent& rNEvt )
{
- if ( (rNEvt.GetType() == EVENT_KEYINPUT) && IsStrictFormat() &&
+ if ( (rNEvt.GetType() == MouseNotifyEvent::KEYINPUT) && IsStrictFormat() &&
( GetExtDateFormat() != XTDATEF_SYSTEM_LONG ) &&
!rNEvt.GetKeyEvent()->GetKeyCode().IsMod2() )
{
@@ -1950,9 +1950,9 @@ void DateBox::DataChanged( const DataChangedEvent& rDCEvt )
bool DateBox::Notify( NotifyEvent& rNEvt )
{
- if ( rNEvt.GetType() == EVENT_GETFOCUS )
+ if ( rNEvt.GetType() == MouseNotifyEvent::GETFOCUS )
MarkToBeReformatted( false );
- else if ( rNEvt.GetType() == EVENT_LOSEFOCUS )
+ else if ( rNEvt.GetType() == MouseNotifyEvent::LOSEFOCUS )
{
if ( MustBeReformatted() )
{
@@ -2699,7 +2699,7 @@ TimeField::~TimeField()
bool TimeField::PreNotify( NotifyEvent& rNEvt )
{
- if ( (rNEvt.GetType() == EVENT_KEYINPUT) && !rNEvt.GetKeyEvent()->GetKeyCode().IsMod2() )
+ if ( (rNEvt.GetType() == MouseNotifyEvent::KEYINPUT) && !rNEvt.GetKeyEvent()->GetKeyCode().IsMod2() )
{
if ( ImplTimeProcessKeyInput( GetField(), *rNEvt.GetKeyEvent(), IsStrictFormat(), IsDuration(), GetFormat(), ImplGetLocaleDataWrapper() ) )
return true;
@@ -2710,9 +2710,9 @@ bool TimeField::PreNotify( NotifyEvent& rNEvt )
bool TimeField::Notify( NotifyEvent& rNEvt )
{
- if ( rNEvt.GetType() == EVENT_GETFOCUS )
+ if ( rNEvt.GetType() == MouseNotifyEvent::GETFOCUS )
MarkToBeReformatted( false );
- else if ( rNEvt.GetType() == EVENT_LOSEFOCUS )
+ else if ( rNEvt.GetType() == MouseNotifyEvent::LOSEFOCUS )
{
if ( MustBeReformatted() && (!GetText().isEmpty() || !IsEmptyFieldValueEnabled()) )
{
@@ -2840,7 +2840,7 @@ TimeBox::~TimeBox()
bool TimeBox::PreNotify( NotifyEvent& rNEvt )
{
- if ( (rNEvt.GetType() == EVENT_KEYINPUT) && !rNEvt.GetKeyEvent()->GetKeyCode().IsMod2() )
+ if ( (rNEvt.GetType() == MouseNotifyEvent::KEYINPUT) && !rNEvt.GetKeyEvent()->GetKeyCode().IsMod2() )
{
if ( ImplTimeProcessKeyInput( GetField(), *rNEvt.GetKeyEvent(), IsStrictFormat(), IsDuration(), GetFormat(), ImplGetLocaleDataWrapper() ) )
return true;
@@ -2851,9 +2851,9 @@ bool TimeBox::PreNotify( NotifyEvent& rNEvt )
bool TimeBox::Notify( NotifyEvent& rNEvt )
{
- if ( rNEvt.GetType() == EVENT_GETFOCUS )
+ if ( rNEvt.GetType() == MouseNotifyEvent::GETFOCUS )
MarkToBeReformatted( false );
- else if ( rNEvt.GetType() == EVENT_LOSEFOCUS )
+ else if ( rNEvt.GetType() == MouseNotifyEvent::LOSEFOCUS )
{
if ( MustBeReformatted() && (!GetText().isEmpty() || !IsEmptyFieldValueEnabled()) )
Reformat();
diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx
index 62db0c7afd92..d4a427643387 100644
--- a/vcl/source/control/ilstbox.cxx
+++ b/vcl/source/control/ilstbox.cxx
@@ -2494,7 +2494,7 @@ void ImplListBox::DataChanged( const DataChangedEvent& rDCEvt )
bool ImplListBox::Notify( NotifyEvent& rNEvt )
{
bool nDone = false;
- if ( rNEvt.GetType() == EVENT_COMMAND )
+ if ( rNEvt.GetType() == MouseNotifyEvent::COMMAND )
{
const CommandEvent& rCEvt = *rNEvt.GetCommandEvent();
if ( rCEvt.GetCommand() == COMMAND_WHEEL )
@@ -2622,7 +2622,7 @@ bool ImplWin::PreNotify( NotifyEvent& rNEvt )
{
const MouseEvent* pMouseEvt = NULL;
- if( (rNEvt.GetType() == EVENT_MOUSEMOVE) && (pMouseEvt = rNEvt.GetMouseEvent()) != NULL )
+ if( (rNEvt.GetType() == MouseNotifyEvent::MOUSEMOVE) && (pMouseEvt = rNEvt.GetMouseEvent()) != NULL )
{
if( pMouseEvt->IsEnterWindow() || pMouseEvt->IsLeaveWindow() )
{
@@ -2915,7 +2915,7 @@ ImplListBoxFloatingWindow::ImplListBoxFloatingWindow( vcl::Window* pParent ) :
bool ImplListBoxFloatingWindow::PreNotify( NotifyEvent& rNEvt )
{
- if( rNEvt.GetType() == EVENT_LOSEFOCUS )
+ if( rNEvt.GetType() == MouseNotifyEvent::LOSEFOCUS )
{
if( !GetParent()->HasChildPathFocus( true ) )
EndPopupMode();
diff --git a/vcl/source/control/longcurr.cxx b/vcl/source/control/longcurr.cxx
index 3b6bd4570a79..1393de0a589a 100644
--- a/vcl/source/control/longcurr.cxx
+++ b/vcl/source/control/longcurr.cxx
@@ -472,7 +472,7 @@ LongCurrencyField::~LongCurrencyField()
bool LongCurrencyField::PreNotify( NotifyEvent& rNEvt )
{
- if( rNEvt.GetType() == EVENT_KEYINPUT )
+ if( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT )
{
if ( ImplLongCurrencyProcessKeyInput( GetField(), *rNEvt.GetKeyEvent(), IsStrictFormat(), IsUseThousandSep(), GetLocaleDataWrapper() ) )
return true;
@@ -482,11 +482,11 @@ bool LongCurrencyField::PreNotify( NotifyEvent& rNEvt )
bool LongCurrencyField::Notify( NotifyEvent& rNEvt )
{
- if( rNEvt.GetType() == EVENT_GETFOCUS )
+ if( rNEvt.GetType() == MouseNotifyEvent::GETFOCUS )
{
MarkToBeReformatted( false );
}
- else if( rNEvt.GetType() == EVENT_LOSEFOCUS )
+ else if( rNEvt.GetType() == MouseNotifyEvent::LOSEFOCUS )
{
if ( MustBeReformatted() )
{
@@ -550,7 +550,7 @@ LongCurrencyBox::~LongCurrencyBox()
bool LongCurrencyBox::PreNotify( NotifyEvent& rNEvt )
{
- if( rNEvt.GetType() == EVENT_KEYINPUT )
+ if( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT )
{
if ( ImplLongCurrencyProcessKeyInput( GetField(), *rNEvt.GetKeyEvent(), IsStrictFormat(), IsUseThousandSep(), GetLocaleDataWrapper() ) )
return true;
@@ -560,11 +560,11 @@ bool LongCurrencyBox::PreNotify( NotifyEvent& rNEvt )
bool LongCurrencyBox::Notify( NotifyEvent& rNEvt )
{
- if( rNEvt.GetType() == EVENT_GETFOCUS )
+ if( rNEvt.GetType() == MouseNotifyEvent::GETFOCUS )
{
MarkToBeReformatted( false );
}
- else if( rNEvt.GetType() == EVENT_LOSEFOCUS )
+ else if( rNEvt.GetType() == MouseNotifyEvent::LOSEFOCUS )
{
if ( MustBeReformatted() )
{
diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx
index ee8884dc04c4..867cea50e705 100644
--- a/vcl/source/control/lstbox.cxx
+++ b/vcl/source/control/lstbox.cxx
@@ -878,7 +878,7 @@ bool ListBox::PreNotify( NotifyEvent& rNEvt )
bool nDone = false;
if ( mpImplLB )
{
- if( ( rNEvt.GetType() == EVENT_KEYINPUT ) && ( rNEvt.GetWindow() == mpImplWin ) )
+ if( ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT ) && ( rNEvt.GetWindow() == mpImplWin ) )
{
KeyEvent aKeyEvt = *rNEvt.GetKeyEvent();
switch( aKeyEvt.GetKeyCode().GetCode() )
@@ -930,12 +930,12 @@ bool ListBox::PreNotify( NotifyEvent& rNEvt )
}
}
}
- else if ( rNEvt.GetType() == EVENT_LOSEFOCUS )
+ else if ( rNEvt.GetType() == MouseNotifyEvent::LOSEFOCUS )
{
if ( IsInDropDown() && !HasChildPathFocus( true ) )
mpFloatWin->EndPopupMode();
}
- else if ( (rNEvt.GetType() == EVENT_COMMAND) &&
+ else if ( (rNEvt.GetType() == MouseNotifyEvent::COMMAND) &&
(rNEvt.GetCommandEvent()->GetCommand() == COMMAND_WHEEL) &&
(rNEvt.GetWindow() == mpImplWin) )
{
diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx
index 1af0b65f4c8e..06920fe036bc 100644
--- a/vcl/source/control/scrbar.cxx
+++ b/vcl/source/control/scrbar.cxx
@@ -1259,7 +1259,7 @@ bool ScrollBar::PreNotify( NotifyEvent& rNEvt )
{
const MouseEvent* pMouseEvt = NULL;
- if( (rNEvt.GetType() == EVENT_MOUSEMOVE) && (pMouseEvt = rNEvt.GetMouseEvent()) != NULL )
+ if( (rNEvt.GetType() == MouseNotifyEvent::MOUSEMOVE) && (pMouseEvt = rNEvt.GetMouseEvent()) != NULL )
{
if( !pMouseEvt->GetButtons() && !pMouseEvt->IsSynthetic() && !pMouseEvt->IsModifierChanged() )
{
diff --git a/vcl/source/control/spinbtn.cxx b/vcl/source/control/spinbtn.cxx
index 122aed10c89d..9b16b4753751 100644
--- a/vcl/source/control/spinbtn.cxx
+++ b/vcl/source/control/spinbtn.cxx
@@ -446,7 +446,7 @@ bool SpinButton::PreNotify( NotifyEvent& rNEvt )
{
const MouseEvent* pMouseEvt = NULL;
- if( (rNEvt.GetType() == EVENT_MOUSEMOVE) && (pMouseEvt = rNEvt.GetMouseEvent()) != NULL )
+ if( (rNEvt.GetType() == MouseNotifyEvent::MOUSEMOVE) && (pMouseEvt = rNEvt.GetMouseEvent()) != NULL )
{
if( !pMouseEvt->GetButtons() && !pMouseEvt->IsSynthetic() && !pMouseEvt->IsModifierChanged() )
{
diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx
index 97e6633a7dbf..0ab79c9f70a7 100644
--- a/vcl/source/control/spinfld.cxx
+++ b/vcl/source/control/spinfld.cxx
@@ -497,7 +497,7 @@ void SpinField::MouseMove( const MouseEvent& rMEvt )
bool SpinField::Notify( NotifyEvent& rNEvt )
{
bool nDone = false;
- if( rNEvt.GetType() == EVENT_KEYINPUT )
+ if( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT )
{
const KeyEvent& rKEvt = *rNEvt.GetKeyEvent();
if ( !IsReadOnly() )
@@ -551,7 +551,7 @@ bool SpinField::Notify( NotifyEvent& rNEvt )
}
}
- if ( rNEvt.GetType() == EVENT_COMMAND )
+ if ( rNEvt.GetType() == MouseNotifyEvent::COMMAND )
{
if ( ( rNEvt.GetCommandEvent()->GetCommand() == COMMAND_WHEEL ) && !IsReadOnly() )
{
@@ -856,7 +856,7 @@ bool SpinField::PreNotify( NotifyEvent& rNEvt )
{
const MouseEvent* pMouseEvt = NULL;
- if( (rNEvt.GetType() == EVENT_MOUSEMOVE) && (pMouseEvt = rNEvt.GetMouseEvent()) != NULL )
+ if( (rNEvt.GetType() == MouseNotifyEvent::MOUSEMOVE) && (pMouseEvt = rNEvt.GetMouseEvent()) != NULL )
{
if( !pMouseEvt->GetButtons() && !pMouseEvt->IsSynthetic() && !pMouseEvt->IsModifierChanged() )
{
diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index 2fb87dc3948f..e36acc02ac54 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -1533,7 +1533,7 @@ bool TabControl::PreNotify( NotifyEvent& rNEvt )
{
const MouseEvent* pMouseEvt = NULL;
- if( (rNEvt.GetType() == EVENT_MOUSEMOVE) && (pMouseEvt = rNEvt.GetMouseEvent()) != NULL )
+ if( (rNEvt.GetType() == MouseNotifyEvent::MOUSEMOVE) && (pMouseEvt = rNEvt.GetMouseEvent()) != NULL )
{
if( !pMouseEvt->GetButtons() && !pMouseEvt->IsSynthetic() && !pMouseEvt->IsModifierChanged() )
{
@@ -1581,7 +1581,7 @@ bool TabControl::Notify( NotifyEvent& rNEvt )
{
bool nRet = false;
- if ( rNEvt.GetType() == EVENT_KEYINPUT )
+ if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT )
nRet = ImplHandleKeyEvent( *rNEvt.GetKeyEvent() );
return nRet || Control::Notify( rNEvt );
generated by cgit (git 2.34.1) at 2025-05-18 22:26:16 +0000