diff options
Diffstat (limited to 'vcl')
29 files changed, 164 insertions, 163 deletions
diff --git a/vcl/inc/window.h b/vcl/inc/window.h index fe1c9fbaf133..6e6129b1b1b4 100644 --- a/vcl/inc/window.h +++ b/vcl/inc/window.h @@ -51,6 +51,7 @@ class VCLXWindow; class SalFrame; class SalObject; enum class MouseEventModifiers; +enum class MouseNotifyEvent; namespace com { namespace sun { @@ -377,7 +378,7 @@ public: // helper methods -bool ImplHandleMouseEvent( vcl::Window* pWindow, sal_uInt16 nSVEvent, bool bMouseLeave, +bool ImplHandleMouseEvent( vcl::Window* pWindow, MouseNotifyEvent nSVEvent, bool bMouseLeave, long nX, long nY, sal_uIntPtr nMsgTime, sal_uInt16 nCode, MouseEventModifiers nMode ); void ImplHandleResize( vcl::Window* pWindow, long nNewWidth, long nNewHeight ); diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx index 5e81c6bf586a..26ff137bc763 100644 --- a/vcl/osx/salinst.cxx +++ b/vcl/osx/salinst.cxx @@ -521,7 +521,7 @@ void AquaSalInstance::handleAppDefinedEvent( NSEvent* pEvent ) { const Point aPoint; CommandEvent aCEvt( aPoint, COMMAND_MEDIA, FALSE, &nCommand ); - NotifyEvent aNCmdEvt( EVENT_COMMAND, pWindow, &aCEvt ); + NotifyEvent aNCmdEvt( MouseNotifyEvent::COMMAND, pWindow, &aCEvt ); if ( !ImplCallPreNotify( aNCmdEvt ) ) pWindow->Command( aCEvt ); 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 ); diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx index 7314fa1386c9..0ec3741d03bc 100644 --- a/vcl/source/edit/vclmedit.cxx +++ b/vcl/source/edit/vclmedit.cxx @@ -1381,7 +1381,7 @@ void VclMultiLineEdit::Draw( OutputDevice* pDev, const Point& rPos, const Size& bool VclMultiLineEdit::Notify( NotifyEvent& rNEvt ) { bool nDone = false; - if( rNEvt.GetType() == EVENT_COMMAND ) + if( rNEvt.GetType() == MouseNotifyEvent::COMMAND ) { nDone = pImpVclMEdit->HandleCommand( *rNEvt.GetCommandEvent() ); } @@ -1392,7 +1392,7 @@ bool VclMultiLineEdit::PreNotify( NotifyEvent& rNEvt ) { bool nDone = false; - if( ( rNEvt.GetType() == EVENT_KEYINPUT ) && ( !GetTextView()->IsCursorEnabled() ) ) + if( ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT ) && ( !GetTextView()->IsCursorEnabled() ) ) { const KeyEvent& rKEvent = *rNEvt.GetKeyEvent(); if ( !rKEvent.GetKeyCode().IsShift() && ( rKEvent.GetKeyCode().GetGroup() == KEYGROUP_CURSOR ) ) diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index 917af60fea41..6848c298dc16 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -557,7 +557,7 @@ bool Dialog::Notify( NotifyEvent& rNEvt ) bool nRet = SystemWindow::Notify( rNEvt ); if ( !nRet ) { - if ( rNEvt.GetType() == EVENT_KEYINPUT ) + if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT ) { const KeyEvent* pKEvt = rNEvt.GetKeyEvent(); vcl::KeyCode aKeyCode = pKEvt->GetKeyCode(); @@ -574,7 +574,7 @@ bool Dialog::Notify( NotifyEvent& rNEvt ) return true; } } - else if ( rNEvt.GetType() == EVENT_GETFOCUS ) + else if ( rNEvt.GetType() == MouseNotifyEvent::GETFOCUS ) { // make sure the dialog is still modal // changing focus between application frames may @@ -770,7 +770,7 @@ bool Dialog::ImplStartExecuteModal() if ( GetParent() ) { - NotifyEvent aNEvt( EVENT_EXECUTEDIALOG, this ); + NotifyEvent aNEvt( MouseNotifyEvent::EXECUTEDIALOG, this ); GetParent()->Notify( aNEvt ); } mbInExecute = true; @@ -939,7 +939,7 @@ void Dialog::EndDialog( long nResult ) EnableSaveBackground( mbOldSaveBack ); if ( GetParent() ) { - NotifyEvent aNEvt( EVENT_ENDEXECUTEDIALOG, this ); + NotifyEvent aNEvt( MouseNotifyEvent::ENDEXECUTEDIALOG, this ); GetParent()->Notify( aNEvt ); } diff --git a/vcl/source/window/dlgctrl.cxx b/vcl/source/window/dlgctrl.cxx index 77ac0f17f029..a7d6e7ad9f82 100644 --- a/vcl/source/window/dlgctrl.cxx +++ b/vcl/source/window/dlgctrl.cxx @@ -687,11 +687,11 @@ bool Window::ImplDlgCtrl( const KeyEvent& rKEvt, bool bKeyInput ) // in case AROUND is being processed if ( pTempWindow && (pTempWindow == pSWindow) ) { - NotifyEvent aNEvt1( EVENT_LOSEFOCUS, pSWindow ); + NotifyEvent aNEvt1( MouseNotifyEvent::LOSEFOCUS, pSWindow ); if ( !ImplCallPreNotify( aNEvt1 ) ) pSWindow->LoseFocus(); pSWindow->mpWindowImpl->mnGetFocusFlags = nGetFocusFlags | GETFOCUS_AROUND; - NotifyEvent aNEvt2( EVENT_GETFOCUS, pSWindow ); + NotifyEvent aNEvt2( MouseNotifyEvent::GETFOCUS, pSWindow ); if ( !ImplCallPreNotify( aNEvt2 ) ) pSWindow->GetFocus(); pSWindow->mpWindowImpl->mnGetFocusFlags = 0; @@ -819,11 +819,11 @@ bool Window::ImplDlgCtrl( const KeyEvent& rKEvt, bool bKeyInput ) // in case AROUND is being processed if ( pWindow == pSWindow ) { - NotifyEvent aNEvt1( EVENT_LOSEFOCUS, pSWindow ); + NotifyEvent aNEvt1( MouseNotifyEvent::LOSEFOCUS, pSWindow ); if ( !ImplCallPreNotify( aNEvt1 ) ) pSWindow->LoseFocus(); pSWindow->mpWindowImpl->mnGetFocusFlags = nGetFocusFlags | GETFOCUS_AROUND; - NotifyEvent aNEvt2( EVENT_GETFOCUS, pSWindow ); + NotifyEvent aNEvt2( MouseNotifyEvent::GETFOCUS, pSWindow ); if ( !ImplCallPreNotify( aNEvt2 ) ) pSWindow->GetFocus(); pSWindow->mpWindowImpl->mnGetFocusFlags = 0; diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx index c487bfe7b390..057a8c525504 100644 --- a/vcl/source/window/dockwin.cxx +++ b/vcl/source/window/dockwin.cxx @@ -561,7 +561,7 @@ bool DockingWindow::Notify( NotifyEvent& rNEvt ) if ( mbDockable ) { - if ( rNEvt.GetType() == EVENT_MOUSEBUTTONDOWN ) + if ( rNEvt.GetType() == MouseNotifyEvent::MOUSEBUTTONDOWN ) { const MouseEvent* pMEvt = rNEvt.GetMouseEvent(); if ( pMEvt->IsLeft() ) @@ -591,7 +591,7 @@ bool DockingWindow::Notify( NotifyEvent& rNEvt ) } } } - else if( rNEvt.GetType() == EVENT_KEYINPUT ) + else if( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT ) { const vcl::KeyCode& rKey = rNEvt.GetKeyEvent()->GetKeyCode(); if( rKey.GetCode() == KEY_F10 && rKey.GetModifier() && diff --git a/vcl/source/window/event.cxx b/vcl/source/window/event.cxx index 995fd7661a2d..01fb32213ff8 100644 --- a/vcl/source/window/event.cxx +++ b/vcl/source/window/event.cxx @@ -57,7 +57,7 @@ bool Window::PreNotify( NotifyEvent& rNEvt ) if ( !bDone ) { - if( rNEvt.GetType() == EVENT_GETFOCUS ) + if( rNEvt.GetType() == MouseNotifyEvent::GETFOCUS ) { bool bCompoundFocusChanged = false; if ( mpWindowImpl->mbCompoundControl && !mpWindowImpl->mbCompoundControlHasFocus && HasChildPathFocus() ) @@ -69,7 +69,7 @@ bool Window::PreNotify( NotifyEvent& rNEvt ) if ( bCompoundFocusChanged || ( rNEvt.GetWindow() == this ) ) ImplCallEventListeners( VCLEVENT_WINDOW_GETFOCUS ); } - else if( rNEvt.GetType() == EVENT_LOSEFOCUS ) + else if( rNEvt.GetType() == MouseNotifyEvent::LOSEFOCUS ) { bool bCompoundFocusChanged = false; if ( mpWindowImpl->mbCompoundControl && mpWindowImpl->mbCompoundControlHasFocus && !HasChildPathFocus() ) @@ -99,7 +99,7 @@ bool Window::Notify( NotifyEvent& rNEvt ) ImplDockingWindowWrapper *pWrapper = ImplGetDockingManager()->GetDockingWindowWrapper( this ); if( pWrapper && !( !pWrapper->IsFloatingMode() && pWrapper->IsLocked() ) ) { - if ( rNEvt.GetType() == EVENT_MOUSEBUTTONDOWN ) + if ( rNEvt.GetType() == MouseNotifyEvent::MOUSEBUTTONDOWN ) { const MouseEvent* pMEvt = rNEvt.GetMouseEvent(); bool bHit = pWrapper->GetDragArea().IsInside( pMEvt->GetPosPixel() ); @@ -119,7 +119,7 @@ bool Window::Notify( NotifyEvent& rNEvt ) } } } - else if ( rNEvt.GetType() == EVENT_MOUSEMOVE ) + else if ( rNEvt.GetType() == MouseNotifyEvent::MOUSEMOVE ) { const MouseEvent* pMEvt = rNEvt.GetMouseEvent(); bool bHit = pWrapper->GetDragArea().IsInside( pMEvt->GetPosPixel() ); @@ -142,7 +142,7 @@ bool Window::Notify( NotifyEvent& rNEvt ) return true; } } - else if( rNEvt.GetType() == EVENT_KEYINPUT ) + else if( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT ) { const vcl::KeyCode& rKey = rNEvt.GetKeyEvent()->GetKeyCode(); if( rKey.GetCode() == KEY_F10 && rKey.GetModifier() && @@ -166,18 +166,18 @@ bool Window::Notify( NotifyEvent& rNEvt ) if ( (GetStyle() & (WB_DIALOGCONTROL | WB_NODIALOGCONTROL)) == WB_DIALOGCONTROL ) { // if the parent also has dialog control activated, the parent takes over control - if ( (rNEvt.GetType() == EVENT_KEYINPUT) || (rNEvt.GetType() == EVENT_KEYUP) ) + if ( (rNEvt.GetType() == MouseNotifyEvent::KEYINPUT) || (rNEvt.GetType() == MouseNotifyEvent::KEYUP) ) { if ( ImplIsOverlapWindow() || ((getNonLayoutRealParent(this)->GetStyle() & (WB_DIALOGCONTROL | WB_NODIALOGCONTROL)) != WB_DIALOGCONTROL) ) { - nRet = ImplDlgCtrl( *rNEvt.GetKeyEvent(), rNEvt.GetType() == EVENT_KEYINPUT ); + nRet = ImplDlgCtrl( *rNEvt.GetKeyEvent(), rNEvt.GetType() == MouseNotifyEvent::KEYINPUT ); } } - else if ( (rNEvt.GetType() == EVENT_GETFOCUS) || (rNEvt.GetType() == EVENT_LOSEFOCUS) ) + else if ( (rNEvt.GetType() == MouseNotifyEvent::GETFOCUS) || (rNEvt.GetType() == MouseNotifyEvent::LOSEFOCUS) ) { - ImplDlgCtrlFocusChanged( rNEvt.GetWindow(), rNEvt.GetType() == EVENT_GETFOCUS ); - if ( (rNEvt.GetWindow() == this) && (rNEvt.GetType() == EVENT_GETFOCUS) && + ImplDlgCtrlFocusChanged( rNEvt.GetWindow(), rNEvt.GetType() == MouseNotifyEvent::GETFOCUS ); + if ( (rNEvt.GetWindow() == this) && (rNEvt.GetType() == MouseNotifyEvent::GETFOCUS) && !(GetStyle() & WB_TABSTOP) && !(mpWindowImpl->mnDlgCtrlFlags & WINDOW_DLGCTRL_WANTFOCUS) ) { sal_uInt16 n = 0; @@ -322,7 +322,7 @@ CommandEvent ImplTranslateCommandEvent( const CommandEvent& rCEvt, vcl::Window* void Window::ImplNotifyKeyMouseCommandEventListeners( NotifyEvent& rNEvt ) { - if( rNEvt.GetType() == EVENT_COMMAND ) + if( rNEvt.GetType() == MouseNotifyEvent::COMMAND ) { const CommandEvent* pCEvt = rNEvt.GetCommandEvent(); if ( pCEvt->GetCommand() != COMMAND_CONTEXTMENU ) @@ -352,7 +352,7 @@ void Window::ImplNotifyKeyMouseCommandEventListeners( NotifyEvent& rNEvt ) ImplDelData aDelData; ImplAddDel( &aDelData ); - if( rNEvt.GetType() == EVENT_MOUSEMOVE ) + if( rNEvt.GetType() == MouseNotifyEvent::MOUSEMOVE ) { if ( mpWindowImpl->mbCompoundControl || ( rNEvt.GetWindow() == this ) ) { @@ -365,7 +365,7 @@ void Window::ImplNotifyKeyMouseCommandEventListeners( NotifyEvent& rNEvt ) } } } - else if( rNEvt.GetType() == EVENT_MOUSEBUTTONUP ) + else if( rNEvt.GetType() == MouseNotifyEvent::MOUSEBUTTONUP ) { if ( mpWindowImpl->mbCompoundControl || ( rNEvt.GetWindow() == this ) ) { @@ -378,7 +378,7 @@ void Window::ImplNotifyKeyMouseCommandEventListeners( NotifyEvent& rNEvt ) } } } - else if( rNEvt.GetType() == EVENT_MOUSEBUTTONDOWN ) + else if( rNEvt.GetType() == MouseNotifyEvent::MOUSEBUTTONDOWN ) { if ( mpWindowImpl->mbCompoundControl || ( rNEvt.GetWindow() == this ) ) { @@ -391,12 +391,12 @@ void Window::ImplNotifyKeyMouseCommandEventListeners( NotifyEvent& rNEvt ) } } } - else if( rNEvt.GetType() == EVENT_KEYINPUT ) + else if( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT ) { if ( mpWindowImpl->mbCompoundControl || ( rNEvt.GetWindow() == this ) ) ImplCallEventListeners( VCLEVENT_WINDOW_KEYINPUT, (void*)rNEvt.GetKeyEvent() ); } - else if( rNEvt.GetType() == EVENT_KEYUP ) + else if( rNEvt.GetType() == MouseNotifyEvent::KEYUP ) { if ( mpWindowImpl->mbCompoundControl || ( rNEvt.GetWindow() == this ) ) ImplCallEventListeners( VCLEVENT_WINDOW_KEYUP, (void*)rNEvt.GetKeyEvent() ); diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx index ec8c6a5566f7..b1534ec7d2c4 100644 --- a/vcl/source/window/floatwin.cxx +++ b/vcl/source/window/floatwin.cxx @@ -518,7 +518,7 @@ bool FloatingWindow::Notify( NotifyEvent& rNEvt ) bool nRet = SystemWindow::Notify( rNEvt ); if ( !nRet ) { - if ( rNEvt.GetType() == EVENT_KEYINPUT ) + if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT ) { const KeyEvent* pKEvt = rNEvt.GetKeyEvent(); vcl::KeyCode aKeyCode = pKEvt->GetKeyCode(); diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx index bb6e8f1ed0bb..c13e6b461fbe 100644 --- a/vcl/source/window/layout.cxx +++ b/vcl/source/window/layout.cxx @@ -1803,7 +1803,7 @@ bool VclScrolledWindow::set_property(const OString &rKey, const OString &rValue) bool VclScrolledWindow::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 ) diff --git a/vcl/source/window/mouse.cxx b/vcl/source/window/mouse.cxx index 783312f78bf2..054f10bbfd22 100644 --- a/vcl/source/window/mouse.cxx +++ b/vcl/source/window/mouse.cxx @@ -153,7 +153,7 @@ void Window::ImplCallMouseMove( sal_uInt16 nMouseCode, bool bModChanged ) nMode |= MouseEventModifiers::SYNTHETIC; if ( bModChanged ) nMode |= MouseEventModifiers::MODIFIERCHANGED; - ImplHandleMouseEvent( mpWindowImpl->mpFrameWindow, EVENT_MOUSEMOVE, bLeave, nX, nY, nTime, nCode, nMode ); + ImplHandleMouseEvent( mpWindowImpl->mpFrameWindow, MouseNotifyEvent::MOUSEMOVE, bLeave, nX, nY, nTime, nCode, nMode ); } } @@ -352,7 +352,7 @@ void Window::ImplGrabFocus( sal_uInt16 nFlags ) if ( pOldFocusWindow->IsTracking() && (pSVData->maWinData.mnTrackFlags & STARTTRACK_FOCUSCANCEL) ) pOldFocusWindow->EndTracking( ENDTRACK_CANCEL | ENDTRACK_FOCUS ); - NotifyEvent aNEvt( EVENT_LOSEFOCUS, pOldFocusWindow ); + NotifyEvent aNEvt( MouseNotifyEvent::LOSEFOCUS, pOldFocusWindow ); if ( !ImplCallPreNotify( aNEvt ) ) pOldFocusWindow->LoseFocus(); pOldFocusWindow->ImplCallDeactivateListeners( this ); @@ -380,7 +380,7 @@ void Window::ImplGrabFocus( sal_uInt16 nFlags ) ! aOldFocusDel.IsDead() && ( pOldFocusWindow->GetDialogControlFlags() & WINDOW_DLGCTRL_FLOATWIN_POPUPMODEEND_CANCEL ) ) mpWindowImpl->mnGetFocusFlags |= GETFOCUS_FLOATWIN_POPUPMODEEND_CANCEL; - NotifyEvent aNEvt( EVENT_GETFOCUS, this ); + NotifyEvent aNEvt( MouseNotifyEvent::GETFOCUS, this ); if ( !ImplCallPreNotify( aNEvt ) && !aDogTag.IsDead() ) GetFocus(); if( !aDogTag.IsDead() ) @@ -414,21 +414,21 @@ void Window::ImplGrabFocusToDocument( sal_uInt16 nFlags ) void Window::MouseMove( const MouseEvent& rMEvt ) { - NotifyEvent aNEvt( EVENT_MOUSEMOVE, this, &rMEvt ); + NotifyEvent aNEvt( MouseNotifyEvent::MOUSEMOVE, this, &rMEvt ); if ( !Notify( aNEvt ) ) mpWindowImpl->mbMouseMove = true; } void Window::MouseButtonDown( const MouseEvent& rMEvt ) { - NotifyEvent aNEvt( EVENT_MOUSEBUTTONDOWN, this, &rMEvt ); + NotifyEvent aNEvt( MouseNotifyEvent::MOUSEBUTTONDOWN, this, &rMEvt ); if ( !Notify( aNEvt ) ) mpWindowImpl->mbMouseButtonDown = true; } void Window::MouseButtonUp( const MouseEvent& rMEvt ) { - NotifyEvent aNEvt( EVENT_MOUSEBUTTONUP, this, &rMEvt ); + NotifyEvent aNEvt( MouseNotifyEvent::MOUSEBUTTONUP, this, &rMEvt ); if ( !Notify( aNEvt ) ) mpWindowImpl->mbMouseButtonUp = true; } diff --git a/vcl/source/window/scrwnd.cxx b/vcl/source/window/scrwnd.cxx index 6e085b509c13..f03ce5a24fba 100644 --- a/vcl/source/window/scrwnd.cxx +++ b/vcl/source/window/scrwnd.cxx @@ -346,7 +346,7 @@ IMPL_LINK_NOARG(ImplWheelWindow, ImplScrollHdl) Point aCmdMousePos( pWindow->ImplFrameToOutput( aMousePos ) ); CommandScrollData aScrollData( mnActDeltaX, mnActDeltaY ); CommandEvent aCEvt( aCmdMousePos, COMMAND_AUTOSCROLL, true, &aScrollData ); - NotifyEvent aNCmdEvt( EVENT_COMMAND, pWindow, &aCEvt ); + NotifyEvent aNCmdEvt( MouseNotifyEvent::COMMAND, pWindow, &aCEvt ); if ( !ImplCallPreNotify( aNCmdEvt ) ) { diff --git a/vcl/source/window/splitwin.cxx b/vcl/source/window/splitwin.cxx index 9f82ca318864..47976fd9be45 100644 --- a/vcl/source/window/splitwin.cxx +++ b/vcl/source/window/splitwin.cxx @@ -2484,7 +2484,7 @@ bool SplitWindow::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/window/syswin.cxx b/vcl/source/window/syswin.cxx index 6ecf711d75ac..678b7c3a59d2 100644 --- a/vcl/source/window/syswin.cxx +++ b/vcl/source/window/syswin.cxx @@ -114,7 +114,7 @@ SystemWindow::~SystemWindow() bool SystemWindow::Notify( NotifyEvent& rNEvt ) { // capture KeyEvents for menu handling - if ( rNEvt.GetType() == EVENT_KEYINPUT ) + if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT ) { MenuBar* pMBar = mpMenuBar; if ( !pMBar && ( GetType() == WINDOW_FLOATINGWINDOW ) ) @@ -133,7 +133,7 @@ bool SystemWindow::Notify( NotifyEvent& rNEvt ) bool SystemWindow::PreNotify( NotifyEvent& rNEvt ) { // capture KeyEvents for taskpane cycling - if ( rNEvt.GetType() == EVENT_KEYINPUT ) + if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT ) { if( rNEvt.GetKeyEvent()->GetKeyCode().GetCode() == KEY_F6 && rNEvt.GetKeyEvent()->GetKeyCode().IsMod1() && diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index 4bb6d2bb5b1d..0610246c8ec3 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -4266,7 +4266,7 @@ void ToolBox::RequestHelp( const HelpEvent& rHEvt ) bool ToolBox::Notify( NotifyEvent& rNEvt ) { - if ( rNEvt.GetType() == EVENT_KEYINPUT ) + if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT ) { KeyEvent aKEvt = *rNEvt.GetKeyEvent(); vcl::KeyCode aKeyCode = aKEvt.GetKeyCode(); @@ -4294,7 +4294,7 @@ bool ToolBox::Notify( NotifyEvent& rNEvt ) break; }; } - else if( rNEvt.GetType() == EVENT_GETFOCUS ) + else if( rNEvt.GetType() == MouseNotifyEvent::GETFOCUS ) { if( rNEvt.GetWindow() == this ) { @@ -4336,7 +4336,7 @@ bool ToolBox::Notify( NotifyEvent& rNEvt ) return DockingWindow::Notify( rNEvt ); } } - else if( rNEvt.GetType() == EVENT_LOSEFOCUS ) + else if( rNEvt.GetType() == MouseNotifyEvent::LOSEFOCUS ) { // deselect ImplHideFocus(); diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index edb7c2e31e61..b211057922de 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -393,7 +393,7 @@ Window::~Window() // announce the window is to be destroyed { - NotifyEvent aNEvt( EVENT_DESTROY, this ); + NotifyEvent aNEvt( MouseNotifyEvent::DESTROY, this ); Notify( aNEvt ); } @@ -1915,14 +1915,14 @@ void Window::SimulateKeyPress( sal_uInt16 nKeyCode ) const void Window::KeyInput( const KeyEvent& rKEvt ) { - NotifyEvent aNEvt( EVENT_KEYINPUT, this, &rKEvt ); + NotifyEvent aNEvt( MouseNotifyEvent::KEYINPUT, this, &rKEvt ); if ( !Notify( aNEvt ) ) mpWindowImpl->mbKeyInput = true; } void Window::KeyUp( const KeyEvent& rKEvt ) { - NotifyEvent aNEvt( EVENT_KEYUP, this, &rKEvt ); + NotifyEvent aNEvt( MouseNotifyEvent::KEYUP, this, &rKEvt ); if ( !Notify( aNEvt ) ) mpWindowImpl->mbKeyUp = true; } @@ -1949,13 +1949,13 @@ void Window::GetFocus() return; } - NotifyEvent aNEvt( EVENT_GETFOCUS, this ); + NotifyEvent aNEvt( MouseNotifyEvent::GETFOCUS, this ); Notify( aNEvt ); } void Window::LoseFocus() { - NotifyEvent aNEvt( EVENT_LOSEFOCUS, this ); + NotifyEvent aNEvt( MouseNotifyEvent::LOSEFOCUS, this ); Notify( aNEvt ); } @@ -2013,7 +2013,7 @@ void Window::Command( const CommandEvent& rCEvt ) { ImplCallEventListeners( VCLEVENT_WINDOW_COMMAND, (void*)&rCEvt ); - NotifyEvent aNEvt( EVENT_COMMAND, this, &rCEvt ); + NotifyEvent aNEvt( MouseNotifyEvent::COMMAND, this, &rCEvt ); if ( !Notify( aNEvt ) ) mpWindowImpl->mbCommand = true; } @@ -2679,7 +2679,7 @@ void Window::EnableInput( bool bEnable, bool bChild ) // #104827# notify parent if ( bNotify ) { - NotifyEvent aNEvt( bEnable ? EVENT_INPUTENABLE : EVENT_INPUTDISABLE, this ); + NotifyEvent aNEvt( bEnable ? MouseNotifyEvent::INPUTENABLE : MouseNotifyEvent::INPUTDISABLE, this ); Notify( aNEvt ); } } diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index ce5bc24cb900..6b23fc6bcd99 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -63,7 +63,7 @@ bool ImplCallPreNotify( NotifyEvent& rEvt ) enum ENUM_IHMFM {IHMFM_FALSE = 0, IHMFM_TRUE = 1, IHMFM_FLOAT = 2}; static sal_uInt16 ImplHandleMouseFloatMode( vcl::Window* pChild, const Point& rMousePos, - sal_uInt16 nCode, sal_uInt16 nSVEvent, + sal_uInt16 nCode, MouseNotifyEvent nSVEvent, bool bMouseLeave ) { ImplSVData* pSVData = ImplGetSVData(); @@ -79,7 +79,7 @@ static sal_uInt16 ImplHandleMouseFloatMode( vcl::Window* pChild, const Point& rM FloatingWindow* pFloat = pSVData->maWinData.mpFirstFloat->ImplFloatHitTest( pChild, rMousePos, nHitTest ); FloatingWindow* pLastLevelFloat; sal_uLong nPopupFlags; - if ( nSVEvent == EVENT_MOUSEMOVE ) + if ( nSVEvent == MouseNotifyEvent::MOUSEMOVE ) { if ( bMouseLeave ) return IHMFM_TRUE; @@ -96,7 +96,7 @@ static sal_uInt16 ImplHandleMouseFloatMode( vcl::Window* pChild, const Point& rM { if ( nCode & MOUSE_LEFT ) { - if ( nSVEvent == EVENT_MOUSEBUTTONDOWN ) + if ( nSVEvent == MouseNotifyEvent::MOUSEBUTTONDOWN ) { if ( !pFloat ) { @@ -144,7 +144,7 @@ static sal_uInt16 ImplHandleMouseFloatMode( vcl::Window* pChild, const Point& rM if ( nPopupFlags & FLOATWIN_POPUPMODE_ALLMOUSEBUTTONCLOSE ) { if ( (nPopupFlags & FLOATWIN_POPUPMODE_NOMOUSEUPCLOSE) && - (nSVEvent == EVENT_MOUSEBUTTONUP) ) + (nSVEvent == MouseNotifyEvent::MOUSEBUTTONUP) ) return IHMFM_TRUE; pLastLevelFloat->EndPopupMode( FLOATWIN_POPUPMODEEND_CANCEL | FLOATWIN_POPUPMODEEND_CLOSEALL ); if ( nPopupFlags & FLOATWIN_POPUPMODE_PATHMOUSECANCELCLICK ) @@ -220,7 +220,7 @@ static bool ImplCallCommand( vcl::Window* pChild, sal_uInt16 nEvt, void* pData = } CommandEvent aCEvt( aPos, nEvt, bMouse, pData ); - NotifyEvent aNCmdEvt( EVENT_COMMAND, pChild, &aCEvt ); + NotifyEvent aNCmdEvt( MouseNotifyEvent::COMMAND, pChild, &aCEvt ); ImplDelData aDelData( pChild ); bool bPreNotify = ImplCallPreNotify( aNCmdEvt ); if ( aDelData.IsDead() ) @@ -267,7 +267,7 @@ static long ContextMenuEventLink( void* pCEvent, void* ) return 0; } -bool ImplHandleMouseEvent( vcl::Window* pWindow, sal_uInt16 nSVEvent, bool bMouseLeave, +bool ImplHandleMouseEvent( vcl::Window* pWindow, MouseNotifyEvent nSVEvent, bool bMouseLeave, long nX, long nY, sal_uLong nMsgTime, sal_uInt16 nCode, MouseEventModifiers nMode ) { @@ -281,9 +281,9 @@ bool ImplHandleMouseEvent( vcl::Window* pWindow, sal_uInt16 nSVEvent, bool bMous // we need a mousemove event, before we get a mousebuttondown or a // mousebuttonup event - if ( (nSVEvent == EVENT_MOUSEBUTTONDOWN) || (nSVEvent == EVENT_MOUSEBUTTONUP) ) + if ( (nSVEvent == MouseNotifyEvent::MOUSEBUTTONDOWN) || (nSVEvent == MouseNotifyEvent::MOUSEBUTTONUP) ) { - if ( (nSVEvent == EVENT_MOUSEBUTTONUP) && pSVData->maHelpData.mbExtHelpMode ) + if ( (nSVEvent == MouseNotifyEvent::MOUSEBUTTONUP) && pSVData->maHelpData.mbExtHelpMode ) Help::EndExtHelp(); if ( pSVData->maHelpData.mpHelpWin ) { @@ -299,7 +299,7 @@ bool ImplHandleMouseEvent( vcl::Window* pWindow, sal_uInt16 nSVEvent, bool bMous if ( (pWinFrameData->mnLastMouseX != nX) || (pWinFrameData->mnLastMouseY != nY) ) { - ImplHandleMouseEvent( pWindow, EVENT_MOUSEMOVE, false, nX, nY, nMsgTime, nCode, nMode ); + ImplHandleMouseEvent( pWindow, MouseNotifyEvent::MOUSEMOVE, false, nX, nY, nMsgTime, nCode, nMode ); } } @@ -332,7 +332,7 @@ bool ImplHandleMouseEvent( vcl::Window* pWindow, sal_uInt16 nSVEvent, bool bMous "ImplHandleMouseEvent: TrackWin != CaptureWin" ); // AutoScrollMode - if ( pSVData->maWinData.mpAutoScrollWin && (nSVEvent == EVENT_MOUSEBUTTONDOWN) ) + if ( pSVData->maWinData.mpAutoScrollWin && (nSVEvent == MouseNotifyEvent::MOUSEBUTTONDOWN) ) { pSVData->maWinData.mpAutoScrollWin->EndAutoScroll(); return true; @@ -385,7 +385,7 @@ bool ImplHandleMouseEvent( vcl::Window* pWindow, sal_uInt16 nSVEvent, bool bMous if ( pSVData->maWinData.mpCaptureWin != pChild && (!pChild->IsEnabled() || !pChild->IsInputEnabled() || pChild->IsInModalNonRefMode() ) ) { sal_uInt16 FloatHdl = (ImplHandleMouseFloatMode( pChild, aMousePos, nCode, nSVEvent, bMouseLeave ) & IHMFM_FLOAT); - if ( nSVEvent == EVENT_MOUSEMOVE ) + if ( nSVEvent == MouseNotifyEvent::MOUSEMOVE ) { ImplHandleMouseHelpRequest( pChild, aMousePos ); if( pWinFrameData->mpMouseMoveWin != pChild ) @@ -406,12 +406,12 @@ bool ImplHandleMouseEvent( vcl::Window* pWindow, sal_uInt16 nSVEvent, bool bMous if(FloatHdl != IHMFM_FLOAT) // mouse-button left: don't stop the handling for the click fdo#84795 { - if ( nSVEvent == EVENT_MOUSEBUTTONDOWN ) + if ( nSVEvent == MouseNotifyEvent::MOUSEBUTTONDOWN ) return true; else { // Set normal MousePointer for disabled windows - if ( nSVEvent == EVENT_MOUSEMOVE ) + if ( nSVEvent == MouseNotifyEvent::MOUSEMOVE ) ImplSetMousePointer( pChild ); return false; @@ -421,13 +421,13 @@ bool ImplHandleMouseEvent( vcl::Window* pWindow, sal_uInt16 nSVEvent, bool bMous // End ExtTextInput-Mode, if the user click in the same TopLevel Window if ( pSVData->maWinData.mpExtTextInputWin && - ((nSVEvent == EVENT_MOUSEBUTTONDOWN) || - (nSVEvent == EVENT_MOUSEBUTTONUP)) ) + ((nSVEvent == MouseNotifyEvent::MOUSEBUTTONDOWN) || + (nSVEvent == MouseNotifyEvent::MOUSEBUTTONUP)) ) pSVData->maWinData.mpExtTextInputWin->EndExtTextInput( EXTTEXTINPUT_END_COMPLETE ); } // determine mouse event data - if ( nSVEvent == EVENT_MOUSEMOVE ) + if ( nSVEvent == MouseNotifyEvent::MOUSEMOVE ) { // check if MouseMove belongs to same window and if the // status did not change @@ -539,7 +539,7 @@ bool ImplHandleMouseEvent( vcl::Window* pWindow, sal_uInt16 nSVEvent, bool bMous { Point aLeaveMousePos = pMouseMoveWin->ImplFrameToOutput( aMousePos ); MouseEvent aMLeaveEvt( aLeaveMousePos, nClicks, nMode | MouseEventModifiers::LEAVEWINDOW, nCode, nCode ); - NotifyEvent aNLeaveEvt( EVENT_MOUSEMOVE, pMouseMoveWin, &aMLeaveEvt ); + NotifyEvent aNLeaveEvt( MouseNotifyEvent::MOUSEMOVE, pMouseMoveWin, &aMLeaveEvt ); ImplDelData aDelData; ImplDelData aDelData2; pWinFrameData->mbInMouseMove = true; @@ -586,7 +586,7 @@ bool ImplHandleMouseEvent( vcl::Window* pWindow, sal_uInt16 nSVEvent, bool bMous if (pChild) { // mouse click - if ( nSVEvent == EVENT_MOUSEBUTTONDOWN ) + if ( nSVEvent == MouseNotifyEvent::MOUSEBUTTONDOWN ) { const MouseSettings& rMSettings = pChild->GetSettings().GetMouseSettings(); sal_uLong nDblClkTime = rMSettings.GetDoubleClickTime(); @@ -668,11 +668,11 @@ bool ImplHandleMouseEvent( vcl::Window* pWindow, sal_uInt16 nSVEvent, bool bMous ImplDelData aDelData; NotifyEvent aNEvt( nSVEvent, pChild, &aMEvt ); pChild->ImplAddDel( &aDelData ); - if ( nSVEvent == EVENT_MOUSEMOVE ) + if ( nSVEvent == MouseNotifyEvent::MOUSEMOVE ) pChild->ImplGetFrameData()->mbInMouseMove = true; // bring window into foreground on mouseclick - if ( nSVEvent == EVENT_MOUSEBUTTONDOWN ) + if ( nSVEvent == MouseNotifyEvent::MOUSEBUTTONDOWN ) { if( !pSVData->maWinData.mpFirstFloat && // totop for floating windows in popup would change the focus and would close them immediately !(pChild->ImplGetFrameWindow()->GetStyle() & WB_OWNERDRAWDECORATION) ) // ownerdrawdecorated windows must never grab focus @@ -686,7 +686,7 @@ bool ImplHandleMouseEvent( vcl::Window* pWindow, sal_uInt16 nSVEvent, bool bMous else { bRet = false; - if ( nSVEvent == EVENT_MOUSEMOVE ) + if ( nSVEvent == MouseNotifyEvent::MOUSEMOVE ) { if ( pSVData->maWinData.mpTrackWin ) { @@ -723,7 +723,7 @@ bool ImplHandleMouseEvent( vcl::Window* pWindow, sal_uInt16 nSVEvent, bool bMous } } } - else if ( nSVEvent == EVENT_MOUSEBUTTONDOWN ) + else if ( nSVEvent == MouseNotifyEvent::MOUSEBUTTONDOWN ) { if ( pSVData->maWinData.mpTrackWin && !(pSVData->maWinData.mnTrackFlags & STARTTRACK_MOUSEBUTTONDOWN) ) @@ -755,10 +755,10 @@ bool ImplHandleMouseEvent( vcl::Window* pWindow, sal_uInt16 nSVEvent, bool bMous if ( aDelData.IsDead() ) return true; - if ( nSVEvent == EVENT_MOUSEMOVE ) + if ( nSVEvent == MouseNotifyEvent::MOUSEMOVE ) pChild->ImplGetWindowImpl()->mpFrameData->mbInMouseMove = false; - if ( nSVEvent == EVENT_MOUSEMOVE ) + if ( nSVEvent == MouseNotifyEvent::MOUSEMOVE ) { if ( bCallHelpRequest && !pSVData->maHelpData.mbKeyboardHelp ) ImplHandleMouseHelpRequest( pChild, pChild->OutputToScreenPixel( aMEvt.GetPosPixel() ) ); @@ -766,7 +766,7 @@ bool ImplHandleMouseEvent( vcl::Window* pWindow, sal_uInt16 nSVEvent, bool bMous } else if ( !bRet ) { - if ( nSVEvent == EVENT_MOUSEBUTTONDOWN ) + if ( nSVEvent == MouseNotifyEvent::MOUSEBUTTONDOWN ) { if ( !pChild->ImplGetWindowImpl()->mbMouseButtonDown ) bRet = true; @@ -780,18 +780,18 @@ bool ImplHandleMouseEvent( vcl::Window* pWindow, sal_uInt16 nSVEvent, bool bMous pChild->ImplRemoveDel( &aDelData ); - if ( nSVEvent == EVENT_MOUSEMOVE ) + if ( nSVEvent == MouseNotifyEvent::MOUSEMOVE ) { // set new mouse pointer if ( !bMouseLeave ) ImplSetMousePointer( pChild ); } - else if ( (nSVEvent == EVENT_MOUSEBUTTONDOWN) || (nSVEvent == EVENT_MOUSEBUTTONUP) ) + else if ( (nSVEvent == MouseNotifyEvent::MOUSEBUTTONDOWN) || (nSVEvent == MouseNotifyEvent::MOUSEBUTTONUP) ) { if ( !bDrag ) { // Command-Events - if ( /*!bRet &&*/ (nClicks == 1) && (nSVEvent == EVENT_MOUSEBUTTONDOWN) && + if ( /*!bRet &&*/ (nClicks == 1) && (nSVEvent == MouseNotifyEvent::MOUSEBUTTONDOWN) && (nCode == MOUSE_MIDDLE) ) { sal_uInt16 nMiddleAction = pChild->GetSettings().GetMouseSettings().GetMiddleButtonAction(); @@ -807,7 +807,7 @@ bool ImplHandleMouseEvent( vcl::Window* pWindow, sal_uInt16 nSVEvent, bool bMous if ( (nCode == rMSettings.GetContextMenuCode()) && (nClicks == rMSettings.GetContextMenuClicks()) ) { - bool bContextMenu = (nSVEvent == EVENT_MOUSEBUTTONDOWN); + bool bContextMenu = (nSVEvent == MouseNotifyEvent::MOUSEBUTTONDOWN); if ( bContextMenu ) { if( pSVData->maAppData.mpActivePopupMenu ) @@ -878,7 +878,7 @@ static vcl::Window* ImplGetKeyInputWindow( vcl::Window* pWindow ) return pChild; } -static bool ImplHandleKey( vcl::Window* pWindow, sal_uInt16 nSVEvent, +static bool ImplHandleKey( vcl::Window* pWindow, MouseNotifyEvent nSVEvent, sal_uInt16 nKeyCode, sal_uInt16 nCharCode, sal_uInt16 nRepeat, bool bForward ) { ImplSVData* pSVData = ImplGetSVData(); @@ -894,10 +894,10 @@ static bool ImplHandleKey( vcl::Window* pWindow, sal_uInt16 nSVEvent, sal_uInt16 nVCLEvent; switch( nSVEvent ) { - case EVENT_KEYINPUT: + case MouseNotifyEvent::KEYINPUT: nVCLEvent = VCLEVENT_WINDOW_KEYINPUT; break; - case EVENT_KEYUP: + case MouseNotifyEvent::KEYUP: nVCLEvent = VCLEVENT_WINDOW_KEYUP; break; default: @@ -924,7 +924,7 @@ static bool ImplHandleKey( vcl::Window* pWindow, sal_uInt16 nSVEvent, pSVData->maAppData.mnLastInputTime = tools::Time::GetSystemTicks(); // handle tracking window - if ( nSVEvent == EVENT_KEYINPUT ) + if ( nSVEvent == MouseNotifyEvent::KEYINPUT ) { #ifdef DBG_UTIL // #105224# use Ctrl-Alt-Shift-D, Ctrl-Shift-D must be useable by app @@ -1028,7 +1028,7 @@ static bool ImplHandleKey( vcl::Window* pWindow, sal_uInt16 nSVEvent, if ( !bKeyPreNotify && !aDelData.IsDead() ) { - if ( nSVEvent == EVENT_KEYINPUT ) + if ( nSVEvent == MouseNotifyEvent::KEYINPUT ) { pChild->ImplGetWindowImpl()->mbKeyInput = false; pChild->KeyInput( aKeyEvt ); @@ -1047,7 +1047,7 @@ static bool ImplHandleKey( vcl::Window* pWindow, sal_uInt16 nSVEvent, pChild->ImplRemoveDel( &aDelData ); - if ( nSVEvent == EVENT_KEYINPUT ) + if ( nSVEvent == MouseNotifyEvent::KEYINPUT ) { if ( !bKeyPreNotify && pChild->ImplGetWindowImpl()->mbKeyInput ) { @@ -1141,7 +1141,7 @@ static bool ImplHandleKey( vcl::Window* pWindow, sal_uInt16 nSVEvent, if ( !bPreNotify ) { - if ( nSVEvent == EVENT_KEYINPUT ) + if ( nSVEvent == MouseNotifyEvent::KEYINPUT ) { pChild->ImplGetWindowImpl()->mbKeyInput = false; pChild->KeyInput( aKEvt ); @@ -1343,7 +1343,7 @@ static bool ImplCallWheelCommand( vcl::Window* pWindow, const Point& rPos, { Point aCmdMousePos = pWindow->ImplFrameToOutput( rPos ); CommandEvent aCEvt( aCmdMousePos, COMMAND_WHEEL, true, pWheelData ); - NotifyEvent aNCmdEvt( EVENT_COMMAND, pWindow, &aCEvt ); + NotifyEvent aNCmdEvt( MouseNotifyEvent::COMMAND, pWindow, &aCEvt ); ImplDelData aDelData( pWindow ); bool bPreNotify = ImplCallPreNotify( aNCmdEvt ); if ( aDelData.IsDead() ) @@ -1753,7 +1753,7 @@ IMPL_LINK_NOARG(vcl::Window, ImplAsyncFocusHdl) static const char* pEnv = getenv("SAL_FLOATWIN_NOAPPFOCUSCLOSE"); if( !(pEnv && *pEnv) ) { - NotifyEvent aNEvt( EVENT_LOSEFOCUS, pFocusWin ); + NotifyEvent aNEvt( MouseNotifyEvent::LOSEFOCUS, pFocusWin ); if ( !ImplCallPreNotify( aNEvt ) ) pFocusWin->LoseFocus(); pFocusWin->ImplCallDeactivateListeners( NULL ); @@ -1956,7 +1956,7 @@ static MouseEventModifiers ImplGetMouseButtonMode( SalMouseEvent* pEvent ) inline bool ImplHandleSalMouseLeave( vcl::Window* pWindow, SalMouseEvent* pEvent ) { - return ImplHandleMouseEvent( pWindow, EVENT_MOUSEMOVE, true, + return ImplHandleMouseEvent( pWindow, MouseNotifyEvent::MOUSEMOVE, true, pEvent->mnX, pEvent->mnY, pEvent->mnTime, pEvent->mnCode, ImplGetMouseMoveMode( pEvent ) ); @@ -1964,7 +1964,7 @@ inline bool ImplHandleSalMouseLeave( vcl::Window* pWindow, SalMouseEvent* pEvent inline bool ImplHandleSalMouseMove( vcl::Window* pWindow, SalMouseEvent* pEvent ) { - return ImplHandleMouseEvent( pWindow, EVENT_MOUSEMOVE, false, + return ImplHandleMouseEvent( pWindow, MouseNotifyEvent::MOUSEMOVE, false, pEvent->mnX, pEvent->mnY, pEvent->mnTime, pEvent->mnCode, ImplGetMouseMoveMode( pEvent ) ); @@ -1972,7 +1972,7 @@ inline bool ImplHandleSalMouseMove( vcl::Window* pWindow, SalMouseEvent* pEvent inline bool ImplHandleSalMouseButtonDown( vcl::Window* pWindow, SalMouseEvent* pEvent ) { - return ImplHandleMouseEvent( pWindow, EVENT_MOUSEBUTTONDOWN, false, + return ImplHandleMouseEvent( pWindow, MouseNotifyEvent::MOUSEBUTTONDOWN, false, pEvent->mnX, pEvent->mnY, pEvent->mnTime, #ifdef MACOSX @@ -1985,7 +1985,7 @@ inline bool ImplHandleSalMouseButtonDown( vcl::Window* pWindow, SalMouseEvent* p inline bool ImplHandleSalMouseButtonUp( vcl::Window* pWindow, SalMouseEvent* pEvent ) { - return ImplHandleMouseEvent( pWindow, EVENT_MOUSEBUTTONUP, false, + return ImplHandleMouseEvent( pWindow, MouseNotifyEvent::MOUSEBUTTONUP, false, pEvent->mnX, pEvent->mnY, pEvent->mnTime, #ifdef MACOSX @@ -2357,28 +2357,28 @@ bool ImplWindowFrameProc( vcl::Window* pWindow, SalFrame* /*pFrame*/, case SALEVENT_KEYINPUT: { SalKeyEvent* pKeyEvt = (SalKeyEvent*)pEvent; - nRet = ImplHandleKey( pWindow, EVENT_KEYINPUT, + nRet = ImplHandleKey( pWindow, MouseNotifyEvent::KEYINPUT, pKeyEvt->mnCode, pKeyEvt->mnCharCode, pKeyEvt->mnRepeat, true ); } break; case SALEVENT_EXTERNALKEYINPUT: { KeyEvent* pKeyEvt = (KeyEvent*) pEvent; - nRet = ImplHandleKey( pWindow, EVENT_KEYINPUT, + nRet = ImplHandleKey( pWindow, MouseNotifyEvent::KEYINPUT, pKeyEvt->GetKeyCode().GetFullCode(), pKeyEvt->GetCharCode(), pKeyEvt->GetRepeat(), false ); } break; case SALEVENT_KEYUP: { SalKeyEvent* pKeyEvt = (SalKeyEvent*)pEvent; - nRet = ImplHandleKey( pWindow, EVENT_KEYUP, + nRet = ImplHandleKey( pWindow, MouseNotifyEvent::KEYUP, pKeyEvt->mnCode, pKeyEvt->mnCharCode, pKeyEvt->mnRepeat, true ); } break; case SALEVENT_EXTERNALKEYUP: { KeyEvent* pKeyEvt = (KeyEvent*) pEvent; - nRet = ImplHandleKey( pWindow, EVENT_KEYUP, + nRet = ImplHandleKey( pWindow, MouseNotifyEvent::KEYUP, pKeyEvt->GetKeyCode().GetFullCode(), pKeyEvt->GetCharCode(), pKeyEvt->GetRepeat(), false ); } break; diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx index d2fef8fc0903..c8f5f3f7b917 100644 --- a/vcl/win/source/window/salframe.cxx +++ b/vcl/win/source/window/salframe.cxx @@ -5214,7 +5214,7 @@ static boolean ImplHandleAppCommand( HWND hWnd, LPARAM lParam ) { const Point aPoint; CommandEvent aCEvt( aPoint, COMMAND_MEDIA, FALSE, &nCommand ); - NotifyEvent aNCmdEvt( EVENT_COMMAND, pWindow, &aCEvt ); + NotifyEvent aNCmdEvt( MouseNotifyEvent::COMMAND, pWindow, &aCEvt ); if ( !ImplCallPreNotify( aNCmdEvt ) ) { |