diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-12-06 13:26:09 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-12-07 07:10:39 +0000 |
| commit | 2d48f5fc0a4f7b5b8c9d3a4f4cc85d5f3a7e5053 (patch) | |
| tree | c2e18df7dd44255e98c91f242194fd9bb66f3f3e | |
| parent | ed80d28d9f019a1afa2edd66e115eae26ea19963 (diff) | |
convert VCLEVENT constants to scoped enum
Change-Id: Ic8ccb0a9715ec05182dacddab2c015b0de6a0fba
Reviewed-on: https://gerrit.libreoffice.org/31675
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
147 files changed, 966 insertions, 940 deletions
diff --git a/accessibility/inc/extended/listboxaccessible.hxx b/accessibility/inc/extended/listboxaccessible.hxx index e93fa0225ad1..013644a5e064 100644 --- a/accessibility/inc/extended/listboxaccessible.hxx +++ b/accessibility/inc/extended/listboxaccessible.hxx @@ -53,7 +53,7 @@ namespace accessibility protected: virtual ~ListBoxAccessibleBase( ); - /** will be called when our window broadcasts the VCLEVENT_OBJECT_DYING event + /** will be called when our window broadcasts the VclEventId::ObjectDying event <p>Usually, you derive your class from both ListBoxAccessibleBase and XComponent, and call XComponent::dispose here.</p> diff --git a/accessibility/source/extended/accessibleiconchoicectrl.cxx b/accessibility/source/extended/accessibleiconchoicectrl.cxx index 194e52a870c0..21c4a4a7889d 100644 --- a/accessibility/source/extended/accessibleiconchoicectrl.cxx +++ b/accessibility/source/extended/accessibleiconchoicectrl.cxx @@ -63,7 +63,7 @@ namespace accessibility { switch ( rVclWindowEvent.GetId() ) { - case VCLEVENT_LISTBOX_SELECT : + case VclEventId::ListboxSelect : { // First send an event that tells the listeners of a // modified selection. The active descendant event is @@ -88,7 +88,7 @@ namespace accessibility } break; } - case VCLEVENT_WINDOW_GETFOCUS : + case VclEventId::WindowGetFocus : { VclPtr<SvtIconChoiceCtrl> pCtrl = getCtrl(); if ( pCtrl && pCtrl->HasFocus() ) diff --git a/accessibility/source/extended/accessiblelistbox.cxx b/accessibility/source/extended/accessiblelistbox.cxx index 367e92a689c2..2cb64e3814bb 100644 --- a/accessibility/source/extended/accessiblelistbox.cxx +++ b/accessibility/source/extended/accessiblelistbox.cxx @@ -73,7 +73,7 @@ namespace accessibility { switch ( rVclWindowEvent.GetId() ) { - case VCLEVENT_CHECKBOX_TOGGLE : + case VclEventId::CheckboxToggle : { if ( !getListBox() || !getListBox()->HasFocus() ) { @@ -98,13 +98,13 @@ namespace accessibility break; } - case VCLEVENT_LISTBOX_SELECT : + case VclEventId::ListboxSelect : { - OSL_FAIL("Debug: Treelist shouldn't use VCLEVENT_LISTBOX_SELECT"); + OSL_FAIL("Debug: Treelist shouldn't use VclEventId::ListboxSelect"); break; } - case VCLEVENT_LISTBOX_TREESELECT: + case VclEventId::ListboxTreeSelect: { if ( getListBox() && getListBox()->HasFocus() ) { @@ -116,7 +116,7 @@ namespace accessibility } } break; - case VCLEVENT_LISTBOX_TREEFOCUS: + case VclEventId::ListboxTreeFocus: { VclPtr<SvTreeListBox> pBox = getListBox(); bool bNeedFocus = false; @@ -176,7 +176,7 @@ namespace accessibility } } break; - case VCLEVENT_LISTBOX_ITEMREMOVED: + case VclEventId::ListboxItemRemoved: { SvTreeListEntry* pEntry = static_cast< SvTreeListEntry* >( rVclWindowEvent.GetData() ); if ( pEntry ) @@ -200,8 +200,8 @@ namespace accessibility break; // #i92103# - case VCLEVENT_ITEM_EXPANDED : - case VCLEVENT_ITEM_COLLAPSED : + case VclEventId::ItemExpanded : + case VclEventId::ItemCollapsed : { SvTreeListEntry* pEntry = static_cast< SvTreeListEntry* >( rVclWindowEvent.GetData() ); if ( pEntry ) @@ -210,7 +210,7 @@ namespace accessibility new AccessibleListBoxEntry( *getListBox(), pEntry, this ); Reference< XAccessible > xChild = pAccListBoxEntry; const short nAccEvent = - ( rVclWindowEvent.GetId() == VCLEVENT_ITEM_EXPANDED ) + ( rVclWindowEvent.GetId() == VclEventId::ItemExpanded ) ? AccessibleEventId::LISTBOX_ENTRY_EXPANDED : AccessibleEventId::LISTBOX_ENTRY_COLLAPSED; uno::Any aListBoxEntry; @@ -290,8 +290,8 @@ namespace accessibility { switch ( rVclWindowEvent.GetId() ) { - case VCLEVENT_WINDOW_SHOW: - case VCLEVENT_WINDOW_HIDE: + case VclEventId::WindowShow: + case VclEventId::WindowHide: { } break; diff --git a/accessibility/source/extended/accessibletabbar.cxx b/accessibility/source/extended/accessibletabbar.cxx index 26ac2e7a7c14..431dbd05f786 100644 --- a/accessibility/source/extended/accessibletabbar.cxx +++ b/accessibility/source/extended/accessibletabbar.cxx @@ -67,7 +67,7 @@ namespace accessibility switch ( rVclWindowEvent.GetId() ) { - case VCLEVENT_WINDOW_ENABLED: + case VclEventId::WindowEnabled: { aNewValue <<= AccessibleStateType::SENSITIVE; NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue ); @@ -75,7 +75,7 @@ namespace accessibility NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue ); } break; - case VCLEVENT_WINDOW_DISABLED: + case VclEventId::WindowDisabled: { aOldValue <<= AccessibleStateType::ENABLED; NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue ); @@ -83,25 +83,25 @@ namespace accessibility NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue ); } break; - case VCLEVENT_WINDOW_GETFOCUS: + case VclEventId::WindowGetFocus: { aNewValue <<= AccessibleStateType::FOCUSED; NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue ); } break; - case VCLEVENT_WINDOW_LOSEFOCUS: + case VclEventId::WindowLoseFocus: { aOldValue <<= AccessibleStateType::FOCUSED; NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue ); } break; - case VCLEVENT_WINDOW_SHOW: + case VclEventId::WindowShow: { aNewValue <<= AccessibleStateType::SHOWING; NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue ); } break; - case VCLEVENT_WINDOW_HIDE: + case VclEventId::WindowHide: { aOldValue <<= AccessibleStateType::SHOWING; NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue ); diff --git a/accessibility/source/extended/accessibletabbarbase.cxx b/accessibility/source/extended/accessibletabbarbase.cxx index f75d4572a789..2e3a0a974a91 100644 --- a/accessibility/source/extended/accessibletabbarbase.cxx +++ b/accessibility/source/extended/accessibletabbarbase.cxx @@ -48,20 +48,20 @@ IMPL_LINK( AccessibleTabBarBase, WindowEventListener, VclWindowEvent&, rEvent, v vcl::Window* pEventWindow = rEvent.GetWindow(); OSL_ENSURE( pEventWindow, "AccessibleTabBarBase::WindowEventListener: no window!" ); - if( ( rEvent.GetId() == VCLEVENT_TABBAR_PAGEREMOVED ) && + if( ( rEvent.GetId() == VclEventId::TabbarPageRemoved ) && ( (sal_uInt16)reinterpret_cast<sal_IntPtr>(rEvent.GetData()) == TabBar::PAGE_NOT_FOUND ) && ( dynamic_cast< AccessibleTabBarPageList *> (this) != nullptr ) ) { return; } - if ( !pEventWindow->IsAccessibilityEventsSuppressed() || (rEvent.GetId() == VCLEVENT_OBJECT_DYING) ) + if ( !pEventWindow->IsAccessibilityEventsSuppressed() || (rEvent.GetId() == VclEventId::ObjectDying) ) ProcessWindowEvent( rEvent ); } void AccessibleTabBarBase::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { - if( rVclWindowEvent.GetId() == VCLEVENT_OBJECT_DYING ) + if( rVclWindowEvent.GetId() == VclEventId::ObjectDying ) ClearTabBarPointer(); } diff --git a/accessibility/source/extended/accessibletabbarpagelist.cxx b/accessibility/source/extended/accessibletabbarpagelist.cxx index 9e80a3f7af9f..05848a598b66 100644 --- a/accessibility/source/extended/accessibletabbarpagelist.cxx +++ b/accessibility/source/extended/accessibletabbarpagelist.cxx @@ -178,7 +178,7 @@ namespace accessibility { switch ( rVclWindowEvent.GetId() ) { - case VCLEVENT_WINDOW_ENABLED: + case VclEventId::WindowEnabled: { Any aNewValue; aNewValue <<= AccessibleStateType::SENSITIVE; @@ -187,7 +187,7 @@ namespace accessibility NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, Any(), aNewValue ); } break; - case VCLEVENT_WINDOW_DISABLED: + case VclEventId::WindowDisabled: { Any aOldValue; aOldValue <<= AccessibleStateType::ENABLED; @@ -196,7 +196,7 @@ namespace accessibility NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, Any() ); } break; - case VCLEVENT_WINDOW_SHOW: + case VclEventId::WindowShow: { Any aOldValue, aNewValue; aNewValue <<= AccessibleStateType::SHOWING; @@ -204,7 +204,7 @@ namespace accessibility UpdateShowing( true ); } break; - case VCLEVENT_WINDOW_HIDE: + case VclEventId::WindowHide: { Any aOldValue, aNewValue; aOldValue <<= AccessibleStateType::SHOWING; @@ -212,12 +212,12 @@ namespace accessibility UpdateShowing( false ); } break; - case VCLEVENT_TABBAR_PAGESELECTED: + case VclEventId::TabbarPageSelected: { // do nothing } break; - case VCLEVENT_TABBAR_PAGEACTIVATED: + case VclEventId::TabbarPageActivated: { if ( m_pTabBar ) { @@ -227,7 +227,7 @@ namespace accessibility } } break; - case VCLEVENT_TABBAR_PAGEDEACTIVATED: + case VclEventId::TabbarPageDeactivated: { if ( m_pTabBar ) { @@ -237,7 +237,7 @@ namespace accessibility } } break; - case VCLEVENT_TABBAR_PAGEINSERTED: + case VclEventId::TabbarPageInserted: { if ( m_pTabBar ) { @@ -247,7 +247,7 @@ namespace accessibility } } break; - case VCLEVENT_TABBAR_PAGEREMOVED: + case VclEventId::TabbarPageRemoved: { if ( m_pTabBar ) { @@ -277,14 +277,14 @@ namespace accessibility } } break; - case VCLEVENT_TABBAR_PAGEMOVED: + case VclEventId::TabbarPageMoved: { Pair* pPair = static_cast<Pair*>(rVclWindowEvent.GetData()); if ( pPair ) MoveChild( pPair->A(), pPair->B() ); } break; - case VCLEVENT_TABBAR_PAGETEXTCHANGED: + case VclEventId::TabbarPageTextChanged: { sal_uInt16 nPageId = (sal_uInt16)reinterpret_cast<sal_IntPtr>(rVclWindowEvent.GetData()); sal_uInt16 nPagePos = m_pTabBar->GetPagePos( nPageId ); diff --git a/accessibility/source/extended/accessibletablistboxtable.cxx b/accessibility/source/extended/accessibletablistboxtable.cxx index 529892445008..6b73a4a09b47 100644 --- a/accessibility/source/extended/accessibletablistboxtable.cxx +++ b/accessibility/source/extended/accessibletablistboxtable.cxx @@ -65,21 +65,21 @@ namespace accessibility { if ( isAlive() ) { - sal_uLong nEventId = rVclWindowEvent.GetId(); + VclEventId nEventId = rVclWindowEvent.GetId(); switch ( nEventId ) { - case VCLEVENT_OBJECT_DYING : + case VclEventId::ObjectDying : { m_pTabListBox->RemoveEventListener( LINK( this, AccessibleTabListBoxTable, WindowEventListener ) ); m_pTabListBox = nullptr; break; } - case VCLEVENT_CONTROL_GETFOCUS : - case VCLEVENT_CONTROL_LOSEFOCUS : + case VclEventId::ControlGetFocus : + case VclEventId::ControlLoseFocus : { uno::Any aOldValue, aNewValue; - if ( VCLEVENT_CONTROL_GETFOCUS == nEventId ) + if ( VclEventId::ControlGetFocus == nEventId ) aNewValue <<= AccessibleStateType::FOCUSED; else aOldValue <<= AccessibleStateType::FOCUSED; @@ -87,7 +87,7 @@ namespace accessibility break; } - case VCLEVENT_LISTBOX_SELECT : + case VclEventId::ListboxSelect : { // First send an event that tells the listeners of a // modified selection. The active descendant event is @@ -131,7 +131,7 @@ namespace accessibility } break; } - case VCLEVENT_WINDOW_GETFOCUS : + case VclEventId::WindowGetFocus : { uno::Any aOldValue, aNewValue; aNewValue <<= AccessibleStateType::FOCUSED; @@ -139,14 +139,14 @@ namespace accessibility break; } - case VCLEVENT_WINDOW_LOSEFOCUS : + case VclEventId::WindowLoseFocus : { uno::Any aOldValue, aNewValue; aOldValue <<= AccessibleStateType::FOCUSED; commitEvent( AccessibleEventId::STATE_CHANGED, aNewValue, aOldValue ); break; } - case VCLEVENT_LISTBOX_TREESELECT: + case VclEventId::ListboxTreeSelect: { SvTreeListEntry* pEntry = static_cast< SvTreeListEntry* >( rVclWindowEvent.GetData() ); if (pEntry) @@ -167,7 +167,7 @@ namespace accessibility } } break; - case VCLEVENT_LISTBOX_TREEFOCUS: + case VclEventId::ListboxTreeFocus: { if ( m_pTabListBox && m_pTabListBox->HasFocus() ) { @@ -189,7 +189,7 @@ namespace accessibility } break; - case VCLEVENT_CHECKBOX_TOGGLE : + case VclEventId::CheckboxToggle : { if ( m_pTabListBox && m_pTabListBox->HasFocus() ) { @@ -212,7 +212,7 @@ namespace accessibility break; } - case VCLEVENT_TABLECELL_NAMECHANGED : + case VclEventId::TableCellNameChanged : { if ( m_pTabListBox->IsTransientChildrenDisabled() ) { @@ -247,6 +247,7 @@ namespace accessibility } break; } + default: break; } } } diff --git a/accessibility/source/extended/listboxaccessible.cxx b/accessibility/source/extended/listboxaccessible.cxx index 63cb02db16f7..781412078835 100644 --- a/accessibility/source/extended/listboxaccessible.cxx +++ b/accessibility/source/extended/listboxaccessible.cxx @@ -50,7 +50,7 @@ namespace accessibility { switch ( rEvent.GetId() ) { - case VCLEVENT_OBJECT_DYING : + case VclEventId::ObjectDying : { if ( m_pWindow ) m_pWindow->RemoveEventListener( LINK( this, ListBoxAccessibleBase, WindowEventListener ) ); @@ -58,6 +58,7 @@ namespace accessibility dispose(); break; } + default: break; } } } diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx index 07a67088aa73..6964ea409d65 100644 --- a/accessibility/source/extended/textwindowaccessibility.cxx +++ b/accessibility/source/extended/textwindowaccessibility.cxx @@ -1629,7 +1629,7 @@ IMPL_LINK(Document, WindowEventHandler, ::VclWindowEvent&, rEvent, void) { switch (rEvent.GetId()) { - case VCLEVENT_WINDOW_RESIZE: + case VclEventId::WindowResize: { ::osl::MutexGuard aInternalGuard(GetMutex()); if (!isAlive()) @@ -1652,7 +1652,7 @@ IMPL_LINK(Document, WindowEventHandler, ::VclWindowEvent&, rEvent, void) } break; } - case VCLEVENT_WINDOW_GETFOCUS: + case VclEventId::WindowGetFocus: { ::osl::MutexGuard aInternalGuard(GetMutex()); if (!isAlive()) @@ -1689,7 +1689,7 @@ IMPL_LINK(Document, WindowEventHandler, ::VclWindowEvent&, rEvent, void) */ break; } - case VCLEVENT_WINDOW_LOSEFOCUS: + case VclEventId::WindowLoseFocus: { ::osl::MutexGuard aInternalGuard(GetMutex()); if (!isAlive()) @@ -1728,6 +1728,7 @@ IMPL_LINK(Document, WindowEventHandler, ::VclWindowEvent&, rEvent, void) */ break; } + default: break; } } diff --git a/accessibility/source/standard/accessiblemenubasecomponent.cxx b/accessibility/source/standard/accessiblemenubasecomponent.cxx index 957e82490558..0d8fb8d8b03a 100644 --- a/accessibility/source/standard/accessiblemenubasecomponent.cxx +++ b/accessibility/source/standard/accessiblemenubasecomponent.cxx @@ -542,82 +542,82 @@ void OAccessibleMenuBaseComponent::ProcessMenuEvent( const VclMenuEvent& rVclMen switch ( rVclMenuEvent.GetId() ) { - case VCLEVENT_MENU_SHOW: - case VCLEVENT_MENU_HIDE: + case VclEventId::MenuShow: + case VclEventId::MenuHide: { UpdateVisible(); } break; - case VCLEVENT_MENU_HIGHLIGHT: + case VclEventId::MenuHighlight: { SetFocused( false ); UpdateFocused( nItemPos, true ); UpdateSelected( nItemPos, true ); } break; - case VCLEVENT_MENU_DEHIGHLIGHT: + case VclEventId::MenuDehighlight: { UpdateFocused( nItemPos, false ); UpdateSelected( nItemPos, false ); } break; - case VCLEVENT_MENU_SUBMENUACTIVATE: + case VclEventId::MenuSubmenuActivate: { } break; - case VCLEVENT_MENU_SUBMENUDEACTIVATE: + case VclEventId::MenuSubmenuDeactivate: { UpdateFocused( nItemPos, true ); } break; - case VCLEVENT_MENU_ENABLE: + case VclEventId::MenuEnable: { UpdateEnabled( nItemPos, true ); } break; - case VCLEVENT_MENU_DISABLE: + case VclEventId::MenuDisable: { UpdateEnabled( nItemPos, false ); } break; - case VCLEVENT_MENU_SUBMENUCHANGED: + case VclEventId::MenuSubmenuChanged: { RemoveChild( nItemPos ); InsertChild( nItemPos ); } break; - case VCLEVENT_MENU_INSERTITEM: + case VclEventId::MenuInsertItem: { InsertChild( nItemPos ); } break; - case VCLEVENT_MENU_REMOVEITEM: + case VclEventId::MenuRemoveItem: { RemoveChild( nItemPos ); } break; - case VCLEVENT_MENU_ACCESSIBLENAMECHANGED: + case VclEventId::MenuAccessibleNameChanged: { UpdateAccessibleName( nItemPos ); } break; - case VCLEVENT_MENU_ITEMTEXTCHANGED: + case VclEventId::MenuItemTextChanged: { UpdateAccessibleName( nItemPos ); UpdateItemText( nItemPos ); } break; - case VCLEVENT_MENU_ITEMCHECKED: + case VclEventId::MenuItemChecked: { UpdateChecked( nItemPos, true ); } break; - case VCLEVENT_MENU_ITEMUNCHECKED: + case VclEventId::MenuItemUnchecked: { UpdateChecked( nItemPos, false ); } break; - case VCLEVENT_OBJECT_DYING: + case VclEventId::ObjectDying: { if ( m_pMenu ) { diff --git a/accessibility/source/standard/vclxaccessiblebox.cxx b/accessibility/source/standard/vclxaccessiblebox.cxx index 4a28c71152c8..2c043439a6d9 100644 --- a/accessibility/source/standard/vclxaccessiblebox.cxx +++ b/accessibility/source/standard/vclxaccessiblebox.cxx @@ -66,8 +66,8 @@ void VCLXAccessibleBox::ProcessWindowChildEvent( const VclWindowEvent& rVclWindo switch ( rVclWindowEvent.GetId() ) { - case VCLEVENT_WINDOW_SHOW: - case VCLEVENT_WINDOW_HIDE: + case VclEventId::WindowShow: + case VclEventId::WindowHide: { vcl::Window* pChildWindow = static_cast<vcl::Window *>(rVclWindowEvent.GetData()); // Just compare to the combo box text field. All other children @@ -79,7 +79,7 @@ void VCLXAccessibleBox::ProcessWindowChildEvent( const VclWindowEvent& rVclWindo if ( ( pComboBox != nullptr ) && ( pChildWindow != nullptr ) ) if (pChildWindow == pComboBox->GetSubEdit()) { - if (rVclWindowEvent.GetId() == VCLEVENT_WINDOW_SHOW) + if (rVclWindowEvent.GetId() == VclEventId::WindowShow) { // Instantiate text field. getAccessibleChild (0); @@ -110,9 +110,9 @@ void VCLXAccessibleBox::ProcessWindowEvent (const VclWindowEvent& rVclWindowEven { switch ( rVclWindowEvent.GetId() ) { - case VCLEVENT_DROPDOWN_SELECT: - case VCLEVENT_LISTBOX_SELECT: - case VCLEVENT_LISTBOX_FOCUSITEMCHANGED: + case VclEventId::DropdownSelect: + case VclEventId::ListboxSelect: + case VclEventId::ListboxFocusItemChanged: { // Forward the call to the list child. VCLXAccessibleList* pList = static_cast<VCLXAccessibleList*>(m_xList.get()); @@ -133,7 +133,7 @@ void VCLXAccessibleBox::ProcessWindowEvent (const VclWindowEvent& rVclWindowEven } break; } - case VCLEVENT_DROPDOWN_OPEN: + case VclEventId::DropdownOpen: { VCLXAccessibleList* pList = static_cast<VCLXAccessibleList*>(m_xList.get()); if ( pList == nullptr ) @@ -148,7 +148,7 @@ void VCLXAccessibleBox::ProcessWindowEvent (const VclWindowEvent& rVclWindowEven } break; } - case VCLEVENT_DROPDOWN_CLOSE: + case VclEventId::DropdownClose: { VCLXAccessibleList* pList = static_cast<VCLXAccessibleList*>(m_xList.get()); if ( pList == nullptr ) @@ -169,7 +169,7 @@ void VCLXAccessibleBox::ProcessWindowEvent (const VclWindowEvent& rVclWindowEven } break; } - case VCLEVENT_COMBOBOX_SELECT: + case VclEventId::ComboboxSelect: { VCLXAccessibleList* pList = static_cast<VCLXAccessibleList*>(m_xList.get()); if (pList != nullptr && m_xText.is()) @@ -189,16 +189,16 @@ void VCLXAccessibleBox::ProcessWindowEvent (const VclWindowEvent& rVclWindowEven } break; } - //case VCLEVENT_DROPDOWN_OPEN: - //case VCLEVENT_DROPDOWN_CLOSE: - case VCLEVENT_LISTBOX_DOUBLECLICK: - case VCLEVENT_LISTBOX_SCROLLED: - //case VCLEVENT_LISTBOX_SELECT: - case VCLEVENT_LISTBOX_ITEMADDED: - case VCLEVENT_LISTBOX_ITEMREMOVED: - case VCLEVENT_COMBOBOX_ITEMADDED: - case VCLEVENT_COMBOBOX_ITEMREMOVED: - case VCLEVENT_COMBOBOX_SCROLLED: + //case VclEventId::DropdownOpen: + //case VclEventId::DropdownClose: + case VclEventId::ListboxDoubleClick: + case VclEventId::ListboxScrolled: + //case VclEventId::ListboxSelect: + case VclEventId::ListboxItemAdded: + case VclEventId::ListboxItemRemoved: + case VclEventId::ComboboxItemAdded: + case VclEventId::ComboboxItemRemoved: + case VclEventId::ComboboxScrolled: { // Forward the call to the list child. VCLXAccessibleList* pList = static_cast<VCLXAccessibleList*>(m_xList.get()); @@ -212,8 +212,8 @@ void VCLXAccessibleBox::ProcessWindowEvent (const VclWindowEvent& rVclWindowEven break; } - //case VCLEVENT_COMBOBOX_SELECT: - case VCLEVENT_COMBOBOX_DESELECT: + //case VclEventId::ComboboxSelect: + case VclEventId::ComboboxDeselect: { // Selection is handled by VCLXAccessibleList which operates on // the same VCL object as this box does. In case of the @@ -234,9 +234,9 @@ void VCLXAccessibleBox::ProcessWindowEvent (const VclWindowEvent& rVclWindowEven break; } - case VCLEVENT_EDIT_MODIFY: - case VCLEVENT_EDIT_SELECTIONCHANGED: - case VCLEVENT_EDIT_CARETCHANGED: + case VclEventId::EditModify: + case VclEventId::EditSelectionChanged: + case VclEventId::EditCaretChanged: // Modify/Selection events are handled by the combo box instead of // directly by the edit field (Why?). Therefore, delegate this // call to the edit field. diff --git a/accessibility/source/standard/vclxaccessiblebutton.cxx b/accessibility/source/standard/vclxaccessiblebutton.cxx index b7feea96c46a..cd12ca8c8796 100644 --- a/accessibility/source/standard/vclxaccessiblebutton.cxx +++ b/accessibility/source/standard/vclxaccessiblebutton.cxx @@ -57,7 +57,7 @@ void VCLXAccessibleButton::ProcessWindowEvent( const VclWindowEvent& rVclWindowE { switch ( rVclWindowEvent.GetId() ) { - case VCLEVENT_PUSHBUTTON_TOGGLE: + case VclEventId::PushbuttonToggle: { Any aOldValue; Any aNewValue; diff --git a/accessibility/source/standard/vclxaccessiblecheckbox.cxx b/accessibility/source/standard/vclxaccessiblecheckbox.cxx index 9221c10dfa09..8c71bb48ec59 100644 --- a/accessibility/source/standard/vclxaccessiblecheckbox.cxx +++ b/accessibility/source/standard/vclxaccessiblecheckbox.cxx @@ -115,7 +115,7 @@ void VCLXAccessibleCheckBox::ProcessWindowEvent( const VclWindowEvent& rVclWindo { switch ( rVclWindowEvent.GetId() ) { - case VCLEVENT_CHECKBOX_TOGGLE: + case VclEventId::CheckboxToggle: { SetChecked( IsChecked() ); SetIndeterminate( IsIndeterminate() ); diff --git a/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx b/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx index 408e2be10a16..55b4506e05d3 100644 --- a/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx +++ b/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx @@ -64,8 +64,8 @@ void VCLXAccessibleDropDownComboBox::ProcessWindowEvent (const VclWindowEvent& r { switch ( rVclWindowEvent.GetId() ) { - case VCLEVENT_DROPDOWN_OPEN: - case VCLEVENT_DROPDOWN_CLOSE: + case VclEventId::DropdownOpen: + case VclEventId::DropdownClose: { break; } diff --git a/accessibility/source/standard/vclxaccessibleedit.cxx b/accessibility/source/standard/vclxaccessibleedit.cxx index 432315a35aea..fa3d0bc6f3a2 100644 --- a/accessibility/source/standard/vclxaccessibleedit.cxx +++ b/accessibility/source/standard/vclxaccessibleedit.cxx @@ -69,12 +69,12 @@ void VCLXAccessibleEdit::ProcessWindowEvent( const VclWindowEvent& rVclWindowEve { switch ( rVclWindowEvent.GetId() ) { - case VCLEVENT_EDIT_MODIFY: + case VclEventId::EditModify: { SetText( implGetText() ); } break; - case VCLEVENT_EDIT_CARETCHANGED: + case VclEventId::EditCaretChanged: { sal_Int32 nOldCaretPosition = m_nCaretPosition; m_nCaretPosition = getCaretPosition(); @@ -92,7 +92,7 @@ void VCLXAccessibleEdit::ProcessWindowEvent( const VclWindowEvent& rVclWindowEve } } break; - case VCLEVENT_EDIT_SELECTIONCHANGED: + case VclEventId::EditSelectionChanged: { VclPtr<vcl::Window> pWindow = GetWindow(); if (pWindow && pWindow->HasChildPathFocus()) diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx b/accessibility/source/standard/vclxaccessiblelist.cxx index 38f6c39e282c..e369ea329aa0 100644 --- a/accessibility/source/standard/vclxaccessiblelist.cxx +++ b/accessibility/source/standard/vclxaccessiblelist.cxx @@ -337,18 +337,18 @@ void VCLXAccessibleList::ProcessWindowEvent (const VclWindowEvent& rVclWindowEve { switch ( rVclWindowEvent.GetId() ) { - case VCLEVENT_DROPDOWN_SELECT: - case VCLEVENT_LISTBOX_SELECT: + case VclEventId::DropdownSelect: + case VclEventId::ListboxSelect: if ( !m_bDisableProcessEvent ) UpdateSelection_Impl_Acc(b_IsDropDownList); break; - case VCLEVENT_LISTBOX_FOCUSITEMCHANGED: + case VclEventId::ListboxFocusItemChanged: if ( !m_bDisableProcessEvent ) UpdateFocus_Impl_Acc((sal_uInt16)reinterpret_cast<sal_uIntPtr>(rVclWindowEvent.GetData()),b_IsDropDownList); break; - case VCLEVENT_WINDOW_GETFOCUS: + case VclEventId::WindowGetFocus: break; - case VCLEVENT_CONTROL_GETFOCUS: + case VclEventId::ControlGetFocus: { VCLXAccessibleComponent::ProcessWindowEvent (rVclWindowEvent); if (m_aBoxType == COMBOBOX && b_IsDropDownList) @@ -386,28 +386,28 @@ void VCLXAccessibleList::ProcessWindowEvent (const VclWindowEvent& rVclWindowEve void VCLXAccessibleList::ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent) { // Create a reference to this object to prevent an early release of the - // listbox (VCLEVENT_OBJECT_DYING). + // listbox (VclEventId::ObjectDying). Reference< XAccessible > xTemp = this; switch ( rVclWindowEvent.GetId() ) { - case VCLEVENT_DROPDOWN_OPEN: + case VclEventId::DropdownOpen: notifyVisibleStates(true); break; - case VCLEVENT_DROPDOWN_CLOSE: + case VclEventId::DropdownClose: notifyVisibleStates(false); break; - case VCLEVENT_LISTBOX_SCROLLED: - case VCLEVENT_COMBOBOX_SCROLLED: + case VclEventId::ListboxScrolled: + case VclEventId::ComboboxScrolled: UpdateEntryRange_Impl(); break; - // The selection events VCLEVENT_COMBOBOX_SELECT and - // VCLEVENT_COMBOBOX_DESELECT are not handled here because here we + // The selection events VclEventId::ComboboxSelect and + // VclEventId::ComboboxDeselect are not handled here because here we // have no access to the edit field. Its text is necessary to // identify the currently selected item. - case VCLEVENT_OBJECT_DYING: + case VclEventId::ObjectDying: { dispose(); @@ -415,18 +415,18 @@ void VCLXAccessibleList::ProcessWindowEvent (const VclWindowEvent& rVclWindowEve break; } - case VCLEVENT_LISTBOX_ITEMREMOVED: - case VCLEVENT_COMBOBOX_ITEMREMOVED: + case VclEventId::ListboxItemRemoved: + case VclEventId::ComboboxItemRemoved: HandleChangedItemList (false, reinterpret_cast<sal_IntPtr>( rVclWindowEvent.GetData())); break; - case VCLEVENT_LISTBOX_ITEMADDED: - case VCLEVENT_COMBOBOX_ITEMADDED: + case VclEventId::ListboxItemAdded: + case VclEventId::ComboboxItemAdded: HandleChangedItemList (true, reinterpret_cast<sal_IntPtr>( rVclWindowEvent.GetData())); break; - case VCLEVENT_CONTROL_GETFOCUS: + case VclEventId::ControlGetFocus: { VCLXAccessibleComponent::ProcessWindowEvent (rVclWindowEvent); // Added by IBM Symphony Acc team to handle the list item focus when List control get focus diff --git a/accessibility/source/standard/vclxaccessiblemenubar.cxx b/accessibility/source/standard/vclxaccessiblemenubar.cxx index ca917152d313..f1855c59c3a4 100644 --- a/accessibility/source/standard/vclxaccessiblemenubar.cxx +++ b/accessibility/source/standard/vclxaccessiblemenubar.cxx @@ -72,7 +72,7 @@ bool VCLXAccessibleMenuBar::IsFocused() IMPL_LINK( VCLXAccessibleMenuBar, WindowEventListener, VclWindowEvent&, rEvent, void ) { OSL_ENSURE( rEvent.GetWindow(), "VCLXAccessibleMenuBar::WindowEventListener: no window!" ); - if ( !rEvent.GetWindow()->IsAccessibilityEventsSuppressed() || ( rEvent.GetId() == VCLEVENT_OBJECT_DYING ) ) + if ( !rEvent.GetWindow()->IsAccessibilityEventsSuppressed() || ( rEvent.GetId() == VclEventId::ObjectDying ) ) { ProcessWindowEvent( rEvent ); } @@ -83,13 +83,13 @@ void VCLXAccessibleMenuBar::ProcessWindowEvent( const VclWindowEvent& rVclWindow { switch ( rVclWindowEvent.GetId() ) { - case VCLEVENT_WINDOW_GETFOCUS: - case VCLEVENT_WINDOW_LOSEFOCUS: + case VclEventId::WindowGetFocus: + case VclEventId::WindowLoseFocus: { - SetFocused( rVclWindowEvent.GetId() == VCLEVENT_WINDOW_GETFOCUS ); + SetFocused( rVclWindowEvent.GetId() == VclEventId::WindowGetFocus ); } break; - case VCLEVENT_OBJECT_DYING: + case VclEventId::ObjectDying: { if ( m_pWindow ) { diff --git a/accessibility/source/standard/vclxaccessibleradiobutton.cxx b/accessibility/source/standard/vclxaccessibleradiobutton.cxx index 23cae200edc4..ab567e27609f 100644 --- a/accessibility/source/standard/vclxaccessibleradiobutton.cxx +++ b/accessibility/source/standard/vclxaccessibleradiobutton.cxx @@ -62,7 +62,7 @@ void VCLXAccessibleRadioButton::ProcessWindowEvent( const VclWindowEvent& rVclWi { switch ( rVclWindowEvent.GetId() ) { - case VCLEVENT_RADIOBUTTON_TOGGLE: + case VclEventId::RadiobuttonToggle: { Any aOldValue; Any aNewValue; diff --git a/accessibility/source/standard/vclxaccessiblescrollbar.cxx b/accessibility/source/standard/vclxaccessiblescrollbar.cxx index 6fdf4166a1d3..74e89b53d36e 100644 --- a/accessibility/source/standard/vclxaccessiblescrollbar.cxx +++ b/accessibility/source/standard/vclxaccessiblescrollbar.cxx @@ -58,7 +58,7 @@ void VCLXAccessibleScrollBar::ProcessWindowEvent( const VclWindowEvent& rVclWind { switch ( rVclWindowEvent.GetId() ) { - case VCLEVENT_SCROLLBAR_SCROLL: + case VclEventId::ScrollbarScroll: { NotifyAccessibleEvent( AccessibleEventId::VALUE_CHANGED, Any(), Any() ); } diff --git a/accessibility/source/standard/vclxaccessiblestatusbar.cxx b/accessibility/source/standard/vclxaccessiblestatusbar.cxx index 3f4c0aeb6e1e..22b4e22713ee 100644 --- a/accessibility/source/standard/vclxaccessiblestatusbar.cxx +++ b/accessibility/source/standard/vclxaccessiblestatusbar.cxx @@ -148,7 +148,7 @@ void VCLXAccessibleStatusBar::ProcessWindowEvent( const VclWindowEvent& rVclWind { switch ( rVclWindowEvent.GetId() ) { - case VCLEVENT_STATUSBAR_ITEMADDED: + case VclEventId::StatusbarItemAdded: { if ( m_pStatusBar ) { @@ -158,7 +158,7 @@ void VCLXAccessibleStatusBar::ProcessWindowEvent( const VclWindowEvent& rVclWind } } break; - case VCLEVENT_STATUSBAR_ITEMREMOVED: + case VclEventId::StatusbarItemRemoved: { if ( m_pStatusBar ) { @@ -179,30 +179,30 @@ void VCLXAccessibleStatusBar::ProcessWindowEvent( const VclWindowEvent& rVclWind } } break; - case VCLEVENT_STATUSBAR_ALLITEMSREMOVED: + case VclEventId::StatusbarAllItemsRemoved: { for ( sal_Int32 i = m_aAccessibleChildren.size() - 1; i >= 0; --i ) RemoveChild( i ); } break; - case VCLEVENT_STATUSBAR_SHOWITEM: - case VCLEVENT_STATUSBAR_HIDEITEM: + case VclEventId::StatusbarShowItem: + case VclEventId::StatusbarHideItem: { if ( m_pStatusBar ) { sal_uInt16 nItemId = (sal_uInt16)reinterpret_cast<sal_IntPtr>(rVclWindowEvent.GetData()); sal_uInt16 nItemPos = m_pStatusBar->GetItemPos( nItemId ); - UpdateShowing( nItemPos, rVclWindowEvent.GetId() == VCLEVENT_STATUSBAR_SHOWITEM ); + UpdateShowing( nItemPos, rVclWindowEvent.GetId() == VclEventId::StatusbarShowItem ); } } break; - case VCLEVENT_STATUSBAR_SHOWALLITEMS: + case VclEventId::StatusbarShowAllItems: { for ( size_t i = 0; i < m_aAccessibleChildren.size(); ++i ) - UpdateShowing( i, rVclWindowEvent.GetId() == VCLEVENT_STATUSBAR_SHOWALLITEMS ); + UpdateShowing( i, rVclWindowEvent.GetId() == VclEventId::StatusbarShowAllItems ); } break; - case VCLEVENT_STATUSBAR_NAMECHANGED: + case VclEventId::StatusbarNameChanged: { if ( m_pStatusBar ) { @@ -212,7 +212,7 @@ void VCLXAccessibleStatusBar::ProcessWindowEvent( const VclWindowEvent& rVclWind } } break; - case VCLEVENT_STATUSBAR_DRAWITEM: + case VclEventId::StatusbarDrawItem: { if ( m_pStatusBar ) { @@ -222,7 +222,7 @@ void VCLXAccessibleStatusBar::ProcessWindowEvent( const VclWindowEvent& rVclWind } } break; - case VCLEVENT_OBJECT_DYING: + case VclEventId::ObjectDying: { if ( m_pStatusBar ) { diff --git a/accessibility/source/standard/vclxaccessibletabcontrol.cxx b/accessibility/source/standard/vclxaccessibletabcontrol.cxx index 12837d670918..637e0b656e97 100644 --- a/accessibility/source/standard/vclxaccessibletabcontrol.cxx +++ b/accessibility/source/standard/vclxaccessibletabcontrol.cxx @@ -161,19 +161,19 @@ void VCLXAccessibleTabControl::ProcessWindowEvent( const VclWindowEvent& rVclWin { switch ( rVclWindowEvent.GetId() ) { - case VCLEVENT_TABPAGE_ACTIVATE: - case VCLEVENT_TABPAGE_DEACTIVATE: + case VclEventId::TabpageActivate: + case VclEventId::TabpageDeactivate: { if ( m_pTabControl ) { sal_uInt16 nPageId = (sal_uInt16)reinterpret_cast<sal_IntPtr>(rVclWindowEvent.GetData()); sal_uInt16 nPagePos = m_pTabControl->GetPagePos( nPageId ); UpdateFocused(); - UpdateSelected( nPagePos, rVclWindowEvent.GetId() == VCLEVENT_TABPAGE_ACTIVATE ); + UpdateSelected( nPagePos, rVclWindowEvent.GetId() == VclEventId::TabpageActivate ); } } break; - case VCLEVENT_TABPAGE_PAGETEXTCHANGED: + case VclEventId::TabpagePageTextChanged: { if ( m_pTabControl ) { @@ -183,7 +183,7 @@ void VCLXAccessibleTabControl::ProcessWindowEvent( const VclWindowEvent& rVclWin } } break; - case VCLEVENT_TABPAGE_INSERTED: + case VclEventId::TabpageInserted: { if ( m_pTabControl ) { @@ -193,7 +193,7 @@ void VCLXAccessibleTabControl::ProcessWindowEvent( const VclWindowEvent& rVclWin } } break; - case VCLEVENT_TABPAGE_REMOVED: + case VclEventId::TabpageRemoved: { if ( m_pTabControl ) { @@ -214,19 +214,19 @@ void VCLXAccessibleTabControl::ProcessWindowEvent( const VclWindowEvent& rVclWin } } break; - case VCLEVENT_TABPAGE_REMOVEDALL: + case VclEventId::TabpageRemovedAll: { for ( sal_Int32 i = m_aAccessibleChildren.size() - 1; i >= 0; --i ) RemoveChild( i ); } break; - case VCLEVENT_WINDOW_GETFOCUS: - case VCLEVENT_WINDOW_LOSEFOCUS: + case VclEventId::WindowGetFocus: + case VclEventId::WindowLoseFocus: { UpdateFocused(); } break; - case VCLEVENT_OBJECT_DYING: + case VclEventId::ObjectDying: { if ( m_pTabControl ) { @@ -255,8 +255,8 @@ void VCLXAccessibleTabControl::ProcessWindowChildEvent( const VclWindowEvent& rV { switch ( rVclWindowEvent.GetId() ) { - case VCLEVENT_WINDOW_SHOW: - case VCLEVENT_WINDOW_HIDE: + case VclEventId::WindowShow: + case VclEventId::WindowHide: { if ( m_pTabControl ) { @@ -268,7 +268,7 @@ void VCLXAccessibleTabControl::ProcessWindowChildEvent( const VclWindowEvent& rV sal_uInt16 nPageId = m_pTabControl->GetPageId( (sal_uInt16)i ); TabPage* pTabPage = m_pTabControl->GetTabPage( nPageId ); if ( pTabPage == static_cast<TabPage*>(pChild) ) - UpdateTabPage( i, rVclWindowEvent.GetId() == VCLEVENT_WINDOW_SHOW ); + UpdateTabPage( i, rVclWindowEvent.GetId() == VclEventId::WindowShow ); } } } diff --git a/accessibility/source/standard/vclxaccessibletextcomponent.cxx b/accessibility/source/standard/vclxaccessibletextcomponent.cxx index 8a0543f676e0..3fa741fa4a13 100644 --- a/accessibility/source/standard/vclxaccessibletextcomponent.cxx +++ b/accessibility/source/standard/vclxaccessibletextcomponent.cxx @@ -74,7 +74,7 @@ void VCLXAccessibleTextComponent::ProcessWindowEvent( const VclWindowEvent& rVcl { switch ( rVclWindowEvent.GetId() ) { - case VCLEVENT_WINDOW_FRAMETITLECHANGED: + case VclEventId::WindowFrameTitleChanged: { VCLXAccessibleComponent::ProcessWindowEvent( rVclWindowEvent ); SetText( implGetText() ); diff --git a/accessibility/source/standard/vclxaccessibletoolbox.cxx b/accessibility/source/standard/vclxaccessibletoolbox.cxx index 126e4c1758d3..ab3ff8185dff 100644 --- a/accessibility/source/standard/vclxaccessibletoolbox.cxx +++ b/accessibility/source/standard/vclxaccessibletoolbox.cxx @@ -507,13 +507,13 @@ void VCLXAccessibleToolBox::FillAccessibleStateSet( utl::AccessibleStateSetHelpe void VCLXAccessibleToolBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { - // to prevent an early release of the toolbox (VCLEVENT_OBJECT_DYING) + // to prevent an early release of the toolbox (VclEventId::ObjectDying) Reference< XAccessibleContext > xTemp = this; switch ( rVclWindowEvent.GetId() ) { - case VCLEVENT_TOOLBOX_CLICK: - case VCLEVENT_TOOLBOX_SELECT: + case VclEventId::ToolboxClick: + case VclEventId::ToolboxSelect: { VclPtr< ToolBox > pToolBox = GetAs< ToolBox >(); if ( rVclWindowEvent.GetData() ) @@ -528,13 +528,13 @@ void VCLXAccessibleToolBox::ProcessWindowEvent( const VclWindowEvent& rVclWindow } break; } - case VCLEVENT_TOOLBOX_DOUBLECLICK: - case VCLEVENT_TOOLBOX_ACTIVATE: - case VCLEVENT_TOOLBOX_DEACTIVATE: - //case VCLEVENT_TOOLBOX_SELECT: + case VclEventId::ToolboxDoubleClick: + case VclEventId::ToolboxActivate: + case VclEventId::ToolboxDeactivate: + //case VclEventId::ToolboxSelect: break; - case VCLEVENT_TOOLBOX_ITEMUPDATED: + case VclEventId::ToolboxItemUpdated: { if ( rVclWindowEvent.GetData() ) { @@ -544,26 +544,26 @@ void VCLXAccessibleToolBox::ProcessWindowEvent( const VclWindowEvent& rVclWindow break; } - case VCLEVENT_TOOLBOX_HIGHLIGHT: + case VclEventId::ToolboxHighlight: UpdateFocus_Impl(); break; - case VCLEVENT_TOOLBOX_HIGHLIGHTOFF: + case VclEventId::ToolboxHighlightOff: ReleaseFocus_Impl( (sal_Int32)reinterpret_cast<sal_IntPtr>(rVclWindowEvent.GetData()) ); break; - case VCLEVENT_TOOLBOX_ITEMADDED : + case VclEventId::ToolboxItemAdded : UpdateItem_Impl( (sal_Int32)reinterpret_cast<sal_IntPtr>(rVclWindowEvent.GetData()) ); break; - case VCLEVENT_TOOLBOX_ITEMREMOVED : - case VCLEVENT_TOOLBOX_ALLITEMSCHANGED : + case VclEventId::ToolboxItemRemoved : + case VclEventId::ToolboxAllItemsChanged : { UpdateAllItems_Impl(); break; } - case VCLEVENT_TOOLBOX_ITEMWINDOWCHANGED: + case VclEventId::ToolboxItemWindowChanged: { sal_Int32 nPos = (sal_Int32)reinterpret_cast<sal_IntPtr>(rVclWindowEvent.GetData()); ToolBoxItemsMap::iterator aAccessiblePos( m_aAccessibleChildren.find( nPos ) ); @@ -578,25 +578,25 @@ void VCLXAccessibleToolBox::ProcessWindowEvent( const VclWindowEvent& rVclWindow NotifyAccessibleEvent( AccessibleEventId::CHILD, Any(), aNewValue ); break; } - case VCLEVENT_TOOLBOX_ITEMTEXTCHANGED : + case VclEventId::ToolboxItemTextChanged : UpdateItemName_Impl( (sal_Int32)reinterpret_cast<sal_IntPtr>(rVclWindowEvent.GetData()) ); break; - case VCLEVENT_TOOLBOX_ITEMENABLED : - case VCLEVENT_TOOLBOX_ITEMDISABLED : + case VclEventId::ToolboxItemEnabled : + case VclEventId::ToolboxItemDisabled : { UpdateItemEnabled_Impl( (sal_Int32)reinterpret_cast<sal_IntPtr>(rVclWindowEvent.GetData()) ); break; } - case VCLEVENT_DROPDOWN_OPEN: - case VCLEVENT_DROPDOWN_CLOSE: + case VclEventId::DropdownOpen: + case VclEventId::DropdownClose: { - UpdateCustomPopupItemp_Impl( static_cast< vcl::Window* >( rVclWindowEvent.GetData() ), rVclWindowEvent.GetId() == VCLEVENT_DROPDOWN_OPEN ); + UpdateCustomPopupItemp_Impl( static_cast< vcl::Window* >( rVclWindowEvent.GetData() ), rVclWindowEvent.GetId() == VclEventId::DropdownOpen ); break; } - case VCLEVENT_OBJECT_DYING : + case VclEventId::ObjectDying : { // if this toolbox is a subtoolbox, we have to release it from its parent VclPtr< vcl::Window > pWin = GetAs< vcl::Window >(); @@ -629,7 +629,7 @@ void VCLXAccessibleToolBox::ProcessWindowChildEvent( const VclWindowEvent& rVclW { switch ( rVclWindowEvent.GetId() ) { - case VCLEVENT_WINDOW_SHOW: // send create on show for direct accessible children + case VclEventId::WindowShow: // send create on show for direct accessible children { Reference< XAccessible > xReturn = GetItemWindowAccessible(rVclWindowEvent); if ( xReturn.is() ) diff --git a/avmedia/source/opengl/oglwindow.cxx b/avmedia/source/opengl/oglwindow.cxx index 15ec0f7a52db..88209d55ee5c 100644 --- a/avmedia/source/opengl/oglwindow.cxx +++ b/avmedia/source/opengl/oglwindow.cxx @@ -201,7 +201,7 @@ void SAL_CALL OGLWindow::removePaintListener( const uno::Reference< awt::XPaintL IMPL_LINK(OGLWindow, FocusGrabber, VclWindowEvent&, rEvent, void) { - if( rEvent.GetId() == VCLEVENT_WINDOW_MOUSEMOVE ) + if( rEvent.GetId() == VclEventId::WindowMouseMove ) { MouseEvent* pMouseEvt = static_cast<MouseEvent*>(rEvent.GetData()); if(pMouseEvt) @@ -227,7 +227,7 @@ IMPL_LINK(OGLWindow, FocusGrabber, VclWindowEvent&, rEvent, void) IMPL_LINK(OGLWindow, CameraHandler, VclWindowEvent&, rEvent, void) { - if( rEvent.GetId() == VCLEVENT_WINDOW_KEYINPUT ) + if( rEvent.GetId() == VclEventId::WindowKeyInput ) { KeyEvent* pKeyEvt = static_cast<KeyEvent*>(rEvent.GetData()); if(pKeyEvt) @@ -332,7 +332,7 @@ IMPL_LINK(OGLWindow, CameraHandler, VclWindowEvent&, rEvent, void) } } } - else if( rEvent.GetId() == VCLEVENT_WINDOW_MOUSEBUTTONDOWN ) + else if( rEvent.GetId() == VclEventId::WindowMouseButtonDown ) { MouseEvent* pMouseEvt = static_cast<MouseEvent*>(rEvent.GetData()); if(pMouseEvt && pMouseEvt->IsLeft() && pMouseEvt->GetClicks() == 1) @@ -340,7 +340,7 @@ IMPL_LINK(OGLWindow, CameraHandler, VclWindowEvent&, rEvent, void) m_aLastMousePos = pMouseEvt->GetPosPixel(); } } - else if( rEvent.GetId() == VCLEVENT_WINDOW_MOUSEMOVE ) + else if( rEvent.GetId() == VclEventId::WindowMouseMove ) { if ( !m_rEventHandler.HasFocus() ) { @@ -374,7 +374,7 @@ IMPL_LINK(OGLWindow, CameraHandler, VclWindowEvent&, rEvent, void) m_aLastMousePos = aCurPos; } } - else if( rEvent.GetId() == VCLEVENT_WINDOW_MOUSEBUTTONUP ) + else if( rEvent.GetId() == VclEventId::WindowMouseButtonUp ) { MouseEvent* pMouseEvt = static_cast<MouseEvent*>(rEvent.GetData()); if(pMouseEvt && pMouseEvt->IsLeft() && pMouseEvt->GetClicks() == 1) diff --git a/avmedia/source/viewer/mediaevent_impl.cxx b/avmedia/source/viewer/mediaevent_impl.cxx index 61634bc04b29..87ec80daa2b4 100644 --- a/avmedia/source/viewer/mediaevent_impl.cxx +++ b/avmedia/source/viewer/mediaevent_impl.cxx @@ -65,7 +65,7 @@ void SAL_CALL MediaEventListenersImpl::keyPressed( const css::awt::KeyEvent& e ) ( ( e.Modifiers & 4 ) ? KEY_MOD2 : 0 ) ); KeyEvent aVCLKeyEvt( e.KeyChar, aVCLKeyCode ); - Application::PostKeyEvent( VCLEVENT_WINDOW_KEYINPUT, reinterpret_cast< vcl::Window* >( mpNotifyWindow.get() ), &aVCLKeyEvt ); + Application::PostKeyEvent( VclEventId::WindowKeyInput, reinterpret_cast< vcl::Window* >( mpNotifyWindow.get() ), &aVCLKeyEvt ); } } @@ -83,7 +83,7 @@ void SAL_CALL MediaEventListenersImpl::keyReleased( const css::awt::KeyEvent& e ( ( e.Modifiers & 2 ) ? KEY_MOD1 : 0 ) | ( ( e.Modifiers & 4 ) ? KEY_MOD2 : 0 ) ); KeyEvent aVCLKeyEvt( e.KeyChar, aVCLKeyCode ); - Application::PostKeyEvent( VCLEVENT_WINDOW_KEYUP, reinterpret_cast< vcl::Window* >( mpNotifyWindow.get() ), &aVCLKeyEvt ); + Application::PostKeyEvent( VclEventId::WindowKeyUp, reinterpret_cast< vcl::Window* >( mpNotifyWindow.get() ), &aVCLKeyEvt ); } } @@ -103,7 +103,7 @@ void SAL_CALL MediaEventListenersImpl::mousePressed( const css::awt::MouseEvent& ( ( e.Buttons & 2 ) ? MOUSE_RIGHT : 0 ) | ( ( e.Buttons & 4 ) ? MOUSE_MIDDLE : 0 ), e.Modifiers ); - Application::PostMouseEvent( VCLEVENT_WINDOW_MOUSEBUTTONDOWN, reinterpret_cast< vcl::Window* >( mpNotifyWindow.get() ), &aVCLMouseEvt ); + Application::PostMouseEvent( VclEventId::WindowMouseButtonDown, reinterpret_cast< vcl::Window* >( mpNotifyWindow.get() ), &aVCLMouseEvt ); } } @@ -123,7 +123,7 @@ void SAL_CALL MediaEventListenersImpl::mouseReleased( const css::awt::MouseEvent ( ( e.Buttons & 2 ) ? MOUSE_RIGHT : 0 ) | ( ( e.Buttons & 4 ) ? MOUSE_MIDDLE : 0 ), e.Modifiers ); - Application::PostMouseEvent( VCLEVENT_WINDOW_MOUSEBUTTONUP, reinterpret_cast< vcl::Window* >( mpNotifyWindow.get() ), &aVCLMouseEvt ); + Application::PostMouseEvent( VclEventId::WindowMouseButtonUp, reinterpret_cast< vcl::Window* >( mpNotifyWindow.get() ), &aVCLMouseEvt ); } } @@ -161,7 +161,7 @@ void SAL_CALL MediaEventListenersImpl::mouseDragged( const css::awt::MouseEvent& if( mpNotifyWindow ) { MouseEvent aVCLMouseEvt( Point( e.X, e.Y ), 0, MouseEventModifiers::NONE, e.Buttons, e.Modifiers ); - Application::PostMouseEvent( VCLEVENT_WINDOW_MOUSEMOVE, reinterpret_cast< vcl::Window* >( mpNotifyWindow.get() ), &aVCLMouseEvt ); + Application::PostMouseEvent( VclEventId::WindowMouseMove, reinterpret_cast< vcl::Window* >( mpNotifyWindow.get() ), &aVCLMouseEvt ); } } @@ -175,7 +175,7 @@ void SAL_CALL MediaEventListenersImpl::mouseMoved( const css::awt::MouseEvent& e if( mpNotifyWindow ) { MouseEvent aVCLMouseEvt( Point( e.X, e.Y ), 0, MouseEventModifiers::NONE, e.Buttons, e.Modifiers ); - Application::PostMouseEvent( VCLEVENT_WINDOW_MOUSEMOVE, reinterpret_cast< vcl::Window* >( mpNotifyWindow.get() ), &aVCLMouseEvt ); + Application::PostMouseEvent( VclEventId::WindowMouseMove, reinterpret_cast< vcl::Window* >( mpNotifyWindow.get() ), &aVCLMouseEvt ); } } diff --git a/basctl/source/accessibility/accessibledialogwindow.cxx b/basctl/source/accessibility/accessibledialogwindow.cxx index 653625857043..0d3447a17a1e 100644 --- a/basctl/source/accessibility/accessibledialogwindow.cxx +++ b/basctl/source/accessibility/accessibledialogwindow.cxx @@ -331,7 +331,7 @@ void AccessibleDialogWindow::SortChildren() IMPL_LINK( AccessibleDialogWindow, WindowEventListener, VclWindowEvent&, rEvent, void ) { DBG_ASSERT(rEvent.GetWindow(), "AccessibleDialogWindow::WindowEventListener: no window!"); - if (!rEvent.GetWindow()->IsAccessibilityEventsSuppressed() || rEvent.GetId() == VCLEVENT_OBJECT_DYING) + if (!rEvent.GetWindow()->IsAccessibilityEventsSuppressed() || rEvent.GetId() == VclEventId::ObjectDying) ProcessWindowEvent(rEvent); } @@ -342,62 +342,62 @@ void AccessibleDialogWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindo switch ( rVclWindowEvent.GetId() ) { - case VCLEVENT_WINDOW_ENABLED: + case VclEventId::WindowEnabled: { aNewValue <<= AccessibleStateType::ENABLED; NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue ); } break; - case VCLEVENT_WINDOW_DISABLED: + case VclEventId::WindowDisabled: { aOldValue <<= AccessibleStateType::ENABLED; NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue ); } break; - case VCLEVENT_WINDOW_ACTIVATE: + case VclEventId::WindowActivate: { aNewValue <<= AccessibleStateType::ACTIVE; NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue ); } break; - case VCLEVENT_WINDOW_DEACTIVATE: + case VclEventId::WindowDeactivate: { aOldValue <<= AccessibleStateType::ACTIVE; NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue ); } break; - case VCLEVENT_WINDOW_GETFOCUS: + case VclEventId::WindowGetFocus: { aNewValue <<= AccessibleStateType::FOCUSED; NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue ); } break; - case VCLEVENT_WINDOW_LOSEFOCUS: + case VclEventId::WindowLoseFocus: { aOldValue <<= AccessibleStateType::FOCUSED; NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue ); } break; - case VCLEVENT_WINDOW_SHOW: + case VclEventId::WindowShow: { aNewValue <<= AccessibleStateType::SHOWING; NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue ); } break; - case VCLEVENT_WINDOW_HIDE: + case VclEventId::WindowHide: { aOldValue <<= AccessibleStateType::SHOWING; NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue ); } break; - case VCLEVENT_WINDOW_RESIZE: + case VclEventId::WindowResize: { NotifyAccessibleEvent( AccessibleEventId::BOUNDRECT_CHANGED, aOldValue, aNewValue ); UpdateChildren(); UpdateBounds(); } break; - case VCLEVENT_OBJECT_DYING: + case VclEventId::ObjectDying: { if ( m_pDialogWindow ) { diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx index c800580f7af4..065a511ea68d 100644 --- a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx +++ b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx @@ -199,7 +199,7 @@ void CreationWizardUnoDlg::createDialogOnDemand() } IMPL_LINK( CreationWizardUnoDlg, DialogEventHdl, VclWindowEvent&, rEvent, void ) { - if(rEvent.GetId() == VCLEVENT_OBJECT_DYING) + if(rEvent.GetId() == VclEventId::ObjectDying) m_pDialog = nullptr;//avoid duplicate destruction of m_pDialog } diff --git a/cui/source/dialogs/screenshotannotationdlg.cxx b/cui/source/dialogs/screenshotannotationdlg.cxx index 398458df5887..1c422fa136b1 100644 --- a/cui/source/dialogs/screenshotannotationdlg.cxx +++ b/cui/source/dialogs/screenshotannotationdlg.cxx @@ -560,8 +560,8 @@ IMPL_LINK(ScreenshotAnnotationDlg_Impl, pictureFrameListener, VclWindowEvent&, r switch (rEvent.GetId()) { - case VCLEVENT_WINDOW_MOUSEMOVE: - case VCLEVENT_WINDOW_MOUSEBUTTONUP: + case VclEventId::WindowMouseMove: + case VclEventId::WindowMouseButtonUp: { MouseEvent* pMouseEvent = static_cast< MouseEvent* >(rEvent.GetData()); @@ -569,7 +569,7 @@ IMPL_LINK(ScreenshotAnnotationDlg_Impl, pictureFrameListener, VclWindowEvent&, r { switch (rEvent.GetId()) { - case VCLEVENT_WINDOW_MOUSEMOVE: + case VclEventId::WindowMouseMove: { if (mpPicture->IsMouseOver()) { @@ -593,7 +593,7 @@ IMPL_LINK(ScreenshotAnnotationDlg_Impl, pictureFrameListener, VclWindowEvent&, r } break; } - case VCLEVENT_WINDOW_MOUSEBUTTONUP: + case VclEventId::WindowMouseButtonUp: { if (mpPicture->IsMouseOver() && mpHilighted) { diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx index 7264c0d194c9..103d03fc3ef4 100644 --- a/cui/source/options/fontsubs.cxx +++ b/cui/source/options/fontsubs.cxx @@ -462,7 +462,7 @@ void SvxFontSubstCheckListBox::KeyInput( const KeyEvent& rKEvt ) if ( nCol < 2 ) { CheckEntryPos( nSelPos, nCol, !IsChecked( nSelPos, nCol ) ); - CallImplEventListeners( VCLEVENT_CHECKBOX_TOGGLE, static_cast<void*>(GetEntry( nSelPos )) ); + CallImplEventListeners( VclEventId::CheckboxToggle, static_cast<void*>(GetEntry( nSelPos )) ); } else { diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx index 6e791c8911ca..7f997c735fd1 100644 --- a/cui/source/options/optfltr.cxx +++ b/cui/source/options/optfltr.cxx @@ -449,7 +449,7 @@ void OfaMSFilterTabPage2::MSFltrSimpleTable::KeyInput( const KeyEvent& rKEvt ) SvTreeListEntry* pEntry = GetEntry( nSelPos ); bool bIsChecked = ( GetCheckButtonState( pEntry, nCol ) == SvButtonState::Checked ); CheckEntryPos( nSelPos, nCol, !bIsChecked ); - CallImplEventListeners( VCLEVENT_CHECKBOX_TOGGLE, static_cast<void*>(pEntry) ); + CallImplEventListeners( VclEventId::CheckboxToggle, static_cast<void*>(pEntry) ); } else { diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx index 3ebc03a73cfb..66f06e456487 100644 --- a/cui/source/tabpages/autocdlg.cxx +++ b/cui/source/tabpages/autocdlg.cxx @@ -847,7 +847,7 @@ void OfaACorrCheckListBox::KeyInput( const KeyEvent& rKEvt ) if ( nCol < 2 ) { CheckEntryPos( nSelPos, nCol, !IsChecked( nSelPos, nCol ) ); - CallImplEventListeners( VCLEVENT_CHECKBOX_TOGGLE, static_cast<void*>(GetEntry( nSelPos )) ); + CallImplEventListeners( VclEventId::CheckboxToggle, static_cast<void*>(GetEntry( nSelPos )) ); } else { diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx index 4118915e16a4..d9f8a0b3fe62 100644 --- a/dbaccess/source/ui/app/AppDetailView.cxx +++ b/dbaccess/source/ui/app/AppDetailView.cxx @@ -286,7 +286,7 @@ bool OCreationList::setCurrentEntryInvalidate( SvTreeListEntry* _pEntry ) if ( GetCurEntry() ) { InvalidateEntry( GetCurEntry() ); - CallEventListeners( VCLEVENT_LISTBOX_TREESELECT, GetCurEntry() ); + CallEventListeners( VclEventId::ListboxTreeSelect, GetCurEntry() ); } updateHelpText(); return true; @@ -334,7 +334,7 @@ void OCreationList::KeyInput( const KeyEvent& rKEvt ) if ( pNewCurrent ) { InvalidateEntry( pNewCurrent ); - CallEventListeners( VCLEVENT_LISTBOX_SELECT, pNewCurrent ); + CallEventListeners( VclEventId::ListboxSelect, pNewCurrent ); } updateHelpText(); } diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx index 2fbf134df3e9..ccfca86880a6 100644 --- a/dbaccess/source/ui/control/dbtreelistbox.cxx +++ b/dbaccess/source/ui/control/dbtreelistbox.cxx @@ -672,7 +672,7 @@ void DBTreeListBox::ExecuteContextMenuAction( sal_uInt16 _nSelectedPopupEntry ) IMPL_LINK( DBTreeListBox, MenuEventListener, VclMenuEvent&, rMenuEvent, void ) { - if ( rMenuEvent.GetId() == VCLEVENT_OBJECT_DYING ) + if ( rMenuEvent.GetId() == VclEventId::ObjectDying ) { css::uno::Reference< css::lang::XComponent > xComponent( m_xMenuController, css::uno::UNO_QUERY ); if ( xComponent.is() ) diff --git a/dbaccess/source/ui/dlg/admincontrols.cxx b/dbaccess/source/ui/dlg/admincontrols.cxx index 8b493c9cd0fa..46e6e45136b0 100644 --- a/dbaccess/source/ui/dlg/admincontrols.cxx +++ b/dbaccess/source/ui/dlg/admincontrols.cxx @@ -40,9 +40,9 @@ namespace dbaui // IWindowEventFilter virtual bool payAttentionTo( const VclWindowEvent& _rEvent ) const override { - return ( _rEvent.GetId() == VCLEVENT_WINDOW_ENABLED ) - || ( _rEvent.GetId() == VCLEVENT_WINDOW_DISABLED ) - || ( _rEvent.GetId() == VCLEVENT_EDIT_MODIFY ); + return ( _rEvent.GetId() == VclEventId::WindowEnabled ) + || ( _rEvent.GetId() == VclEventId::WindowDisabled ) + || ( _rEvent.GetId() == VclEventId::EditModify ); } }; @@ -69,21 +69,21 @@ namespace dbaui switch ( _rTrigger.GetId() ) { - case 0: + case VclEventId::NONE: // initial call const_cast< TextResetOperator* >( this )->m_sUserText = _rTrigger.GetWindow()->GetText(); break; - case VCLEVENT_EDIT_MODIFY: + case VclEventId::EditModify: if ( _rTrigger.GetWindow()->IsEnabled() ) const_cast< TextResetOperator* >( this )->m_sUserText = _rTrigger.GetWindow()->GetText(); break; - case VCLEVENT_WINDOW_ENABLED: + case VclEventId::WindowEnabled: _rOperateOn.SetText( m_sUserText ); break; - case VCLEVENT_WINDOW_DISABLED: + case VclEventId::WindowDisabled: _rOperateOn.SetText( m_sDisabledText ); break; diff --git a/dbaccess/source/ui/misc/ToolBoxHelper.cxx b/dbaccess/source/ui/misc/ToolBoxHelper.cxx index 20d60659e778..e49e1be8c989 100644 --- a/dbaccess/source/ui/misc/ToolBoxHelper.cxx +++ b/dbaccess/source/ui/misc/ToolBoxHelper.cxx @@ -76,7 +76,7 @@ namespace dbaui } IMPL_LINK(OToolBoxHelper, SettingsChanged, VclSimpleEvent&, _rEvt, void) { - if ( m_pToolBox && _rEvt.GetId() == VCLEVENT_APPLICATION_DATACHANGED ) + if ( m_pToolBox && _rEvt.GetId() == VclEventId::ApplicationDataChanged ) { DataChangedEvent* pData = static_cast<DataChangedEvent*>(static_cast<VclWindowEvent&>(_rEvt).GetData()); if ( pData && ((( pData->GetType() == DataChangedEventType::SETTINGS ) || diff --git a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx index 6a2a609701dc..5616112c10c0 100644 --- a/dbaccess/source/ui/querydesign/TableWindowAccess.cxx +++ b/dbaccess/source/ui/querydesign/TableWindowAccess.cxx @@ -51,7 +51,7 @@ namespace dbaui } void OTableWindowAccess::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { - if ( rVclWindowEvent.GetId() == VCLEVENT_OBJECT_DYING ) + if ( rVclWindowEvent.GetId() == VclEventId::ObjectDying ) { ::osl::MutexGuard aGuard( m_aMutex ); m_pTable = nullptr; diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index 45c5fd491e6c..46a9d65e41f1 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -996,7 +996,7 @@ bool ExtMgrDialog::EventNotify( NotifyEvent& rNEvt ) if ( aKeyCode.GetGroup() == KEYGROUP_CURSOR ) bHandled = m_pExtensionBox->EventNotify(rNEvt); } -// VCLEVENT_WINDOW_CLOSE +// VclEventId::WindowClose if ( !bHandled ) return ModelessDialog::EventNotify(rNEvt); else diff --git a/desktop/source/splash/splash.cxx b/desktop/source/splash/splash.cxx index a9b62cb6a0e7..a7385ae5bb7a 100644 --- a/desktop/source/splash/splash.cxx +++ b/desktop/source/splash/splash.cxx @@ -370,7 +370,7 @@ IMPL_LINK( SplashScreen, AppEventListenerHdl, VclSimpleEvent&, inEvent, void ) { switch ( inEvent.GetId() ) { - case VCLEVENT_WINDOW_SHOW: + case VclEventId::WindowShow: pWindow->Redraw(); break; default: diff --git a/extensions/source/update/ui/updatecheckui.cxx b/extensions/source/update/ui/updatecheckui.cxx index ab3b54c592fc..d1297893d403 100644 --- a/extensions/source/update/ui/updatecheckui.cxx +++ b/extensions/source/update/ui/updatecheckui.cxx @@ -656,9 +656,9 @@ IMPL_LINK_NOARG(UpdateCheckUI, UserEventHdl, void*, void) IMPL_LINK( UpdateCheckUI, WindowEventHdl, VclWindowEvent&, rEvent, void ) { - sal_uLong nEventID = rEvent.GetId(); + VclEventId nEventID = rEvent.GetId(); - if ( VCLEVENT_OBJECT_DYING == nEventID ) + if ( VclEventId::ObjectDying == nEventID ) { SolarMutexGuard aGuard; if ( mpIconSysWin == rEvent.GetWindow() ) @@ -667,7 +667,7 @@ IMPL_LINK( UpdateCheckUI, WindowEventHdl, VclWindowEvent&, rEvent, void ) RemoveBubbleWindow( true ); } } - else if ( VCLEVENT_WINDOW_MENUBARADDED == nEventID ) + else if ( VclEventId::WindowMenubarAdded == nEventID ) { SolarMutexGuard aGuard; vcl::Window *pWindow = rEvent.GetWindow(); @@ -680,15 +680,15 @@ IMPL_LINK( UpdateCheckUI, WindowEventHdl, VclWindowEvent&, rEvent, void ) } } } - else if ( VCLEVENT_WINDOW_MENUBARREMOVED == nEventID ) + else if ( VclEventId::WindowMenubarRemoved == nEventID ) { SolarMutexGuard aGuard; MenuBar *pMBar = static_cast<MenuBar*>(rEvent.GetData()); if ( pMBar && ( pMBar == mpIconMBar ) ) RemoveBubbleWindow( true ); } - else if ( ( nEventID == VCLEVENT_WINDOW_MOVE ) || - ( nEventID == VCLEVENT_WINDOW_RESIZE ) ) + else if ( ( nEventID == VclEventId::WindowMove ) || + ( nEventID == VclEventId::WindowResize ) ) { SolarMutexGuard aGuard; if ( ( mpIconSysWin == rEvent.GetWindow() ) && @@ -708,9 +708,9 @@ IMPL_LINK( UpdateCheckUI, ApplicationEventHdl, VclSimpleEvent&, rEvent, void) { switch (rEvent.GetId()) { - case VCLEVENT_WINDOW_SHOW: - case VCLEVENT_WINDOW_ACTIVATE: - case VCLEVENT_WINDOW_GETFOCUS: { + case VclEventId::WindowShow: + case VclEventId::WindowActivate: + case VclEventId::WindowGetFocus: { SolarMutexGuard aGuard; vcl::Window *pWindow = static_cast< VclWindowEvent * >(&rEvent)->GetWindow(); @@ -725,6 +725,7 @@ IMPL_LINK( UpdateCheckUI, ApplicationEventHdl, VclSimpleEvent&, rEvent, void) } break; } + default: break; } } diff --git a/filter/source/pdf/pdffilter.cxx b/filter/source/pdf/pdffilter.cxx index 478845a3ee1d..9150cfdada32 100644 --- a/filter/source/pdf/pdffilter.cxx +++ b/filter/source/pdf/pdffilter.cxx @@ -165,7 +165,7 @@ public: IMPL_LINK( FocusWindowWaitCursor, DestroyedLink, VclWindowEvent&, rEvent, void ) { - if( rEvent.GetId() == VCLEVENT_OBJECT_DYING ) + if( rEvent.GetId() == VclEventId::ObjectDying ) m_pFocusWindow = nullptr; } diff --git a/framework/source/dispatch/windowcommanddispatch.cxx b/framework/source/dispatch/windowcommanddispatch.cxx index 1470007553ae..adfce4908101 100644 --- a/framework/source/dispatch/windowcommanddispatch.cxx +++ b/framework/source/dispatch/windowcommanddispatch.cxx @@ -94,12 +94,12 @@ void WindowCommandDispatch::impl_stopListening() IMPL_LINK(WindowCommandDispatch, impl_notifyCommand, VclWindowEvent&, rEvent, void) { - if (rEvent.GetId() == VCLEVENT_OBJECT_DYING) + if (rEvent.GetId() == VclEventId::ObjectDying) { impl_stopListening(); return; } - if (rEvent.GetId() != VCLEVENT_WINDOW_COMMAND) + if (rEvent.GetId() != VclEventId::WindowCommand) return; const CommandEvent* pCommand = static_cast<CommandEvent*>(rEvent.GetData()); diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx index 98cbacebeb02..eefd7dc1374e 100644 --- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx +++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx @@ -908,7 +908,7 @@ long ToolbarLayoutManager::childWindowEvent( VclSimpleEvent* pEvent ) // anymore! if ( dynamic_cast< const VclWindowEvent* >(pEvent) != nullptr ) { - if ( pEvent->GetId() == VCLEVENT_TOOLBOX_SELECT ) + if ( pEvent->GetId() == VclEventId::ToolboxSelect ) { OUString aToolbarName; OUString aCommand; @@ -956,7 +956,7 @@ long ToolbarLayoutManager::childWindowEvent( VclSimpleEvent* pEvent ) } } } - else if ( pEvent->GetId() == VCLEVENT_TOOLBOX_FORMATCHANGED ) + else if ( pEvent->GetId() == VclEventId::ToolboxFormatChanged ) { if ( !implts_isToolbarCreationActive() ) { diff --git a/include/svtools/dialogcontrolling.hxx b/include/svtools/dialogcontrolling.hxx index 020572b2954d..eb993cdbf2b6 100644 --- a/include/svtools/dialogcontrolling.hxx +++ b/include/svtools/dialogcontrolling.hxx @@ -221,8 +221,8 @@ namespace svt /** a helper class implementing the ->IWindowEventFilter interface, which filters for radio buttons or check boxes being toggled. - Technically, the class simply filters for the ->VCLEVENT_RADIOBUTTON_TOGGLE - and the ->VCLEVENT_CHECKBOX_TOGGLE event. + Technically, the class simply filters for the ->VclEventId::RadiobuttonToggle + and the ->VclEventId::CheckboxToggle event. */ class SVT_DLLPUBLIC FilterForRadioOrCheckToggle : public IWindowEventFilter { @@ -236,8 +236,8 @@ namespace svt bool payAttentionTo( const VclWindowEvent& _rEvent ) const override { if ( ( _rEvent.GetWindow() == &m_rWindow ) - && ( ( _rEvent.GetId() == VCLEVENT_RADIOBUTTON_TOGGLE ) - || ( _rEvent.GetId() == VCLEVENT_CHECKBOX_TOGGLE ) + && ( ( _rEvent.GetId() == VclEventId::RadiobuttonToggle ) + || ( _rEvent.GetId() == VclEventId::CheckboxToggle ) ) ) return true; diff --git a/include/svtools/ivctrl.hxx b/include/svtools/ivctrl.hxx index 995058d55f7c..8a27031a102b 100644 --- a/include/svtools/ivctrl.hxx +++ b/include/svtools/ivctrl.hxx @@ -219,7 +219,7 @@ protected: virtual void FillLayoutData() const override; - void CallImplEventListeners(sal_uLong nEvent, void* pData); + void CallImplEventListeners(VclEventId nEvent, void* pData); public: diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx index 54003c214cbc..da18634d1f4e 100644 --- a/include/svtools/treelistbox.hxx +++ b/include/svtools/treelistbox.hxx @@ -584,7 +584,7 @@ protected: bool IsCellFocusEnabled() const; bool SetCurrentTabPos( sal_uInt16 _nNewPos ); sal_uInt16 GetCurrentTabPos() const; - void CallImplEventListeners(sal_uLong nEvent, void* pData); + void CallImplEventListeners(VclEventId nEvent, void* pData); void ImplEditEntry( SvTreeListEntry* pEntry ); diff --git a/include/vcl/ctrl.hxx b/include/vcl/ctrl.hxx index 0d1f5f5e709b..ca230310a232 100644 --- a/include/vcl/ctrl.hxx +++ b/include/vcl/ctrl.hxx @@ -72,7 +72,7 @@ protected: if the Control instance has been destroyed in any of the call */ bool ImplCallEventListenersAndHandler( - sal_uLong nEvent, std::function<void()> const & callHandler + VclEventId nEvent, std::function<void()> const & callHandler ); /** draws the given text onto the given device diff --git a/include/vcl/menu.hxx b/include/vcl/menu.hxx index ca6f45786ae2..4a119a0194b0 100644 --- a/include/vcl/menu.hxx +++ b/include/vcl/menu.hxx @@ -181,7 +181,7 @@ protected: SAL_DLLPRIVATE void ImplPaintMenuTitle(vcl::RenderContext&, const Rectangle& rRect) const; SAL_DLLPRIVATE void ImplSelect(); SAL_DLLPRIVATE void ImplCallHighlight( sal_uInt16 nHighlightItem ); - SAL_DLLPRIVATE void ImplCallEventListeners( sal_uLong nEvent, sal_uInt16 nPos ); + SAL_DLLPRIVATE void ImplCallEventListeners( VclEventId nEvent, sal_uInt16 nPos ); DECL_DLLPRIVATE_LINK(ImplCallSelect, void*, void ); SAL_DLLPRIVATE void ImplFillLayoutData() const; diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx index 9b930b3127d9..2ab31c830224 100644 --- a/include/vcl/svapp.hxx +++ b/include/vcl/svapp.hxx @@ -725,7 +725,7 @@ public: @see ImplCallEventListeners(VclSimpleEvent* pEvent) */ - static void ImplCallEventListeners( sal_uLong nEvent, vcl::Window* pWin, void* pData ); + static void ImplCallEventListeners( VclEventId nEvent, vcl::Window* pWin, void* pData ); /** Send event to all VCL application event listeners @@ -743,7 +743,7 @@ public: @see PostKeyEvent */ - static bool HandleKey( sal_uLong nEvent, vcl::Window *pWin, KeyEvent* pKeyEvent ); + static bool HandleKey( VclEventId nEvent, vcl::Window *pWin, KeyEvent* pKeyEvent ); /** Send keypress event @@ -753,7 +753,7 @@ public: @see HandleKey */ - static ImplSVEvent * PostKeyEvent( sal_uLong nEvent, vcl::Window *pWin, KeyEvent* pKeyEvent ); + static ImplSVEvent * PostKeyEvent( VclEventId nEvent, vcl::Window *pWin, KeyEvent* pKeyEvent ); /** Send mouse event @@ -761,7 +761,7 @@ public: @param pWin Pointer to window to which the event is sent @param pMouseEvent Mouse event to send */ - static ImplSVEvent * PostMouseEvent( sal_uLong nEvent, vcl::Window *pWin, MouseEvent* pMouseEvent ); + static ImplSVEvent * PostMouseEvent( VclEventId nEvent, vcl::Window *pWin, MouseEvent* pMouseEvent ); /** Remove mouse and keypress events from a window... any also zoom and scroll events if the platform supports it. diff --git a/include/vcl/vclevent.hxx b/include/vcl/vclevent.hxx index a1c9a9724bdb..b152afc5426c 100644 --- a/include/vcl/vclevent.hxx +++ b/include/vcl/vclevent.hxx @@ -35,174 +35,173 @@ namespace com { namespace sun { namespace star { } }}} -#define VCLEVENT_OBJECT_DYING 1 - +enum class VclEventId +{ + NONE = 0, + ObjectDying = 1, // VclWindowEvent: -#define VCLEVENT_WINDOW_CHILDCREATED 500 // pData = vcl::Window* -#define VCLEVENT_WINDOW_CHILDDESTROYED 501 // pData = vcl::Window* -#define VCLEVENT_WINDOW_PAINT 1000 // pData = Rectangle* -#define VCLEVENT_WINDOW_MOVE 1001 -#define VCLEVENT_WINDOW_RESIZE 1002 -#define VCLEVENT_WINDOW_SHOW 1003 -#define VCLEVENT_WINDOW_HIDE 1004 -#define VCLEVENT_WINDOW_ACTIVATE 1005 -#define VCLEVENT_WINDOW_DEACTIVATE 1006 // pData = vcl::Window* = pPrevActiveWindow -#define VCLEVENT_WINDOW_CLOSE 1007 -#define VCLEVENT_WINDOW_GETFOCUS 1008 -#define VCLEVENT_WINDOW_LOSEFOCUS 1009 -#define VCLEVENT_WINDOW_MINIMIZE 1010 -#define VCLEVENT_WINDOW_NORMALIZE 1011 -#define VCLEVENT_WINDOW_KEYINPUT 1012 // pData = KeyEvent* -#define VCLEVENT_WINDOW_KEYUP 1013 // pData = KeyEvent* -#define VCLEVENT_WINDOW_COMMAND 1014 // pData = CommandEvent* -#define VCLEVENT_WINDOW_MOUSEMOVE 1015 // pData = MouseEvent* -#define VCLEVENT_WINDOW_MOUSEBUTTONDOWN 1016 // pData = MouseEvent* -#define VCLEVENT_WINDOW_MOUSEBUTTONUP 1017 // pData = MouseEvent* -#define VCLEVENT_WINDOW_FRAMETITLECHANGED 1018 // pData = OUString* = oldTitle -#define VCLEVENT_APPLICATION_DATACHANGED 1019 // pData = DataChangedEvent* -#define VCLEVENT_WINDOW_ENABLED 1020 -#define VCLEVENT_WINDOW_DISABLED 1021 -#define VCLEVENT_WINDOW_DATACHANGED 1022 // pData = DataChangedEvent* -#define VCLEVENT_WINDOW_ZOOM 1023 // pData = ZoomEvent* -#define VCLEVENT_WINDOW_SCROLL 1024 // pData = ScrollEvent* - -// VclWindowEvent -#define VCLEVENT_CONTROL_GETFOCUS 1100 -#define VCLEVENT_CONTROL_LOSEFOCUS 1101 -#define VCLEVENT_BUTTON_CLICK 1102 -#define VCLEVENT_PUSHBUTTON_TOGGLE 1103 -#define VCLEVENT_RADIOBUTTON_TOGGLE 1104 -#define VCLEVENT_CHECKBOX_TOGGLE 1105 -#define VCLEVENT_COMBOBOX_SELECT 1106 -#define VCLEVENT_COMBOBOX_DOUBLECLICK 1107 -#define VCLEVENT_LISTBOX_SELECT 1108 -#define VCLEVENT_LISTBOX_DOUBLECLICK 1109 -#define VCLEVENT_EDIT_MODIFY 1110 -#define VCLEVENT_SCROLLBAR_SCROLL 1111 -#define VCLEVENT_SCROLLBAR_ENDSCROLL 1112 -#define VCLEVENT_SPINBUTTON_UP 1113 -#define VCLEVENT_SPINBUTTON_DOWN 1114 -#define VCLEVENT_SPINFIELD_UP 1115 -#define VCLEVENT_SPINFIELD_DOWN 1116 -#define VCLEVENT_SPINFIELD_FIRST 1117 -#define VCLEVENT_SPINFIELD_LAST 1118 -#define VCLEVENT_STATUSBAR_CLICK 1119 -#define VCLEVENT_STATUSBAR_DOUBLECLICK 1120 -#define VCLEVENT_TOOLBOX_CLICK 1121 -#define VCLEVENT_TOOLBOX_DOUBLECLICK 1122 -#define VCLEVENT_TOOLBOX_ACTIVATE 1123 -#define VCLEVENT_TOOLBOX_DEACTIVATE 1124 -#define VCLEVENT_TOOLBOX_HIGHLIGHT 1125 -#define VCLEVENT_TOOLBOX_SELECT 1126 + WindowChildCreated = 500, // pData = vcl::Window* + WindowChildDestroyed = 501, // pData = vcl::Window* + WindowPaint = 1000, // pData = Rectangle* + WindowMove = 1001, + WindowResize = 1002, + WindowShow = 1003, + WindowHide = 1004, + WindowActivate = 1005, + WindowDeactivate = 1006, // pData = vcl::Window* = pPrevActiveWindow + WindowClose = 1007, + WindowGetFocus = 1008, + WindowLoseFocus = 1009, + WindowMinimize = 1010, + WindowNormalize = 1011, + WindowKeyInput = 1012, // pData = KeyEvent* + WindowKeyUp = 1013, // pData = KeyEvent* + WindowCommand = 1014, // pData = CommandEvent* + WindowMouseMove = 1015, // pData = MouseEvent* + WindowMouseButtonDown = 1016, // pData = MouseEvent* + WindowMouseButtonUp = 1017, // pData = MouseEvent* + WindowFrameTitleChanged = 1018, // pData = OUString* = oldTitle + ApplicationDataChanged = 1019, // pData = DataChangedEvent* + WindowEnabled = 1020, + WindowDisabled = 1021, + WindowDataChanged = 1022, // pData = DataChangedEvent* + WindowZoom = 1023, // pData = ZoomEvent* + WindowScroll = 1024, // pData = ScrollEvent* + ControlGetFocus = 1100, + ControlLoseFocus = 1101, + ButtonClick = 1102, + PushbuttonToggle = 1103, + RadiobuttonToggle = 1104, + CheckboxToggle = 1105, + ComboboxSelect = 1106, + ComboboxDoubleClick = 1107, + ListboxSelect = 1108, + ListboxDoubleClick = 1109, + EditModify = 1110, + ScrollbarScroll = 1111, + ScrollbarEndScroll = 1112, + SpinbuttonUp = 1113, + SpinbuttonDown = 1114, + SpinfieldUp = 1115, + SpinfieldDown = 1116, + SpinfieldFirst = 1117, + SpinfieldLast = 1118, + StatusbarClick = 1119, + StatusbarDoubleClick = 1120, + ToolboxClick = 1121, + ToolboxDoubleClick = 1122, + ToolboxActivate = 1123, + ToolboxDeactivate = 1124, + ToolboxHighlight = 1125, + ToolboxSelect = 1126, // Resort later... -#define VCLEVENT_LISTBOX_SCROLLED 1127 -#define VCLEVENT_COMBOBOX_SCROLLED 1128 -#define VCLEVENT_EDIT_SELECTIONCHANGED 1129 -#define VCLEVENT_DROPDOWN_OPEN 1130 -#define VCLEVENT_DROPDOWN_CLOSE 1131 - -#define VCLEVENT_TOOLBOX_ITEMADDED 1132 // pData = itempos -#define VCLEVENT_TOOLBOX_ITEMREMOVED 1133 // pData = itempos -#define VCLEVENT_TOOLBOX_ALLITEMSCHANGED 1134 -#define VCLEVENT_TOOLBOX_HIGHLIGHTOFF 1135 // pData = itempos -#define VCLEVENT_WINDOW_MENUBARADDED 1136 // pData = pMenuBar -#define VCLEVENT_TABPAGE_ACTIVATE 1137 // pData = pageid -#define VCLEVENT_TABPAGE_DEACTIVATE 1138 // pData = pageid + ListboxScrolled = 1127, + ComboboxScrolled = 1128, + EditSelectionChanged = 1129, + DropdownOpen = 1130, + DropdownClose = 1131, + ToolboxItemAdded = 1132, // pData = itempos + ToolboxItemRemoved = 1133, // pData = itempos + ToolboxAllItemsChanged = 1134, + ToolboxHighlightOff = 1135, // pData = itempos + WindowMenubarAdded = 1136, // pData = pMenuBar + TabpageActivate = 1137, // pData = pageid + TabpageDeactivate = 1138, // pData = pageid // free // free -#define VCLEVENT_TABBAR_PAGESELECTED 1141 // pData = pageid -#define VCLEVENT_TABBAR_PAGEACTIVATED 1142 // pData = pageid -#define VCLEVENT_TABBAR_PAGEDEACTIVATED 1143 // pData = pageid -#define VCLEVENT_TABBAR_PAGEINSERTED 1144 // pData = pageid -#define VCLEVENT_TABBAR_PAGEREMOVED 1145 // pData = pageid -#define VCLEVENT_TABBAR_PAGEMOVED 1146 // pData = Pair( pagepos_old, pagepos_new ) -#define VCLEVENT_TABBAR_PAGETEXTCHANGED 1147 // pData = pageid -#define VCLEVENT_COMBOBOX_DESELECT 1148 -#define VCLEVENT_TOOLBOX_ITEMTEXTCHANGED 1149 // pData = itempos -#define VCLEVENT_TABPAGE_INSERTED 1150 // pData = pageid -#define VCLEVENT_TABPAGE_REMOVED 1151 // pData = pageid -#define VCLEVENT_TABPAGE_REMOVEDALL 1152 -#define VCLEVENT_LISTBOX_ITEMADDED 1153 // pData = itempos -#define VCLEVENT_LISTBOX_ITEMREMOVED 1154 // pData = itempos, -1=ALL -#define VCLEVENT_COMBOBOX_ITEMADDED 1155 // pData = itempos -#define VCLEVENT_COMBOBOX_ITEMREMOVED 1156 // pData = itempos, -1=ALL -// free 1157 -#define VCLEVENT_WINDOW_MENUBARREMOVED 1158 // pData = pMenuBar -#define VCLEVENT_STATUSBAR_ITEMADDED 1159 // pData = itemid -#define VCLEVENT_STATUSBAR_ITEMREMOVED 1160 // pData = itemid -#define VCLEVENT_STATUSBAR_ALLITEMSREMOVED 1161 -#define VCLEVENT_STATUSBAR_SHOWITEM 1162 // pData = itemid -#define VCLEVENT_STATUSBAR_HIDEITEM 1163 // pData = itemid -#define VCLEVENT_STATUSBAR_SHOWALLITEMS 1164 + TabbarPageSelected = 1141, // pData = pageid + TabbarPageActivated = 1142, // pData = pageid + TabbarPageDeactivated = 1143, // pData = pageid + TabbarPageInserted = 1144, // pData = pageid + TabbarPageRemoved = 1145, // pData = pageid + TabbarPageMoved = 1146, // pData = Pair( pagepos_old, pagepos_new ) + TabbarPageTextChanged = 1147, // pData = pageid + ComboboxDeselect = 1148, + ToolboxItemTextChanged = 1149, // pData = itempos + TabpageInserted = 1150, // pData = pageid + TabpageRemoved = 1151, // pData = pageid + TabpageRemovedAll = 1152, + ListboxItemAdded = 1153, // pData = itempos + ListboxItemRemoved = 1154, // pData = itempos, -1=All + ComboboxItemAdded = 1155, // pData = itempos + ComboboxItemRemoved = 1156, // pData = itempos, -1=All +//free + WindowMenubarRemoved = 1158, // pData = pMenuBar + StatusbarItemAdded = 1159, // pData = itemid + StatusbarItemRemoved = 1160, // pData = itemid + StatusbarAllItemsRemoved = 1161, + StatusbarShowItem = 1162, // pData = itemid + StatusbarHideItem = 1163, // pData = itemid + StatusbarShowAllItems = 1164, // free -#define VCLEVENT_STATUSBAR_DRAWITEM 1166 // pData = itemid -#define VCLEVENT_STATUSBAR_NAMECHANGED 1167 // pData = itemid -#define VCLEVENT_TOOLBOX_ITEMENABLED 1168 // pData = itempos -#define VCLEVENT_TOOLBOX_ITEMDISABLED 1169 // pData = itempos -#define VCLEVENT_TABPAGE_PAGETEXTCHANGED 1170 // pData = pageid -#define VCLEVENT_ROADMAP_ITEMSELECTED 1171 -#define VCLEVENT_TOOLBOX_FORMATCHANGED 1172 // request new layout -#define VCLEVENT_COMBOBOX_SETTEXT 1173 + StatusbarDrawItem = 1166, // pData = itemid + StatusbarNameChanged = 1167, // pData = itemid + ToolboxItemEnabled = 1168, // pData = itempos + ToolboxItemDisabled = 1169, // pData = itempos + TabpagePageTextChanged = 1170, // pData = pageid + RoadmapItemSelected = 1171, + ToolboxFormatChanged = 1172, // request new layout + ComboboxSetText = 1173, // #i92103# -#define VCLEVENT_ITEM_EXPANDED 1174 -#define VCLEVENT_ITEM_COLLAPSED 1175 -#define VCLEVENT_DROPDOWN_PRE_OPEN 1176 -#define VCLEVENT_DROPDOWN_SELECT 1177 -#define VCLEVENT_LISTBOX_FOCUSITEMCHANGED 1180 + ItemExpanded = 1174, + ItemCollapsed = 1175, + DropdownPreOpen = 1176, + DropdownSelect = 1177, + ListboxFocusItemChanged = 1180, // VclMenuEvent -#define VCLEVENT_MENU_ACTIVATE 1200 -#define VCLEVENT_MENU_DEACTIVATE 1201 -#define VCLEVENT_MENU_HIGHLIGHT 1202 -#define VCLEVENT_MENU_SELECT 1203 -#define VCLEVENT_MENU_ENABLE 1204 -#define VCLEVENT_MENU_INSERTITEM 1205 -#define VCLEVENT_MENU_REMOVEITEM 1206 -#define VCLEVENT_MENU_SUBMENUACTIVATE 1207 -#define VCLEVENT_MENU_SUBMENUDEACTIVATE 1208 -#define VCLEVENT_MENU_SUBMENUCHANGED 1209 -#define VCLEVENT_MENU_DEHIGHLIGHT 1210 -#define VCLEVENT_MENU_DISABLE 1211 -#define VCLEVENT_MENU_ITEMTEXTCHANGED 1212 -#define VCLEVENT_MENU_ITEMCHECKED 1213 -#define VCLEVENT_MENU_ITEMUNCHECKED 1214 -#define VCLEVENT_MENU_ACCESSIBLENAMECHANGED 1215 -#define VCLEVENT_TOOLBOX_ITEMWINDOWCHANGED 1216 -#define VCLEVENT_TOOLBOX_ITEMUPDATED 1217 - -#define VCLEVENT_MENU_SHOW 1250 -#define VCLEVENT_MENU_HIDE 1251 - -#define VCLEVENT_TOOLBOX_ITEMWINDOWCHANGED 1216 -#define VCLEVENT_LISTBOX_TREEFOCUS 1220 -#define VCLEVENT_LISTBOX_TREESELECT 1221 -#define VCLEVENT_EDIT_CARETCHANGED 1222 - -#define VCLEVENT_LISTBOX_FOCUS 1224 + MenuActivate = 1200, + MenuDeactivate = 1201, + MenuHighlight = 1202, + MenuSelect = 1203, + MenuEnable = 1204, + MenuInsertItem = 1205, + MenuRemoveItem = 1206, + MenuSubmenuActivate = 1207, + MenuSubmenuDeactivate = 1208, + MenuSubmenuChanged = 1209, + MenuDehighlight = 1210, + MenuDisable = 1211, + MenuItemTextChanged = 1212, + MenuItemChecked = 1213, + MenuItemUnchecked = 1214, + MenuAccessibleNameChanged = 1215, + ToolboxItemWindowChanged = 1216, + ToolboxItemUpdated = 1217, + + MenuShow = 1250, + MenuHide = 1251, + + ListboxTreeFocus = 1220, + ListboxTreeSelect = 1221, + EditCaretChanged = 1222, + + ListboxFocus = 1224, // DockingWindow -#define VCLEVENT_WINDOW_STARTDOCKING 1227 // pData = DockingData -#define VCLEVENT_WINDOW_DOCKING 1228 -#define VCLEVENT_WINDOW_ENDDOCKING 1229 // pData = EndDockingData -#define VCLEVENT_WINDOW_PREPARETOGGLEFLOATING 1230 // pData = bool -#define VCLEVENT_WINDOW_TOGGLEFLOATING 1231 -#define VCLEVENT_WINDOW_ENDPOPUPMODE 1232 // pData = EndPopupModeData - -#define VCLEVENT_TOOLBOX_BUTTONSTATECHANGED 1233 // pData = itempos -#define VCLEVENT_TABLECELL_NAMECHANGED 1234 // pData = struct(Entry, Column, oldText) -#define VCLEVENT_TABLEROW_SELECT 1235 -#define VCLEVENT_LISTBOX_STATEUPDATE 1236 + WindowStartDocking = 1227, // pData = DockingData + WindowDocking = 1228, + WindowEndDocking = 1229, // pData = EndDockingData + WindowPrepareToggleFloating = 1230, // pData = bool + WindowToggleFloating = 1231, + WindowEndPopupMode = 1232, // pData = EndPopupModeData + + ToolboxButtonStateChanged = 1233, // pData = itempos + TableCellNameChanged = 1234, // pData = struct(Entry, Column, oldText) + TableRowSelect = 1235, + ListboxStateUpdate = 1236, +}; class VCL_DLLPUBLIC VclSimpleEvent { private: - sal_uLong nId; + VclEventId nId; public: - VclSimpleEvent( sal_uLong n ) { nId = n; } + VclSimpleEvent( VclEventId n ) { nId = n; } virtual ~VclSimpleEvent() {} - sal_uLong GetId() const { return nId; } + VclEventId GetId() const { return nId; } }; class VCL_DLLPUBLIC VclWindowEvent : public VclSimpleEvent @@ -212,7 +211,7 @@ private: void* pData; public: - VclWindowEvent( vcl::Window* pWin, sal_uLong n, void* pDat ); + VclWindowEvent( vcl::Window* pWin, VclEventId n, void* pDat ); virtual ~VclWindowEvent() override; vcl::Window* GetWindow() const { return pWindow; } @@ -229,7 +228,7 @@ private: void operator =(VclMenuEvent) = delete; public: - VclMenuEvent( Menu* pM, sal_uLong n, sal_uInt16 nPos ); + VclMenuEvent( Menu* pM, VclEventId n, sal_uInt16 nPos ); virtual ~VclMenuEvent() override; Menu* GetMenu() const; @@ -239,7 +238,7 @@ public: class VCL_DLLPUBLIC VclAccessibleEvent: public VclSimpleEvent { public: - VclAccessibleEvent( sal_uLong n, const css::uno::Reference< css::accessibility::XAccessible >& rxAccessible ); + VclAccessibleEvent( VclEventId n, const css::uno::Reference< css::accessibility::XAccessible >& rxAccessible ); virtual ~VclAccessibleEvent() override; const css::uno::Reference< css::accessibility::XAccessible >& GetAccessible() const { return mxAccessible;} diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index d5713ad454c6..8aa141e3ec09 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -69,6 +69,7 @@ class MenuFloatingWindow; class VCLXWindow; class VclWindowEvent; enum class ImplPaintFlags; +enum class VclEventId; namespace com { namespace sun { namespace star { namespace accessibility { @@ -749,7 +750,7 @@ protected: void SetCompoundControl( bool bCompound ); - void CallEventListeners( sal_uLong nEvent, void* pData = nullptr ); + void CallEventListeners( VclEventId nEvent, void* pData = nullptr ); static void FireVclEvent( VclSimpleEvent& rEvent ); virtual bool AcquireGraphics() const override; diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx index c4395fc9f58d..9fdb931becf2 100644 --- a/reportdesign/source/ui/report/ReportController.cxx +++ b/reportdesign/source/ui/report/ReportController.cxx @@ -2566,7 +2566,7 @@ sal_Int32 OReportController::getGroupPosition(const uno::Reference< report::XGro IMPL_LINK( OReportController, EventLstHdl, VclWindowEvent&, _rEvent, void ) { - if ( _rEvent.GetId() == VCLEVENT_WINDOW_CLOSE ) + if ( _rEvent.GetId() == VclEventId::WindowClose ) { InvalidateFeature(SID_SORTINGANDGROUPING); InvalidateFeature(SID_FM_ADD_FIELD); diff --git a/reportdesign/source/ui/report/ReportControllerObserver.cxx b/reportdesign/source/ui/report/ReportControllerObserver.cxx index 9b0677e40435..0fd26d4c40cd 100644 --- a/reportdesign/source/ui/report/ReportControllerObserver.cxx +++ b/reportdesign/source/ui/report/ReportControllerObserver.cxx @@ -82,9 +82,9 @@ public: IMPL_LINK(OXReportControllerObserver, SettingsChanged, VclSimpleEvent&, _rEvt, void) { - sal_Int32 nEvent = _rEvt.GetId(); + VclEventId nEvent = _rEvt.GetId(); - if (nEvent == VCLEVENT_APPLICATION_DATACHANGED ) + if (nEvent == VclEventId::ApplicationDataChanged ) { DataChangedEvent* pData = static_cast<DataChangedEvent*>(static_cast<VclWindowEvent&>(_rEvt).GetData()); if ( pData && ((( pData->GetType() == DataChangedEventType::SETTINGS ) || diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx index f919af438e80..6b57a08b27db 100644 --- a/sc/source/ui/Accessibility/AccessibleDocument.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx @@ -1480,7 +1480,7 @@ IMPL_LINK( ScAccessibleDocument, WindowChildEventListener, VclWindowEvent&, rEve OSL_ENSURE( rEvent.GetWindow(), "Window???" ); switch ( rEvent.GetId() ) { - case VCLEVENT_WINDOW_SHOW: // send create on show for direct accessible children + case VclEventId::WindowShow: // send create on show for direct accessible children { vcl::Window* pChildWin = static_cast < vcl::Window * >( rEvent.GetData() ); if( pChildWin && AccessibleRole::EMBEDDED_OBJECT == pChildWin->GetAccessibleRole() ) @@ -1489,7 +1489,7 @@ IMPL_LINK( ScAccessibleDocument, WindowChildEventListener, VclWindowEvent&, rEve } } break; - case VCLEVENT_WINDOW_HIDE: // send destroy on hide for direct accessible children + case VclEventId::WindowHide: // send destroy on hide for direct accessible children { vcl::Window* pChildWin = static_cast < vcl::Window * >( rEvent.GetData() ); if( pChildWin && AccessibleRole::EMBEDDED_OBJECT == pChildWin->GetAccessibleRole() ) @@ -1498,6 +1498,7 @@ IMPL_LINK( ScAccessibleDocument, WindowChildEventListener, VclWindowEvent&, rEve } } break; + default: break; } } diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index 5d1fa7602453..33ec65641b00 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -857,13 +857,13 @@ void ScInputHandler::GetFormulaData() IMPL_LINK( ScInputHandler, ShowHideTipVisibleParentListener, VclWindowEvent&, rEvent, void ) { - if( rEvent.GetId() == VCLEVENT_OBJECT_DYING || rEvent.GetId() == VCLEVENT_WINDOW_HIDE ) + if( rEvent.GetId() == VclEventId::ObjectDying || rEvent.GetId() == VclEventId::WindowHide ) HideTip(); } IMPL_LINK( ScInputHandler, ShowHideTipVisibleSecParentListener, VclWindowEvent&, rEvent, void ) { - if( rEvent.GetId() == VCLEVENT_OBJECT_DYING || rEvent.GetId() == VCLEVENT_WINDOW_HIDE ) + if( rEvent.GetId() == VclEventId::ObjectDying || rEvent.GetId() == VclEventId::WindowHide ) HideTipBelow(); } diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx index bdf2b706e7df..d32ac8b55b3a 100644 --- a/sc/source/ui/cctrl/checklistmenu.cxx +++ b/sc/source/ui/cctrl/checklistmenu.cxx @@ -777,7 +777,7 @@ void ScMenuFloatingWindow::fireMenuHighlightedEvent() if (!xAccMenu.is()) return; - VclAccessibleEvent aEvent(VCLEVENT_MENU_HIGHLIGHT, xAccMenu); + VclAccessibleEvent aEvent(VclEventId::MenuHighlight, xAccMenu); FireVclEvent(aEvent); } diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx index d629c384a768..8b2197c65af0 100644 --- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx +++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx @@ -165,7 +165,7 @@ IMPL_LINK(AccessibleDocumentViewBase, WindowChildEventListener, // DBG_ASSERT( pVclEvent->GetWindow(), "Window???" ); switch (rEvent.GetId()) { - case VCLEVENT_OBJECT_DYING: + case VclEventId::ObjectDying: { // Window is dying. Unregister from VCL Window. // This is also attempted in the disposing() method. @@ -179,7 +179,7 @@ IMPL_LINK(AccessibleDocumentViewBase, WindowChildEventListener, } break; - case VCLEVENT_WINDOW_SHOW: + case VclEventId::WindowShow: { // A new window has been created. Is it an OLE object? vcl::Window* pChildWindow = static_cast<vcl::Window*>( @@ -193,7 +193,7 @@ IMPL_LINK(AccessibleDocumentViewBase, WindowChildEventListener, } break; - case VCLEVENT_WINDOW_HIDE: + case VclEventId::WindowHide: { // A window has been destroyed. Has that been an OLE // object? @@ -207,6 +207,8 @@ IMPL_LINK(AccessibleDocumentViewBase, WindowChildEventListener, } } break; + + default: break; } } diff --git a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx index 63436bec0352..3a1a49cf7c0a 100644 --- a/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx +++ b/sd/source/ui/accessibility/AccessibleSlideSorterView.cxx @@ -894,13 +894,13 @@ IMPL_LINK(AccessibleSlideSorterView::Implementation, WindowEventListener, VclWin { switch (rEvent.GetId()) { - case VCLEVENT_WINDOW_MOVE: - case VCLEVENT_WINDOW_RESIZE: + case VclEventId::WindowMove: + case VclEventId::WindowResize: RequestUpdateChildren(); break; - case VCLEVENT_WINDOW_GETFOCUS: - case VCLEVENT_WINDOW_LOSEFOCUS: + case VclEventId::WindowGetFocus: + case VclEventId::WindowLoseFocus: mrAccessibleSlideSorter.FireAccessibleEvent( AccessibleEventId::SELECTION_CHANGED, Any(), diff --git a/sd/source/ui/annotations/annotationtag.cxx b/sd/source/ui/annotations/annotationtag.cxx index 771cd5964d5e..fe740b524273 100644 --- a/sd/source/ui/annotations/annotationtag.cxx +++ b/sd/source/ui/annotations/annotationtag.cxx @@ -614,7 +614,7 @@ IMPL_LINK(AnnotationTag, WindowEventHandler, VclWindowEvent&, rEvent, void) { if( pWindow == mpAnnotationWindow.get() ) { - if( rEvent.GetId() == VCLEVENT_WINDOW_DEACTIVATE ) + if( rEvent.GetId() == VclEventId::WindowDeactivate ) { // tdf#99388 and tdf#99712 if PopupMenu is active, suppress // deletion of the AnnotationWindow which is triggered by @@ -632,7 +632,7 @@ IMPL_LINK(AnnotationTag, WindowEventHandler, VclWindowEvent&, rEvent, void) { switch( rEvent.GetId() ) { - case VCLEVENT_WINDOW_MOUSEBUTTONUP: + case VclEventId::WindowMouseButtonUp: { // if we stop pressing the button without a mouse move we open the popup mpListenWindow->RemoveEventListener( LINK(this, AnnotationTag, WindowEventHandler)); @@ -641,7 +641,7 @@ IMPL_LINK(AnnotationTag, WindowEventHandler, VclWindowEvent&, rEvent, void) OpenPopup(false); } break; - case VCLEVENT_WINDOW_MOUSEMOVE: + case VclEventId::WindowMouseMove: { // if we move the mouse after a button down we wan't to start draging mpListenWindow->RemoveEventListener( LINK(this, AnnotationTag, WindowEventHandler)); @@ -660,9 +660,10 @@ IMPL_LINK(AnnotationTag, WindowEventHandler, VclWindowEvent&, rEvent, void) } } break; - case VCLEVENT_OBJECT_DYING: + case VclEventId::ObjectDying: mpListenWindow = nullptr; break; + default: break; } } } diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx index 7dc6dad1bc5f..1f0fcde5a590 100644 --- a/sd/source/ui/app/sdmod1.cxx +++ b/sd/source/ui/app/sdmod1.cxx @@ -392,7 +392,7 @@ void SdModule::GetState(SfxItemSet& rItemSet) IMPL_STATIC_LINK( SdModule, EventListenerHdl, VclSimpleEvent&, rSimpleEvent, void ) { - if( (rSimpleEvent.GetId() == VCLEVENT_WINDOW_COMMAND) && static_cast<VclWindowEvent*>(&rSimpleEvent)->GetData() ) + if( (rSimpleEvent.GetId() == VclEventId::WindowCommand) && static_cast<VclWindowEvent*>(&rSimpleEvent)->GetData() ) { const CommandEvent& rEvent = *static_cast<const CommandEvent*>(static_cast<VclWindowEvent*>(&rSimpleEvent)->GetData()); diff --git a/sd/source/ui/dlg/LayerTabBar.cxx b/sd/source/ui/dlg/LayerTabBar.cxx index 0ab57a7ed5c5..eeeb24cd42d4 100644 --- a/sd/source/ui/dlg/LayerTabBar.cxx +++ b/sd/source/ui/dlg/LayerTabBar.cxx @@ -297,13 +297,13 @@ void LayerTabBar::ActivatePage() void LayerTabBar::SendActivatePageEvent() { - CallEventListeners (VCLEVENT_TABBAR_PAGEACTIVATED, + CallEventListeners (VclEventId::TabbarPageActivated, reinterpret_cast<void*>(GetCurPageId())); } void LayerTabBar::SendDeactivatePageEvent() { - CallEventListeners (VCLEVENT_TABBAR_PAGEDEACTIVATED, + CallEventListeners (VclEventId::TabbarPageDeactivated, reinterpret_cast<void*>(GetCurPageId())); } diff --git a/sd/source/ui/framework/factories/FullScreenPane.cxx b/sd/source/ui/framework/factories/FullScreenPane.cxx index 4181ba3c7b84..86ffbb2d0c1b 100644 --- a/sd/source/ui/framework/factories/FullScreenPane.cxx +++ b/sd/source/ui/framework/factories/FullScreenPane.cxx @@ -177,16 +177,18 @@ IMPL_LINK(FullScreenPane, WindowEventHandler, VclWindowEvent&, rEvent, void) { switch (rEvent.GetId()) { - case VCLEVENT_WINDOW_RESIZE: + case VclEventId::WindowResize: GetWindow()->SetPosPixel(Point(0,0)); GetWindow()->SetSizePixel(Size( mpWorkWindow->GetSizePixel().Width(), mpWorkWindow->GetSizePixel().Height())); break; - case VCLEVENT_OBJECT_DYING: + case VclEventId::ObjectDying: mpWorkWindow.disposeAndClear(); break; + + default: break; } } diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx index b9b99ba5564d..a8a21b0e5a0a 100644 --- a/sd/source/ui/sidebar/LayoutMenu.cxx +++ b/sd/source/ui/sidebar/LayoutMenu.cxx @@ -737,8 +737,8 @@ IMPL_LINK(LayoutMenu, WindowEventHandler, VclWindowEvent&, rEvent, void) { switch (rEvent.GetId()) { - case VCLEVENT_WINDOW_SHOW: - case VCLEVENT_WINDOW_RESIZE: + case VclEventId::WindowShow: + case VclEventId::WindowResize: SetSizePixel(GetParent()->GetSizePixel()); break; diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx index 6c52336aa896..389551093fc6 100644 --- a/sd/source/ui/slideshow/showwin.cxx +++ b/sd/source/ui/slideshow/showwin.cxx @@ -568,7 +568,7 @@ IMPL_LINK( ShowWindow, EventHdl, VclWindowEvent&, rEvent, void ) { if( mbMouseAutoHide ) { - if (rEvent.GetId() == VCLEVENT_WINDOW_SHOW) + if (rEvent.GetId() == VclEventId::WindowShow) { maMouseTimer.SetTimeout( HIDE_MOUSE_TIMEOUT ); maMouseTimer.Start(); diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index 140f0ac73cd0..f7402f58bf8f 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -1893,7 +1893,7 @@ IMPL_LINK( SlideshowImpl, EventListenerHdl, VclSimpleEvent&, rSimpleEvent, void if( !mxShow.is() || mbInputFreeze ) return; - if( (rSimpleEvent.GetId() == VCLEVENT_WINDOW_COMMAND) && static_cast<VclWindowEvent*>(&rSimpleEvent)->GetData() ) + if( (rSimpleEvent.GetId() == VclEventId::WindowCommand) && static_cast<VclWindowEvent*>(&rSimpleEvent)->GetData() ) { const CommandEvent& rEvent = *static_cast<const CommandEvent*>(static_cast<VclWindowEvent*>(&rSimpleEvent)->GetData()); diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx index 1fa0e030875c..a6486df3524f 100644 --- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx +++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx @@ -530,24 +530,24 @@ IMPL_LINK(SlideSorterController, WindowEventHandler, VclWindowEvent&, rEvent, vo sd::Window *pActiveWindow (mrSlideSorter.GetContentWindow().get()); switch (rEvent.GetId()) { - case VCLEVENT_WINDOW_ACTIVATE: - case VCLEVENT_WINDOW_SHOW: + case VclEventId::WindowActivate: + case VclEventId::WindowShow: if (pActiveWindow && pWindow == pActiveWindow->GetParent()) mrView.RequestRepaint(); break; - case VCLEVENT_WINDOW_HIDE: + case VclEventId::WindowHide: if (pActiveWindow && pWindow == pActiveWindow->GetParent()) mrView.SetPageUnderMouse(SharedPageDescriptor()); break; - case VCLEVENT_WINDOW_GETFOCUS: + case VclEventId::WindowGetFocus: if (pActiveWindow) if (pWindow == pActiveWindow) GetFocusManager().ShowFocus(false); break; - case VCLEVENT_WINDOW_LOSEFOCUS: + case VclEventId::WindowLoseFocus: if (pActiveWindow && pWindow == pActiveWindow) { GetFocusManager().HideFocus(); @@ -559,7 +559,7 @@ IMPL_LINK(SlideSorterController, WindowEventHandler, VclWindowEvent&, rEvent, vo } break; - case VCLEVENT_APPLICATION_DATACHANGED: + case VclEventId::ApplicationDataChanged: { // Invalidate the preview cache. cache::PageCacheManager::Instance()->InvalidateAllCaches(); diff --git a/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx b/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx index 136d7fd5dfd2..36721db11049 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsProperties.hxx @@ -32,7 +32,7 @@ public: Properties(); ~Properties(); - /** Call this method after receiving a VCLEVENT_APPLICATION_DATACHANGED + /** Call this method after receiving a VclEventId::ApplicationDataChanged event. */ void HandleDataChangeEvent(); diff --git a/sd/source/ui/view/FormShellManager.cxx b/sd/source/ui/view/FormShellManager.cxx index fc57bec856a1..41b567fb9107 100644 --- a/sd/source/ui/view/FormShellManager.cxx +++ b/sd/source/ui/view/FormShellManager.cxx @@ -227,7 +227,7 @@ IMPL_LINK(FormShellManager, WindowEventHandler, VclWindowEvent&, rEvent, void) { switch (rEvent.GetId()) { - case VCLEVENT_WINDOW_GETFOCUS: + case VclEventId::WindowGetFocus: { // The window of the center pane got the focus. Therefore // the form shell is moved to the bottom of the object bar @@ -245,7 +245,7 @@ IMPL_LINK(FormShellManager, WindowEventHandler, VclWindowEvent&, rEvent, void) } break; - case VCLEVENT_WINDOW_LOSEFOCUS: + case VclEventId::WindowLoseFocus: // We follow the sloppy focus policy. Losing the focus is // ignored. We wait for the focus to be placed either in // the window or the form shell. The later, however, is @@ -253,9 +253,11 @@ IMPL_LINK(FormShellManager, WindowEventHandler, VclWindowEvent&, rEvent, void) // one. break; - case VCLEVENT_OBJECT_DYING: + case VclEventId::ObjectDying: mpMainViewShellWindow = nullptr; break; + + default: break; } } diff --git a/sd/source/ui/view/ViewShellManager.cxx b/sd/source/ui/view/ViewShellManager.cxx index 1d11b149f705..1bb198618fdc 100644 --- a/sd/source/ui/view/ViewShellManager.cxx +++ b/sd/source/ui/view/ViewShellManager.cxx @@ -988,7 +988,7 @@ IMPL_LINK(ViewShellManager::Implementation, WindowEventHandler, VclWindowEvent&, switch (rEvent.GetId()) { - case VCLEVENT_WINDOW_GETFOCUS: + case VclEventId::WindowGetFocus: { for (ActiveShellList::iterator aI(maActiveViewShells.begin()); aI!=maActiveViewShells.end(); @@ -1003,10 +1003,10 @@ IMPL_LINK(ViewShellManager::Implementation, WindowEventHandler, VclWindowEvent&, } break; - case VCLEVENT_WINDOW_LOSEFOCUS: + case VclEventId::WindowLoseFocus: break; - case VCLEVENT_OBJECT_DYING: + case VclEventId::ObjectDying: // Remember that we do not have to remove the window // listener for this window. for (ActiveShellList::iterator @@ -1022,6 +1022,8 @@ IMPL_LINK(ViewShellManager::Implementation, WindowEventHandler, VclWindowEvent&, } } break; + + default: break; } } diff --git a/sd/source/ui/view/tabcontr.cxx b/sd/source/ui/view/tabcontr.cxx index 4b9bebd7039f..bbb7598bba31 100644 --- a/sd/source/ui/view/tabcontr.cxx +++ b/sd/source/ui/view/tabcontr.cxx @@ -355,13 +355,13 @@ bool TabControl::DeactivatePage() void TabControl::SendActivatePageEvent() { - CallEventListeners (VCLEVENT_TABBAR_PAGEACTIVATED, + CallEventListeners (VclEventId::TabbarPageActivated, reinterpret_cast<void*>(GetCurPageId())); } void TabControl::SendDeactivatePageEvent() { - CallEventListeners (VCLEVENT_TABBAR_PAGEDEACTIVATED, + CallEventListeners (VclEventId::TabbarPageDeactivated, reinterpret_cast<void*>(GetCurPageId())); } diff --git a/sfx2/source/notebookbar/PriorityHBox.cxx b/sfx2/source/notebookbar/PriorityHBox.cxx index fd8243f3f4ea..13ff34fd983a 100644 --- a/sfx2/source/notebookbar/PriorityHBox.cxx +++ b/sfx2/source/notebookbar/PriorityHBox.cxx @@ -141,7 +141,7 @@ private: IMPL_LINK( PriorityHBox, WindowEventListener, VclWindowEvent&, rEvent, void ) { - if (rEvent.GetId() == VCLEVENT_WINDOW_RESIZE) + if (rEvent.GetId() == VclEventId::WindowResize) { vcl::Window* pEventWindow = rEvent.GetWindow(); diff --git a/sfx2/source/sidebar/FocusManager.cxx b/sfx2/source/sidebar/FocusManager.cxx index 2b02b96f6fef..8603aec81a04 100644 --- a/sfx2/source/sidebar/FocusManager.cxx +++ b/sfx2/source/sidebar/FocusManager.cxx @@ -514,19 +514,19 @@ IMPL_LINK(FocusManager, WindowEventListener, VclWindowEvent&, rWindowEvent, void switch (rWindowEvent.GetId()) { - case VCLEVENT_WINDOW_KEYINPUT: + case VclEventId::WindowKeyInput: { KeyEvent* pKeyEvent = static_cast<KeyEvent*>(rWindowEvent.GetData()); HandleKeyEvent(pKeyEvent->GetKeyCode(), *pSource); break; } - case VCLEVENT_OBJECT_DYING: + case VclEventId::ObjectDying: RemoveWindow(*pSource); break; - case VCLEVENT_WINDOW_GETFOCUS: - case VCLEVENT_WINDOW_LOSEFOCUS: + case VclEventId::WindowGetFocus: + case VclEventId::WindowLoseFocus: pSource->Invalidate(); break; @@ -543,7 +543,7 @@ IMPL_LINK(FocusManager, ChildEventListener, VclWindowEvent&, rEvent, void) switch (rEvent.GetId()) { - case VCLEVENT_WINDOW_KEYINPUT: + case VclEventId::WindowKeyInput: { KeyEvent* pKeyEvent = static_cast<KeyEvent*>(rEvent.GetData()); @@ -587,7 +587,7 @@ IMPL_LINK(FocusManager, ChildEventListener, VclWindowEvent&, rEvent, void) return; } - case VCLEVENT_WINDOW_GETFOCUS: + case VclEventId::WindowGetFocus: // Keep track of focused controls in panel content. // Remember the first focused control. When it is later // focused again due to pressing the TAB key then the diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index 98112eb0028e..cc11f07c3104 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -864,12 +864,12 @@ IMPL_LINK(SidebarController, WindowEventHandler, VclWindowEvent&, rEvent, void) { switch (rEvent.GetId()) { - case VCLEVENT_WINDOW_SHOW: - case VCLEVENT_WINDOW_RESIZE: + case VclEventId::WindowShow: + case VclEventId::WindowResize: NotifyResize(); break; - case VCLEVENT_WINDOW_DATACHANGED: + case VclEventId::WindowDataChanged: // Force an update of deck and tab bar to reflect // changes in theme (high contrast mode). Theme::HandleDataChange(); @@ -880,11 +880,11 @@ IMPL_LINK(SidebarController, WindowEventHandler, VclWindowEvent&, rEvent, void) maContextChangeUpdate.RequestCall(); break; - case SFX_HINT_DYING: + case VclEventId::ObjectDying: dispose(); break; - case VCLEVENT_WINDOW_PAINT: + case VclEventId::WindowPaint: OSL_TRACE("Paint"); break; @@ -896,20 +896,22 @@ IMPL_LINK(SidebarController, WindowEventHandler, VclWindowEvent&, rEvent, void) { switch (rEvent.GetId()) { - case VCLEVENT_WINDOW_MOUSEBUTTONDOWN: + case VclEventId::WindowMouseButtonDown: mnWidthOnSplitterButtonDown = mpParentWindow->GetSizePixel().Width(); break; - case VCLEVENT_WINDOW_MOUSEBUTTONUP: + case VclEventId::WindowMouseButtonUp: { ProcessNewWidth(mpParentWindow->GetSizePixel().Width()); mnWidthOnSplitterButtonDown = 0; break; } - case SFX_HINT_DYING: + case VclEventId::ObjectDying: dispose(); break; + + default: break; } } } diff --git a/sfx2/source/toolbox/imgmgr.cxx b/sfx2/source/toolbox/imgmgr.cxx index 79386a821884..8b3d40113711 100644 --- a/sfx2/source/toolbox/imgmgr.cxx +++ b/sfx2/source/toolbox/imgmgr.cxx @@ -204,14 +204,14 @@ IMPL_LINK( SfxImageManager_Impl, SettingsChanged_Impl, VclSimpleEvent&, rEvent, { switch (rEvent.GetId()) { - case VCLEVENT_OBJECT_DYING: + case VclEventId::ObjectDying: if (m_bAppEventListener) { Application::RemoveEventListener( LINK( this, SfxImageManager_Impl, SettingsChanged_Impl ) ); m_bAppEventListener = false; } break; - case VCLEVENT_APPLICATION_DATACHANGED: + case VclEventId::ApplicationDataChanged: // Check if toolbar button size have changed and we have to use system settings { sal_Int16 nSymbolsSize = m_aOpt.GetCurrentSymbolsSize(); diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index a30596213cd2..be206c88de7c 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -194,8 +194,8 @@ struct SfxToolBoxControl_Impl IMPL_LINK( SfxToolBoxControl_Impl, WindowEventListener, VclWindowEvent&, rEvent, void ) { - if ( ( rEvent.GetId() == VCLEVENT_WINDOW_MOVE ) || - ( rEvent.GetId() == VCLEVENT_WINDOW_ACTIVATE )) + if ( ( rEvent.GetId() == VclEventId::WindowMove ) || + ( rEvent.GetId() == VclEventId::WindowActivate )) { vcl::Window* pWindow( rEvent.GetWindow() ); if (( pWindow == mpFloatingWindow ) && diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx index da09eac04d12..3e28171fe614 100644 --- a/svtools/source/config/colorcfg.cxx +++ b/svtools/source/config/colorcfg.cxx @@ -335,7 +335,7 @@ void ColorConfig_Impl::SettingsChanged() IMPL_LINK( ColorConfig_Impl, DataChangedEventListener, VclSimpleEvent&, rEvent, void ) { - if ( rEvent.GetId() == VCLEVENT_APPLICATION_DATACHANGED ) + if ( rEvent.GetId() == VclEventId::ApplicationDataChanged ) { DataChangedEvent* pData = static_cast<DataChangedEvent*>(static_cast<VclWindowEvent&>(rEvent).GetData()); if ( (pData->GetType() == DataChangedEventType::SETTINGS) && diff --git a/svtools/source/config/extcolorcfg.cxx b/svtools/source/config/extcolorcfg.cxx index cdf060cb2def..9c6c9d187140 100644 --- a/svtools/source/config/extcolorcfg.cxx +++ b/svtools/source/config/extcolorcfg.cxx @@ -522,7 +522,7 @@ void ExtendedColorConfig_Impl::UnlockBroadcast() IMPL_LINK( ExtendedColorConfig_Impl, DataChangedEventListener, VclSimpleEvent&, rEvent, void ) { - if ( rEvent.GetId() == VCLEVENT_APPLICATION_DATACHANGED ) + if ( rEvent.GetId() == VclEventId::ApplicationDataChanged ) { DataChangedEvent* pData = static_cast<DataChangedEvent*>(static_cast<VclWindowEvent&>(rEvent).GetData()); if ( (pData->GetType() == DataChangedEventType::SETTINGS) && diff --git a/svtools/source/contnr/imivctl.hxx b/svtools/source/contnr/imivctl.hxx index 85ea19ac93bf..d43208cf380c 100644 --- a/svtools/source/contnr/imivctl.hxx +++ b/svtools/source/contnr/imivctl.hxx @@ -483,7 +483,7 @@ public: ); void DrawHighlightFrame(vcl::RenderContext& rRenderContext, const Rectangle& rBmpRect); - void CallEventListeners( sal_uLong nEvent, void* pData ); + void CallEventListeners( VclEventId nEvent, void* pData ); ::svt::IAccessibleFactory& GetAccessibleFactory() { diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx index a07194f177b3..b3068ba23d12 100644 --- a/svtools/source/contnr/imivctl1.cxx +++ b/svtools/source/contnr/imivctl1.cxx @@ -414,7 +414,7 @@ void SvxIconChoiceCtrl_Impl::EntrySelected(SvxIconChoiceCtrlEntry* pEntry, bool // #i101012# emit vcl event LISTBOX_SELECT only in case that the given entry is selected. if (bSelect) { - CallEventListeners(VCLEVENT_LISTBOX_SELECT, pEntry); + CallEventListeners(VclEventId::ListboxSelect, pEntry); } } @@ -974,7 +974,7 @@ void SvxIconChoiceCtrl_Impl::SetCursor_Impl( SvxIconChoiceCtrlEntry* pOldCursor, { SelectEntry( pCursor, true, false, bPaintSync ); aCurSelectionRect = GetEntryBoundRect( pCursor ); - CallEventListeners( VCLEVENT_LISTBOX_SELECT, pCursor ); + CallEventListeners( VclEventId::ListboxSelect, pCursor ); } } } @@ -3508,7 +3508,7 @@ void SvxIconChoiceCtrl_Impl::SetOrigin( const Point& rPos ) pView->SetMapMode( aMapMode ); } -void SvxIconChoiceCtrl_Impl::CallEventListeners( sal_uLong nEvent, void* pData ) +void SvxIconChoiceCtrl_Impl::CallEventListeners( VclEventId nEvent, void* pData ) { pView->CallImplEventListeners( nEvent, pData ); } diff --git a/svtools/source/contnr/ivctrl.cxx b/svtools/source/contnr/ivctrl.cxx index 7a0969848ad7..41f2296978e6 100644 --- a/svtools/source/contnr/ivctrl.cxx +++ b/svtools/source/contnr/ivctrl.cxx @@ -87,7 +87,7 @@ void SvtIconChoiceCtrl::dispose() { if (_pImpl) { - _pImpl->CallEventListeners( VCLEVENT_OBJECT_DYING, nullptr ); + _pImpl->CallEventListeners( VclEventId::ObjectDying, nullptr ); _pImpl.reset(); } Control::dispose(); @@ -191,7 +191,7 @@ void SvtIconChoiceCtrl::GetFocus() Control::GetFocus(); SvxIconChoiceCtrlEntry* pSelectedEntry = GetSelectedEntry(); if ( pSelectedEntry ) - _pImpl->CallEventListeners( VCLEVENT_LISTBOX_SELECT, pSelectedEntry ); + _pImpl->CallEventListeners( VclEventId::ListboxSelect, pSelectedEntry ); } void SvtIconChoiceCtrl::LoseFocus() @@ -422,7 +422,7 @@ void SvtIconChoiceCtrl::SetNoSelection() _pImpl->SetNoSelection(); } -void SvtIconChoiceCtrl::CallImplEventListeners(sal_uLong nEvent, void* pData) +void SvtIconChoiceCtrl::CallImplEventListeners(VclEventId nEvent, void* pData) { CallEventListeners(nEvent, pData); } diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx index b5355525ee6d..d3cbdee9bd52 100644 --- a/svtools/source/contnr/svimpbox.cxx +++ b/svtools/source/contnr/svimpbox.cxx @@ -291,7 +291,7 @@ void SvImpLBox::Clear() aContextBmpWidthVector.clear(); - CallEventListeners( VCLEVENT_LISTBOX_ITEMREMOVED ); + CallEventListeners( VclEventId::ListboxItemRemoved ); } // ********************************************************************* @@ -638,7 +638,7 @@ void SvImpLBox::SetCursor( SvTreeListEntry* pEntry, bool bForceNoSelect ) if(!bForceNoSelect && bSimpleTravel && !(nFlags & LBoxFlags::DeselectAll) && GetUpdateMode()) { pView->Select( pCursor ); - CallEventListeners( VCLEVENT_LISTBOX_TREEFOCUS, pCursor ); + CallEventListeners( VclEventId::ListboxTreeFocus, pCursor ); } // multiple selection: select in cursor move if we're not in // Add mode (Ctrl-F8) @@ -648,14 +648,14 @@ void SvImpLBox::SetCursor( SvTreeListEntry* pEntry, bool bForceNoSelect ) !bForceNoSelect ) { pView->Select( pCursor ); - CallEventListeners( VCLEVENT_LISTBOX_TREEFOCUS, pCursor ); + CallEventListeners( VclEventId::ListboxTreeFocus, pCursor ); } else { ShowCursor( true ); if (bForceNoSelect && GetUpdateMode()) { - CallEventListeners( VCLEVENT_LISTBOX_TREEFOCUS, pCursor); + CallEventListeners( VclEventId::ListboxTreeFocus, pCursor); } } @@ -1622,7 +1622,7 @@ void SvImpLBox::EntrySelected( SvTreeListEntry* pEntry, bool bSelect ) void SvImpLBox::RemovingEntry( SvTreeListEntry* pEntry ) { - CallEventListeners( VCLEVENT_LISTBOX_ITEMREMOVED , pEntry ); + CallEventListeners( VclEventId::ListboxItemRemoved , pEntry ); DestroyAnchor(); @@ -2203,7 +2203,7 @@ bool SvImpLBox::KeyInput( const KeyEvent& rKEvt) { ++nCurTabPos; ShowCursor( true ); - CallEventListeners( VCLEVENT_LISTBOX_SELECT, pCursor ); + CallEventListeners( VclEventId::ListboxSelect, pCursor ); } } else if( nWindowStyle & WB_HSCROLL ) @@ -2234,7 +2234,7 @@ bool SvImpLBox::KeyInput( const KeyEvent& rKEvt) { --nCurTabPos; ShowCursor( true ); - CallEventListeners( VCLEVENT_LISTBOX_SELECT, pCursor ); + CallEventListeners( VclEventId::ListboxSelect, pCursor ); } } else if ( nWindowStyle & WB_HSCROLL ) @@ -3362,7 +3362,7 @@ const Image& SvImpLBox::GetDefaultCollapsedNodeImage( ) } -void SvImpLBox::CallEventListeners( sal_uLong nEvent, void* pData ) +void SvImpLBox::CallEventListeners( VclEventId nEvent, void* pData ) { if ( pView ) pView->CallImplEventListeners( nEvent, pData); diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx index 12c6934b1259..e114d651d326 100644 --- a/svtools/source/contnr/svtabbx.cxx +++ b/svtools/source/contnr/svtabbx.cxx @@ -323,7 +323,7 @@ void SvTabListBox::SetEntryText(const OUString& rStr, SvTreeListEntry* pEntry, s GetModel()->InvalidateEntry( pEntry ); TabListBoxEventData* pData = new TabListBoxEventData( pEntry, nTextColumn, sOldText ); - CallEventListeners( VCLEVENT_TABLECELL_NAMECHANGED, pData ); + CallEventListeners( VclEventId::TableCellNameChanged, pData ); delete pData; } diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx index 5052c0aab34a..0e1c363e3d3f 100644 --- a/svtools/source/contnr/treelistbox.cxx +++ b/svtools/source/contnr/treelistbox.cxx @@ -1398,7 +1398,7 @@ void SvTreeListBox::dispose() { if( pImpl ) { - pImpl->CallEventListeners( VCLEVENT_OBJECT_DYING ); + pImpl->CallEventListeners( VclEventId::ObjectDying ); pImpl.reset(); } if( mpImpl ) @@ -1871,7 +1871,7 @@ void SvTreeListBox::CheckButtonHdl() { aCheckButtonHdl.Call( this ); if ( pCheckButtonData ) - pImpl->CallEventListeners( VCLEVENT_CHECKBOX_TOGGLE, static_cast<void*>(pCheckButtonData->GetActEntry()) ); + pImpl->CallEventListeners( VclEventId::CheckboxToggle, static_cast<void*>(pCheckButtonData->GetActEntry()) ); } @@ -2050,7 +2050,7 @@ void SvTreeListBox::GetFocus() pEntry = pImpl->pCursor; } if ( pEntry ) - pImpl->CallEventListeners( VCLEVENT_LISTBOX_TREEFOCUS, pEntry ); + pImpl->CallEventListeners( VclEventId::ListboxTreeFocus, pEntry ); } @@ -2237,7 +2237,7 @@ bool SvTreeListBox::Expand( SvTreeListEntry* pParent ) // #i92103# if ( bExpanded ) { - pImpl->CallEventListeners( VCLEVENT_ITEM_EXPANDED, pParent ); + pImpl->CallEventListeners( VclEventId::ItemExpanded, pParent ); } return bExpanded; @@ -2263,7 +2263,7 @@ bool SvTreeListBox::Collapse( SvTreeListEntry* pParent ) // #i92103# if ( bCollapsed ) { - pImpl->CallEventListeners( VCLEVENT_ITEM_COLLAPSED, pParent ); + pImpl->CallEventListeners( VclEventId::ItemCollapsed, pParent ); } return bCollapsed; @@ -2281,7 +2281,7 @@ bool SvTreeListBox::Select( SvTreeListEntry* pEntry, bool bSelect ) if( bSelect ) { SelectHdl(); - CallEventListeners( VCLEVENT_LISTBOX_TREESELECT, pEntry); + CallEventListeners( VclEventId::ListboxTreeSelect, pEntry); } else DeselectHdl(); @@ -3730,7 +3730,7 @@ void SvTreeListBox::EnableCellFocus() pImpl->EnableCellFocus(); } -void SvTreeListBox::CallImplEventListeners(sal_uLong nEvent, void* pData) +void SvTreeListBox::CallImplEventListeners(VclEventId nEvent, void* pData) { CallEventListeners(nEvent, pData); } diff --git a/svtools/source/control/roadmap.cxx b/svtools/source/control/roadmap.cxx index db44584ab150..2d5fcbf7bdd0 100644 --- a/svtools/source/control/roadmap.cxx +++ b/svtools/source/control/roadmap.cxx @@ -515,7 +515,7 @@ Link<LinkParamNone*,void> ORoadmap::GetItemSelectHdl() const void ORoadmap::Select() { GetItemSelectHdl().Call( nullptr ); - CallEventListeners( VCLEVENT_ROADMAP_ITEMSELECTED ); + CallEventListeners( VclEventId::RoadmapItemSelected ); } void ORoadmap::GetFocus() diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx index 26cd89620ed8..357c70d3a017 100644 --- a/svtools/source/control/tabbar.cxx +++ b/svtools/source/control/tabbar.cxx @@ -1497,7 +1497,7 @@ void TabBar::DataChanged(const DataChangedEvent& rDCEvt) void TabBar::ImplSelect() { Select(); - CallEventListeners(VCLEVENT_TABBAR_PAGESELECTED, reinterpret_cast<void*>(sal::static_int_cast<sal_IntPtr>(mnCurPageId))); + CallEventListeners(VclEventId::TabbarPageSelected, reinterpret_cast<void*>(sal::static_int_cast<sal_IntPtr>(mnCurPageId))); } void TabBar::Select() @@ -1518,7 +1518,7 @@ void TabBar::ImplActivatePage() { ActivatePage(); - CallEventListeners(VCLEVENT_TABBAR_PAGEACTIVATED, reinterpret_cast<void*>(sal::static_int_cast<sal_IntPtr>(mnCurPageId))); + CallEventListeners(VclEventId::TabbarPageActivated, reinterpret_cast<void*>(sal::static_int_cast<sal_IntPtr>(mnCurPageId))); } void TabBar::ActivatePage() @@ -1528,7 +1528,7 @@ bool TabBar::ImplDeactivatePage() { bool bRet = DeactivatePage(); - CallEventListeners(VCLEVENT_TABBAR_PAGEDEACTIVATED, reinterpret_cast<void*>(sal::static_int_cast<sal_IntPtr>(mnCurPageId))); + CallEventListeners(VclEventId::TabbarPageDeactivated, reinterpret_cast<void*>(sal::static_int_cast<sal_IntPtr>(mnCurPageId))); return bRet; } @@ -1649,7 +1649,7 @@ void TabBar::InsertPage(sal_uInt16 nPageId, const OUString& rText, if (IsReallyVisible() && IsUpdateMode()) Invalidate(); - CallEventListeners(VCLEVENT_TABBAR_PAGEINSERTED, reinterpret_cast<void*>(sal::static_int_cast<sal_IntPtr>(nPageId))); + CallEventListeners(VclEventId::TabbarPageInserted, reinterpret_cast<void*>(sal::static_int_cast<sal_IntPtr>(nPageId))); } Color TabBar::GetTabBgColor(sal_uInt16 nPageId) const @@ -1708,7 +1708,7 @@ void TabBar::RemovePage(sal_uInt16 nPageId) if (IsReallyVisible() && IsUpdateMode()) Invalidate(); - CallEventListeners(VCLEVENT_TABBAR_PAGEREMOVED, reinterpret_cast<void*>(sal::static_int_cast<sal_IntPtr>(nPageId))); + CallEventListeners(VclEventId::TabbarPageRemoved, reinterpret_cast<void*>(sal::static_int_cast<sal_IntPtr>(nPageId))); } } @@ -1746,7 +1746,7 @@ void TabBar::MovePage(sal_uInt16 nPageId, sal_uInt16 nNewPos) if (IsReallyVisible() && IsUpdateMode()) Invalidate(); - CallEventListeners( VCLEVENT_TABBAR_PAGEMOVED, static_cast<void*>(&aPair) ); + CallEventListeners( VclEventId::TabbarPageMoved, static_cast<void*>(&aPair) ); } } @@ -1769,7 +1769,7 @@ void TabBar::Clear() if (IsReallyVisible() && IsUpdateMode()) Invalidate(); - CallEventListeners(VCLEVENT_TABBAR_PAGEREMOVED, reinterpret_cast<void*>(sal::static_int_cast<sal_IntPtr>(PAGE_NOT_FOUND))); + CallEventListeners(VclEventId::TabbarPageRemoved, reinterpret_cast<void*>(sal::static_int_cast<sal_IntPtr>(PAGE_NOT_FOUND))); } bool TabBar::IsPageEnabled(sal_uInt16 nPageId) const @@ -2219,7 +2219,7 @@ void TabBar::SetPageText(sal_uInt16 nPageId, const OUString& rText) if (IsReallyVisible() && IsUpdateMode()) Invalidate(); - CallEventListeners(VCLEVENT_TABBAR_PAGETEXTCHANGED, reinterpret_cast<void*>(sal::static_int_cast<sal_IntPtr>(nPageId))); + CallEventListeners(VclEventId::TabbarPageTextChanged, reinterpret_cast<void*>(sal::static_int_cast<sal_IntPtr>(nPageId))); } } diff --git a/svtools/source/control/toolbarmenuacc.cxx b/svtools/source/control/toolbarmenuacc.cxx index 2fda0afe2e7d..2a3e2759b82c 100644 --- a/svtools/source/control/toolbarmenuacc.cxx +++ b/svtools/source/control/toolbarmenuacc.cxx @@ -58,26 +58,26 @@ ToolbarMenuAcc::~ToolbarMenuAcc() IMPL_LINK( ToolbarMenuAcc, WindowEventListener, VclWindowEvent&, rEvent, void ) { - /* Ignore VCLEVENT_WINDOW_ENDPOPUPMODE, because the UNO accessibility wrapper + /* Ignore VclEventId::WindowEndPopupMode, because the UNO accessibility wrapper * might have been destroyed by the previous VCLEventListener (if no AT tool * is running), e.g. sub-toolbars in impress. */ - if ( !mpParent || (rEvent.GetId() == VCLEVENT_WINDOW_ENDPOPUPMODE) ) + if ( !mpParent || (rEvent.GetId() == VclEventId::WindowEndPopupMode) ) return; DBG_ASSERT( rEvent.GetWindow(), "Window???" ); - if( rEvent.GetWindow()->IsAccessibilityEventsSuppressed() && ( rEvent.GetId() != VCLEVENT_OBJECT_DYING ) ) + if( rEvent.GetWindow()->IsAccessibilityEventsSuppressed() && ( rEvent.GetId() != VclEventId::ObjectDying ) ) return; switch ( rEvent.GetId() ) { - case VCLEVENT_OBJECT_DYING: + case VclEventId::ObjectDying: { mpParent->mrMenu.RemoveEventListener( LINK( this, ToolbarMenuAcc, WindowEventListener ) ); mpParent = nullptr; } break; - case VCLEVENT_WINDOW_GETFOCUS: + case VclEventId::WindowGetFocus: { if( !mbIsFocused ) { @@ -86,7 +86,7 @@ IMPL_LINK( ToolbarMenuAcc, WindowEventListener, VclWindowEvent&, rEvent, void ) } } break; - case VCLEVENT_WINDOW_LOSEFOCUS: + case VclEventId::WindowLoseFocus: { if( mbIsFocused ) { diff --git a/svtools/source/inc/svimpbox.hxx b/svtools/source/inc/svimpbox.hxx index 4a892cf87c1a..f2ed5bb4880b 100644 --- a/svtools/source/inc/svimpbox.hxx +++ b/svtools/source/inc/svimpbox.hxx @@ -329,7 +329,7 @@ public: Rectangle GetClipRegionRect() const; bool HasHorScrollBar() const { return aHorSBar->IsVisible(); } void ShowFocusRect( const SvTreeListEntry* pEntry ); - void CallEventListeners( sal_uLong nEvent, void* pData = nullptr ); + void CallEventListeners( VclEventId nEvent, void* pData = nullptr ); /** Enables, that one cell of a tablistbox entry can be focused */ bool IsCellFocusEnabled() const { return bIsCellFocusEnabled; } diff --git a/svtools/source/misc/dialogcontrolling.cxx b/svtools/source/misc/dialogcontrolling.cxx index 11e6d50bfac6..8e1c15016da4 100644 --- a/svtools/source/misc/dialogcontrolling.cxx +++ b/svtools/source/misc/dialogcontrolling.cxx @@ -97,7 +97,7 @@ namespace svt { m_pImpl->aConcernedWindows.push_back( &_rWindow ); - VclWindowEvent aEvent( &_rWindow, 0, nullptr ); + VclWindowEvent aEvent( &_rWindow, VclEventId::NONE, nullptr ); impl_update( aEvent, _rWindow ); } diff --git a/svtools/source/table/tablecontrol.cxx b/svtools/source/table/tablecontrol.cxx index 5627b0ddd91c..a9604b058464 100644 --- a/svtools/source/table/tablecontrol.cxx +++ b/svtools/source/table/tablecontrol.cxx @@ -69,7 +69,7 @@ namespace svt { namespace table void TableControl::dispose() { - CallEventListeners( VCLEVENT_OBJECT_DYING ); + CallEventListeners( VclEventId::ObjectDying ); m_pImpl->setModel( PTableModel() ); m_pImpl->disposeAccessible(); @@ -648,7 +648,7 @@ namespace svt { namespace table void TableControl::Select() { - ImplCallEventListenersAndHandler( VCLEVENT_TABLEROW_SELECT, nullptr ); + ImplCallEventListenersAndHandler( VclEventId::TableRowSelect, nullptr ); if ( m_pImpl->isAccessibleAlive() ) { diff --git a/svtools/source/uno/genericunodialog.cxx b/svtools/source/uno/genericunodialog.cxx index 1a6fab51fd62..b7543b202a46 100644 --- a/svtools/source/uno/genericunodialog.cxx +++ b/svtools/source/uno/genericunodialog.cxx @@ -312,7 +312,7 @@ void OGenericUnoDialog::destroyDialog() IMPL_LINK( OGenericUnoDialog, OnDialogDying, VclWindowEvent&, _rEvent, void ) { OSL_ENSURE( _rEvent.GetWindow() == m_pDialog, "OGenericUnoDialog::OnDialogDying: where does this come from?" ); - if ( _rEvent.GetId() == VCLEVENT_OBJECT_DYING ) + if ( _rEvent.GetId() == VclEventId::ObjectDying ) m_pDialog = nullptr; } diff --git a/svtools/source/uno/popupwindowcontroller.cxx b/svtools/source/uno/popupwindowcontroller.cxx index bffb118e9e22..9229f09bf040 100644 --- a/svtools/source/uno/popupwindowcontroller.cxx +++ b/svtools/source/uno/popupwindowcontroller.cxx @@ -89,7 +89,7 @@ IMPL_LINK( PopupWindowControllerImpl, WindowEventListener, VclWindowEvent&, rWin { switch( rWindowEvent.GetId() ) { - case VCLEVENT_WINDOW_ENDPOPUPMODE: + case VclEventId::WindowEndPopupMode: { EndPopupModeData* pData = static_cast< EndPopupModeData* >( rWindowEvent.GetData() ); if( pData && pData->mbTearoff ) @@ -106,7 +106,7 @@ IMPL_LINK( PopupWindowControllerImpl, WindowEventListener, VclWindowEvent&, rWin SetPopupWindow(nullptr,nullptr); break; } - case VCLEVENT_WINDOW_PREPARETOGGLEFLOATING: + case VclEventId::WindowPrepareToggleFloating: { if ( mpFloatingWindow && rWindowEvent.GetWindow() == mpFloatingWindow.get() ) { @@ -115,33 +115,34 @@ IMPL_LINK( PopupWindowControllerImpl, WindowEventListener, VclWindowEvent&, rWin } break; } - case VCLEVENT_WINDOW_CLOSE: + case VclEventId::WindowClose: { SetPopupWindow(nullptr,nullptr); SetFloatingWindow(); break; } - case VCLEVENT_WINDOW_SHOW: + case VclEventId::WindowShow: { if( mpPopupWindow ) { if( mpToolBox ) - mpToolBox->CallEventListeners( VCLEVENT_DROPDOWN_OPEN, static_cast<void*>(mpPopupWindow) ); - mpPopupWindow->CallEventListeners( VCLEVENT_WINDOW_GETFOCUS ); + mpToolBox->CallEventListeners( VclEventId::DropdownOpen, static_cast<void*>(mpPopupWindow) ); + mpPopupWindow->CallEventListeners( VclEventId::WindowGetFocus ); break; } break; } - case VCLEVENT_WINDOW_HIDE: + case VclEventId::WindowHide: { if( mpPopupWindow ) { - mpPopupWindow->CallEventListeners( VCLEVENT_WINDOW_LOSEFOCUS ); + mpPopupWindow->CallEventListeners( VclEventId::WindowLoseFocus ); if( mpToolBox ) - mpToolBox->CallEventListeners( VCLEVENT_DROPDOWN_CLOSE, static_cast<void*>(mpPopupWindow) ); + mpToolBox->CallEventListeners( VclEventId::DropdownClose, static_cast<void*>(mpPopupWindow) ); } break; } + default: break; } } diff --git a/svtools/source/uno/svtxgridcontrol.cxx b/svtools/source/uno/svtxgridcontrol.cxx index 79dee627d540..07a840655704 100644 --- a/svtools/source/uno/svtxgridcontrol.cxx +++ b/svtools/source/uno/svtxgridcontrol.cxx @@ -783,7 +783,7 @@ void SVTXGridControl::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent bool handled = false; switch ( rVclWindowEvent.GetId() ) { - case VCLEVENT_TABLEROW_SELECT: + case VclEventId::TableRowSelect: { if ( m_aSelectionListeners.getLength() ) ImplCallItemListeners(); @@ -791,7 +791,7 @@ void SVTXGridControl::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent } break; - case VCLEVENT_CONTROL_GETFOCUS: + case VclEventId::ControlGetFocus: { // TODO: this doesn't belong here. It belongs into the TableControl/_Impl, so A11Y also // works when the control is used outside the UNO context @@ -819,7 +819,7 @@ void SVTXGridControl::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent } break; - case VCLEVENT_CONTROL_LOSEFOCUS: + case VclEventId::ControlLoseFocus: { // TODO: this doesn't belong here. It belongs into the TableControl/_Impl, so A11Y also // works when the control is used outside the UNO context @@ -841,6 +841,8 @@ void SVTXGridControl::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent } } break; + + default: break; } if ( !handled ) diff --git a/svtools/source/uno/unoiface.cxx b/svtools/source/uno/unoiface.cxx index ea8324c081fc..e3a362070ee2 100644 --- a/svtools/source/uno/unoiface.cxx +++ b/svtools/source/uno/unoiface.cxx @@ -391,7 +391,7 @@ void VCLXMultiLineEdit::ProcessWindowEvent( const VclWindowEvent& rVclWindowEven { switch ( rVclWindowEvent.GetId() ) { - case VCLEVENT_EDIT_MODIFY: + case VclEventId::EditModify: { if ( maTextListeners.getLength() ) { @@ -1399,7 +1399,7 @@ void SVTXRoadmap::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { switch ( rVclWindowEvent.GetId() ) { - case VCLEVENT_ROADMAP_ITEMSELECTED: + case VclEventId::RoadmapItemSelected: { SolarMutexGuard aGuard; VclPtr<::svt::ORoadmap> pField = GetAs< svt::ORoadmap >(); diff --git a/svx/source/accessibility/AccessibleFrameSelector.cxx b/svx/source/accessibility/AccessibleFrameSelector.cxx index 26ae123968d0..c7c9af11b270 100644 --- a/svx/source/accessibility/AccessibleFrameSelector.cxx +++ b/svx/source/accessibility/AccessibleFrameSelector.cxx @@ -483,12 +483,12 @@ IMPL_LINK( AccFrameSelector, WindowEventListener, VclWindowEvent&, rEvent, void { vcl::Window* pWindow = rEvent.GetWindow(); DBG_ASSERT( pWindow, "AccFrameSelector::WindowEventListener: no window!" ); - if ( pWindow->IsAccessibilityEventsSuppressed() && ( rEvent.GetId() != VCLEVENT_OBJECT_DYING ) ) + if ( pWindow->IsAccessibilityEventsSuppressed() && ( rEvent.GetId() != VclEventId::ObjectDying ) ) return; switch ( rEvent.GetId() ) { - case VCLEVENT_WINDOW_GETFOCUS: + case VclEventId::WindowGetFocus: { if ( meBorder == FrameBorderType::NONE ) { @@ -498,7 +498,7 @@ IMPL_LINK( AccFrameSelector, WindowEventListener, VclWindowEvent&, rEvent, void } } break; - case VCLEVENT_WINDOW_LOSEFOCUS: + case VclEventId::WindowLoseFocus: { if ( meBorder == FrameBorderType::NONE ) { diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index 63c6024bdda9..fc59e76fbb95 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -3397,23 +3397,23 @@ void FmXGridCell::onFocusLost( const awt::FocusEvent& _rEvent ) } -void FmXGridCell::onWindowEvent( const sal_uIntPtr _nEventId, const vcl::Window& _rWindow, const void* _pEventData ) +void FmXGridCell::onWindowEvent( const VclEventId _nEventId, const vcl::Window& _rWindow, const void* _pEventData ) { switch ( _nEventId ) { - case VCLEVENT_CONTROL_GETFOCUS: - case VCLEVENT_WINDOW_GETFOCUS: - case VCLEVENT_CONTROL_LOSEFOCUS: - case VCLEVENT_WINDOW_LOSEFOCUS: + case VclEventId::ControlGetFocus: + case VclEventId::WindowGetFocus: + case VclEventId::ControlLoseFocus: + case VclEventId::WindowLoseFocus: { if ( ( _rWindow.IsCompoundControl() - && ( _nEventId == VCLEVENT_CONTROL_GETFOCUS - || _nEventId == VCLEVENT_CONTROL_LOSEFOCUS + && ( _nEventId == VclEventId::ControlGetFocus + || _nEventId == VclEventId::ControlLoseFocus ) ) || ( !_rWindow.IsCompoundControl() - && ( _nEventId == VCLEVENT_WINDOW_GETFOCUS - || _nEventId == VCLEVENT_WINDOW_LOSEFOCUS + && ( _nEventId == VclEventId::WindowGetFocus + || _nEventId == VclEventId::WindowLoseFocus ) ) ) @@ -3421,7 +3421,7 @@ void FmXGridCell::onWindowEvent( const sal_uIntPtr _nEventId, const vcl::Window& if ( !m_aFocusListeners.getLength() ) break; - bool bFocusGained = ( _nEventId == VCLEVENT_CONTROL_GETFOCUS ) || ( _nEventId == VCLEVENT_WINDOW_GETFOCUS ); + bool bFocusGained = ( _nEventId == VclEventId::ControlGetFocus ) || ( _nEventId == VclEventId::WindowGetFocus ); awt::FocusEvent aEvent; aEvent.Source = *this; @@ -3435,19 +3435,19 @@ void FmXGridCell::onWindowEvent( const sal_uIntPtr _nEventId, const vcl::Window& } } break; - case VCLEVENT_WINDOW_MOUSEBUTTONDOWN: - case VCLEVENT_WINDOW_MOUSEBUTTONUP: + case VclEventId::WindowMouseButtonDown: + case VclEventId::WindowMouseButtonUp: { if ( !m_aMouseListeners.getLength() ) break; - const bool bButtonDown = ( _nEventId == VCLEVENT_WINDOW_MOUSEBUTTONDOWN ); + const bool bButtonDown = ( _nEventId == VclEventId::WindowMouseButtonDown ); awt::MouseEvent aEvent( VCLUnoHelper::createMouseEvent( *static_cast< const ::MouseEvent* >( _pEventData ), *this ) ); m_aMouseListeners.notifyEach( bButtonDown ? &awt::XMouseListener::mousePressed : &awt::XMouseListener::mouseReleased, aEvent ); } break; - case VCLEVENT_WINDOW_MOUSEMOVE: + case VclEventId::WindowMouseMove: { const MouseEvent& rMouseEvent = *static_cast< const ::MouseEvent* >( _pEventData ); if ( rMouseEvent.IsEnterWindow() || rMouseEvent.IsLeaveWindow() ) @@ -3470,17 +3470,18 @@ void FmXGridCell::onWindowEvent( const sal_uIntPtr _nEventId, const vcl::Window& } } break; - case VCLEVENT_WINDOW_KEYINPUT: - case VCLEVENT_WINDOW_KEYUP: + case VclEventId::WindowKeyInput: + case VclEventId::WindowKeyUp: { if ( !m_aKeyListeners.getLength() ) break; - const bool bKeyPressed = ( _nEventId == VCLEVENT_WINDOW_KEYINPUT ); + const bool bKeyPressed = ( _nEventId == VclEventId::WindowKeyInput ); awt::KeyEvent aEvent( VCLUnoHelper::createKeyEvent( *static_cast< const ::KeyEvent* >( _pEventData ), *this ) ); m_aKeyListeners.notifyEach( bKeyPressed ? &awt::XKeyListener::keyPressed: &awt::XKeyListener::keyReleased, aEvent ); } break; + default: break; } } @@ -3802,16 +3803,17 @@ void FmXEditCell::onFocusLost( const awt::FocusEvent& _rEvent ) } -void FmXEditCell::onWindowEvent( const sal_uIntPtr _nEventId, const vcl::Window& _rWindow, const void* _pEventData ) +void FmXEditCell::onWindowEvent( const VclEventId _nEventId, const vcl::Window& _rWindow, const void* _pEventData ) { switch ( _nEventId ) { - case VCLEVENT_EDIT_MODIFY: + case VclEventId::EditModify: { if ( m_pEditImplementation && m_aTextListeners.getLength() ) onTextChanged(); return; } + default: break; } FmXTextCell::onWindowEvent( _nEventId, _rWindow, _pEventData ); @@ -3955,11 +3957,11 @@ vcl::Window* FmXCheckBoxCell::getEventWindow() const } -void FmXCheckBoxCell::onWindowEvent( const sal_uIntPtr _nEventId, const vcl::Window& _rWindow, const void* _pEventData ) +void FmXCheckBoxCell::onWindowEvent( const VclEventId _nEventId, const vcl::Window& _rWindow, const void* _pEventData ) { switch ( _nEventId ) { - case VCLEVENT_CHECKBOX_TOGGLE: + case VclEventId::CheckboxToggle: { // check boxes are to be committed immediately (this holds for ordinary check box controls in // documents, and this must hold for check boxes in grid columns, too @@ -4287,10 +4289,10 @@ void SAL_CALL FmXListBoxCell::makeVisible(sal_Int16 nEntry) throw( RuntimeExcept } -void FmXListBoxCell::onWindowEvent( const sal_uIntPtr _nEventId, const vcl::Window& _rWindow, const void* _pEventData ) +void FmXListBoxCell::onWindowEvent( const VclEventId _nEventId, const vcl::Window& _rWindow, const void* _pEventData ) { if ( ( &_rWindow == m_pBox ) - && ( _nEventId == VCLEVENT_LISTBOX_SELECT ) + && ( _nEventId == VclEventId::ListboxSelect ) ) { OnDoubleClick( *m_pBox ); @@ -4488,12 +4490,12 @@ void SAL_CALL FmXComboBoxCell::setDropDownLineCount(sal_Int16 nLines) throw( Run } -void FmXComboBoxCell::onWindowEvent( const sal_uIntPtr _nEventId, const vcl::Window& _rWindow, const void* _pEventData ) +void FmXComboBoxCell::onWindowEvent( const VclEventId _nEventId, const vcl::Window& _rWindow, const void* _pEventData ) { switch ( _nEventId ) { - case VCLEVENT_COMBOBOX_SELECT: + case VclEventId::ComboboxSelect: { awt::ItemEvent aEvent; aEvent.Source = *this; diff --git a/svx/source/form/databaselocationinput.cxx b/svx/source/form/databaselocationinput.cxx index 64419352961e..be1665d8eebd 100644 --- a/svx/source/form/databaselocationinput.cxx +++ b/svx/source/form/databaselocationinput.cxx @@ -198,14 +198,14 @@ namespace svx IMPL_LINK( DatabaseLocationInputController_Impl, OnControlAction, VclWindowEvent&, _rEvent, void ) { if ( ( _rEvent.GetWindow() == &m_rBrowseButton ) - && ( _rEvent.GetId() == VCLEVENT_BUTTON_CLICK ) + && ( _rEvent.GetId() == VclEventId::ButtonClick ) ) { impl_onBrowseButtonClicked(); } if ( ( _rEvent.GetWindow() == &m_rLocationInput ) - && ( _rEvent.GetId() == VCLEVENT_EDIT_MODIFY ) + && ( _rEvent.GetId() == VclEventId::EditModify ) ) { m_bNeedExistenceCheck = true; diff --git a/svx/source/inc/gridcell.hxx b/svx/source/inc/gridcell.hxx index a6150aad4148..13d0a8aba8ed 100644 --- a/svx/source/inc/gridcell.hxx +++ b/svx/source/inc/gridcell.hxx @@ -793,7 +793,7 @@ public: protected: virtual vcl::Window* getEventWindow() const; - virtual void onWindowEvent( const sal_uLong _nEventId, const vcl::Window& _rWindow, const void* _pEventData ); + virtual void onWindowEvent( const VclEventId _nEventId, const vcl::Window& _rWindow, const void* _pEventData ); // default implementations call our focus listeners, don't forget to call them if you override this virtual void onFocusGained( const css::awt::FocusEvent& _rEvent ); @@ -907,7 +907,7 @@ public: virtual void SAL_CALL removeChangeListener( const css::uno::Reference< css::form::XChangeListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; protected: - virtual void onWindowEvent( const sal_uLong _nEventId, const vcl::Window& _rWindow, const void* _pEventData ) override; + virtual void onWindowEvent( const VclEventId _nEventId, const vcl::Window& _rWindow, const void* _pEventData ) override; virtual void onFocusGained( const css::awt::FocusEvent& _rEvent ) override; virtual void onFocusLost( const css::awt::FocusEvent& _rEvent ) override; @@ -959,7 +959,7 @@ public: protected: virtual vcl::Window* getEventWindow() const override; - virtual void onWindowEvent( const sal_uLong _nEventId, const vcl::Window& _rWindow, const void* _pEventData ) override; + virtual void onWindowEvent( const VclEventId _nEventId, const vcl::Window& _rWindow, const void* _pEventData ) override; }; @@ -1011,7 +1011,7 @@ public: virtual void SAL_CALL SAL_CALL makeVisible(sal_Int16 nEntry) throw(css::uno::RuntimeException, std::exception) override; protected: - virtual void onWindowEvent( const sal_uLong _nEventId, const vcl::Window& _rWindow, const void* _pEventData ) override; + virtual void onWindowEvent( const VclEventId _nEventId, const vcl::Window& _rWindow, const void* _pEventData ) override; DECL_LINK( OnDoubleClick, ListBox&, void ); }; @@ -1056,7 +1056,7 @@ public: virtual void SAL_CALL setDropDownLineCount( ::sal_Int16 Lines ) throw (css::uno::RuntimeException, std::exception) override; protected: - virtual void onWindowEvent( const sal_uLong _nEventId, const vcl::Window& _rWindow, const void* _pEventData ) override; + virtual void onWindowEvent( const VclEventId _nEventId, const vcl::Window& _rWindow, const void* _pEventData ) override; }; diff --git a/svx/source/svdraw/sdrpaintwindow.cxx b/svx/source/svdraw/sdrpaintwindow.cxx index 46897dfc1b9f..a83954a6fef1 100644 --- a/svx/source/svdraw/sdrpaintwindow.cxx +++ b/svx/source/svdraw/sdrpaintwindow.cxx @@ -45,7 +45,7 @@ public: IMPL_LINK(CandidateMgr, WindowEventListener, VclWindowEvent&, rEvent, void) { vcl::Window* pWindow = rEvent.GetWindow(); - if (rEvent.GetId() == VCLEVENT_OBJECT_DYING) + if (rEvent.GetId() == VclEventId::ObjectDying) { m_aDeletedCandidates.insert(pWindow); } diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index d2252e64a3e1..f60dc31e588a 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -826,7 +826,7 @@ void SvxStyleBox_Impl::UserDraw( const UserDrawEvent& rUDEvt ) IMPL_LINK(SvxStyleBox_Impl, CalcOptimalExtraUserWidth, VclWindowEvent&, event, void) { // perform the calculation only when we are opening the dropdown - if (event.GetId() != VCLEVENT_DROPDOWN_PRE_OPEN) + if (event.GetId() != VclEventId::DropdownPreOpen) return; long nMaxNormalFontWidth = 0; @@ -999,7 +999,7 @@ void SvxFontNameBox_Impl::FillList() IMPL_LINK( SvxFontNameBox_Impl, CheckAndMarkUnknownFont, VclWindowEvent&, event, void ) { - if( event.GetId() != VCLEVENT_EDIT_MODIFY ) + if( event.GetId() != VclEventId::EditModify ) return; OUString fontname = GetSubEdit()->GetText(); lcl_GetDocFontList( &pFontList, this ); diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx index 93c17f08150d..b64c39a9bb52 100644 --- a/sw/source/core/access/accdoc.cxx +++ b/sw/source/core/access/accdoc.cxx @@ -389,7 +389,7 @@ IMPL_LINK( SwAccessibleDocument, WindowChildEventListener, VclWindowEvent&, rEve OSL_ENSURE( rEvent.GetWindow(), "Window???" ); switch ( rEvent.GetId() ) { - case VCLEVENT_WINDOW_SHOW: // send create on show for direct accessible children + case VclEventId::WindowShow: // send create on show for direct accessible children { vcl::Window* pChildWin = static_cast< vcl::Window* >( rEvent.GetData() ); if( pChildWin && AccessibleRole::EMBEDDED_OBJECT == pChildWin->GetAccessibleRole() ) @@ -398,7 +398,7 @@ IMPL_LINK( SwAccessibleDocument, WindowChildEventListener, VclWindowEvent&, rEve } } break; - case VCLEVENT_WINDOW_HIDE: // send destroy on hide for direct accessible children + case VclEventId::WindowHide: // send destroy on hide for direct accessible children { vcl::Window* pChildWin = static_cast< vcl::Window* >( rEvent.GetData() ); if( pChildWin && AccessibleRole::EMBEDDED_OBJECT == pChildWin->GetAccessibleRole() ) @@ -407,7 +407,7 @@ IMPL_LINK( SwAccessibleDocument, WindowChildEventListener, VclWindowEvent&, rEve } } break; - case VCLEVENT_OBJECT_DYING: // send destroy on hide for direct accessible children + case VclEventId::ObjectDying: // send destroy on hide for direct accessible children { vcl::Window* pChildWin = rEvent.GetWindow(); if( pChildWin && AccessibleRole::EMBEDDED_OBJECT == pChildWin->GetAccessibleRole() ) @@ -416,6 +416,7 @@ IMPL_LINK( SwAccessibleDocument, WindowChildEventListener, VclWindowEvent&, rEve } } break; + default: break; } } diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index 722ec47ca64c..15ee51f64e8b 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -1342,7 +1342,7 @@ IMPL_LINK( SwEditRegionDlg, DlgClosedHdl, sfx2::FileDialogHelper *, _pFileDlg, v IMPL_LINK( SwEditRegionDlg, SubRegionEventHdl, VclWindowEvent&, rEvent, void ) { - if( !m_bSubRegionsFilled && rEvent.GetId() == VCLEVENT_DROPDOWN_PRE_OPEN ) + if( !m_bSubRegionsFilled && rEvent.GetId() == VclEventId::DropdownPreOpen ) { //if necessary fill the names bookmarks/sections/tables now diff --git a/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx b/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx index ffc62edf5049..5fe11aacab67 100644 --- a/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx +++ b/sw/source/uibase/docvw/SidebarTxtControlAcc.cxx @@ -239,23 +239,24 @@ void SidebarTextControlAccessibleContext::ProcessWindowEvent( const VclWindowEve { switch ( rVclWindowEvent.GetId() ) { - case VCLEVENT_OBJECT_DYING: + case VclEventId::ObjectDying: { defunc(); } break; - case VCLEVENT_WINDOW_GETFOCUS: - case VCLEVENT_CONTROL_GETFOCUS: + case VclEventId::WindowGetFocus: + case VclEventId::ControlGetFocus: { mpAccessibleTextHelper->SetFocus(); } break; - case VCLEVENT_WINDOW_LOSEFOCUS: - case VCLEVENT_CONTROL_LOSEFOCUS: + case VclEventId::WindowLoseFocus: + case VclEventId::ControlLoseFocus: { mpAccessibleTextHelper->SetFocus( false ); } break; + default: break; } } diff --git a/sw/source/uibase/docvw/SidebarWin.cxx b/sw/source/uibase/docvw/SidebarWin.cxx index a1a8224c8342..6f739ccd4157 100644 --- a/sw/source/uibase/docvw/SidebarWin.cxx +++ b/sw/source/uibase/docvw/SidebarWin.cxx @@ -1359,7 +1359,7 @@ void SwSidebarWin::SwitchToPostIt(sal_uInt16 aDirection) IMPL_LINK( SwSidebarWin, WindowEventListener, VclWindowEvent&, rEvent, void ) { - if ( rEvent.GetId() == VCLEVENT_WINDOW_MOUSEMOVE ) + if ( rEvent.GetId() == VclEventId::WindowMouseMove ) { MouseEvent* pMouseEvt = static_cast<MouseEvent*>(rEvent.GetData()); if ( pMouseEvt->IsEnterWindow() ) @@ -1384,7 +1384,7 @@ IMPL_LINK( SwSidebarWin, WindowEventListener, VclWindowEvent&, rEvent, void ) } } } - else if ( rEvent.GetId() == VCLEVENT_WINDOW_ACTIVATE && + else if ( rEvent.GetId() == VclEventId::WindowActivate && rEvent.GetWindow() == mpSidebarTextControl ) { const bool bLockView = mrView.GetWrtShell().IsViewLocked(); diff --git a/sw/source/uibase/uiview/viewmdi.cxx b/sw/source/uibase/uiview/viewmdi.cxx index 27985eb84a94..eef998e77d0b 100644 --- a/sw/source/uibase/uiview/viewmdi.cxx +++ b/sw/source/uibase/uiview/viewmdi.cxx @@ -265,18 +265,19 @@ IMPL_LINK( SwView, WindowChildEventListener, VclWindowEvent&, rEvent, void ) switch ( rEvent.GetId() ) { - case VCLEVENT_WINDOW_HIDE: + case VclEventId::WindowHide: if( pChildWin == m_pHScrollbar ) ShowHScrollbar( false ); else if( pChildWin == m_pVScrollbar ) ShowVScrollbar( false ); break; - case VCLEVENT_WINDOW_SHOW: + case VclEventId::WindowShow: if( pChildWin == m_pHScrollbar ) ShowHScrollbar( true ); else if( pChildWin == m_pVScrollbar ) ShowVScrollbar( true ); break; + default: break; } } diff --git a/toolkit/source/awt/animatedimagespeer.cxx b/toolkit/source/awt/animatedimagespeer.cxx index 3dae4a6bfad5..f0fd2cf0ec50 100644 --- a/toolkit/source/awt/animatedimagespeer.cxx +++ b/toolkit/source/awt/animatedimagespeer.cxx @@ -413,11 +413,9 @@ namespace toolkit void AnimatedImagesPeer::ProcessWindowEvent( const VclWindowEvent& i_windowEvent ) { - switch ( i_windowEvent.GetId() ) + if ( i_windowEvent.GetId() == VclEventId::WindowResize ) { - case VCLEVENT_WINDOW_RESIZE: lcl_updateImageList_nothrow( *m_xData ); - break; } AnimatedImagesPeer_Base::ProcessWindowEvent( i_windowEvent ); diff --git a/toolkit/source/awt/stylesettings.cxx b/toolkit/source/awt/stylesettings.cxx index 86ab25ce80bb..1ed728c4b485 100644 --- a/toolkit/source/awt/stylesettings.cxx +++ b/toolkit/source/awt/stylesettings.cxx @@ -62,7 +62,7 @@ namespace toolkit IMPL_LINK( WindowStyleSettings_Data, OnWindowEvent, VclWindowEvent&, rEvent, void ) { - if ( rEvent.GetId() != VCLEVENT_WINDOW_DATACHANGED ) + if ( rEvent.GetId() != VclEventId::WindowDataChanged ) return; const DataChangedEvent* pDataChangedEvent = static_cast< const DataChangedEvent* >( rEvent.GetData() ); if ( !pDataChangedEvent || ( pDataChangedEvent->GetType() != DataChangedEventType::SETTINGS ) ) diff --git a/toolkit/source/awt/vclxaccessiblecomponent.cxx b/toolkit/source/awt/vclxaccessiblecomponent.cxx index a02db4444e1e..9b6480039d92 100644 --- a/toolkit/source/awt/vclxaccessiblecomponent.cxx +++ b/toolkit/source/awt/vclxaccessiblecomponent.cxx @@ -113,14 +113,14 @@ uno::Sequence< OUString > VCLXAccessibleComponent::getSupportedServiceNames() th IMPL_LINK( VCLXAccessibleComponent, WindowEventListener, VclWindowEvent&, rEvent, void ) { - /* Ignore VCLEVENT_WINDOW_ENDPOPUPMODE, because the UNO accessibility wrapper + /* Ignore VclEventId::WindowEndPopupMode, because the UNO accessibility wrapper * might have been destroyed by the previous VCLEventListener (if no AT tool * is running), e.g. sub-toolbars in impress. */ - if ( m_xVCLXWindow.is() /* #122218# */ && (rEvent.GetId() != VCLEVENT_WINDOW_ENDPOPUPMODE) ) + if ( m_xVCLXWindow.is() /* #122218# */ && (rEvent.GetId() != VclEventId::WindowEndPopupMode) ) { DBG_ASSERT( rEvent.GetWindow(), "Window???" ); - if( !rEvent.GetWindow()->IsAccessibilityEventsSuppressed() || ( rEvent.GetId() == VCLEVENT_OBJECT_DYING ) ) + if( !rEvent.GetWindow()->IsAccessibilityEventsSuppressed() || ( rEvent.GetId() == VclEventId::ObjectDying ) ) { ProcessWindowEvent( rEvent ); } @@ -150,7 +150,7 @@ uno::Reference< accessibility::XAccessible > VCLXAccessibleComponent::GetChildAc // MT: Change this later, normally a show/hide event shouldn't have the vcl::Window* in pData. vcl::Window* pChildWindow = static_cast<vcl::Window *>(rVclWindowEvent.GetData()); if( pChildWindow && GetWindow() == pChildWindow->GetAccessibleParentWindow() ) - return pChildWindow->GetAccessible( rVclWindowEvent.GetId() == VCLEVENT_WINDOW_SHOW ); + return pChildWindow->GetAccessible( rVclWindowEvent.GetId() == VclEventId::WindowShow ); else return uno::Reference< accessibility::XAccessible > (); } @@ -162,7 +162,7 @@ void VCLXAccessibleComponent::ProcessWindowChildEvent( const VclWindowEvent& rVc switch ( rVclWindowEvent.GetId() ) { - case VCLEVENT_WINDOW_SHOW: // send create on show for direct accessible children + case VclEventId::WindowShow: // send create on show for direct accessible children { xAcc = GetChildAccessible( rVclWindowEvent ); if( xAcc.is() ) @@ -172,7 +172,7 @@ void VCLXAccessibleComponent::ProcessWindowChildEvent( const VclWindowEvent& rVc } } break; - case VCLEVENT_WINDOW_HIDE: // send destroy on hide for direct accessible children + case VclEventId::WindowHide: // send destroy on hide for direct accessible children { xAcc = GetChildAccessible( rVclWindowEvent ); if( xAcc.is() ) @@ -182,6 +182,7 @@ void VCLXAccessibleComponent::ProcessWindowChildEvent( const VclWindowEvent& rVc } } break; + default: break; } } @@ -194,16 +195,16 @@ void VCLXAccessibleComponent::ProcessWindowEvent( const VclWindowEvent& rVclWind switch ( rVclWindowEvent.GetId() ) { - case VCLEVENT_OBJECT_DYING: + case VclEventId::ObjectDying: { DisconnectEvents(); m_xVCLXWindow.clear(); } break; - case VCLEVENT_WINDOW_CHILDDESTROYED: + case VclEventId::WindowChildDestroyed: { vcl::Window* pWindow = static_cast<vcl::Window*>(rVclWindowEvent.GetData()); - DBG_ASSERT( pWindow, "VCLEVENT_WINDOW_CHILDDESTROYED - Window=?" ); + DBG_ASSERT( pWindow, "VclEventId::WindowChildDestroyed - Window=?" ); if ( pWindow->GetAccessible( false ).is() ) { aOldValue <<= pWindow->GetAccessible( false ); @@ -211,7 +212,7 @@ void VCLXAccessibleComponent::ProcessWindowEvent( const VclWindowEvent& rVclWind } } break; - case VCLEVENT_WINDOW_ACTIVATE: + case VclEventId::WindowActivate: { // avoid notification if a child frame is already active // only one frame may be active at a given time @@ -225,7 +226,7 @@ void VCLXAccessibleComponent::ProcessWindowEvent( const VclWindowEvent& rVclWind } } break; - case VCLEVENT_WINDOW_DEACTIVATE: + case VclEventId::WindowDeactivate: { if ( getAccessibleRole() == accessibility::AccessibleRole::FRAME || getAccessibleRole() == accessibility::AccessibleRole::ALERT || @@ -236,11 +237,11 @@ void VCLXAccessibleComponent::ProcessWindowEvent( const VclWindowEvent& rVclWind } } break; - case VCLEVENT_WINDOW_GETFOCUS: - case VCLEVENT_CONTROL_GETFOCUS: + case VclEventId::WindowGetFocus: + case VclEventId::ControlGetFocus: { - if( (pAccWindow->IsCompoundControl() && rVclWindowEvent.GetId() == VCLEVENT_CONTROL_GETFOCUS) || - (!pAccWindow->IsCompoundControl() && rVclWindowEvent.GetId() == VCLEVENT_WINDOW_GETFOCUS) ) + if( (pAccWindow->IsCompoundControl() && rVclWindowEvent.GetId() == VclEventId::ControlGetFocus) || + (!pAccWindow->IsCompoundControl() && rVclWindowEvent.GetId() == VclEventId::WindowGetFocus) ) { // if multiple listeners were registered it is possible that the // focus was changed during event processing (eg SfxTopWindow ) @@ -254,18 +255,18 @@ void VCLXAccessibleComponent::ProcessWindowEvent( const VclWindowEvent& rVclWind } } break; - case VCLEVENT_WINDOW_LOSEFOCUS: - case VCLEVENT_CONTROL_LOSEFOCUS: + case VclEventId::WindowLoseFocus: + case VclEventId::ControlLoseFocus: { - if( (pAccWindow->IsCompoundControl() && rVclWindowEvent.GetId() == VCLEVENT_CONTROL_LOSEFOCUS) || - (!pAccWindow->IsCompoundControl() && rVclWindowEvent.GetId() == VCLEVENT_WINDOW_LOSEFOCUS) ) + if( (pAccWindow->IsCompoundControl() && rVclWindowEvent.GetId() == VclEventId::ControlLoseFocus) || + (!pAccWindow->IsCompoundControl() && rVclWindowEvent.GetId() == VclEventId::WindowLoseFocus) ) { aOldValue <<= accessibility::AccessibleStateType::FOCUSED; NotifyAccessibleEvent( accessibility::AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue ); } } break; - case VCLEVENT_WINDOW_FRAMETITLECHANGED: + case VclEventId::WindowFrameTitleChanged: { OUString aOldName( *static_cast<OUString*>(rVclWindowEvent.GetData()) ); OUString aNewName( getAccessibleName() ); @@ -274,7 +275,7 @@ void VCLXAccessibleComponent::ProcessWindowEvent( const VclWindowEvent& rVclWind NotifyAccessibleEvent( accessibility::AccessibleEventId::NAME_CHANGED, aOldValue, aNewValue ); } break; - case VCLEVENT_WINDOW_ENABLED: + case VclEventId::WindowEnabled: { aNewValue <<= accessibility::AccessibleStateType::ENABLED; NotifyAccessibleEvent( accessibility::AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue ); @@ -282,7 +283,7 @@ void VCLXAccessibleComponent::ProcessWindowEvent( const VclWindowEvent& rVclWind NotifyAccessibleEvent( accessibility::AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue ); } break; - case VCLEVENT_WINDOW_DISABLED: + case VclEventId::WindowDisabled: { aOldValue <<= accessibility::AccessibleStateType::SENSITIVE; NotifyAccessibleEvent( accessibility::AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue ); @@ -291,13 +292,13 @@ void VCLXAccessibleComponent::ProcessWindowEvent( const VclWindowEvent& rVclWind NotifyAccessibleEvent( accessibility::AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue ); } break; - case VCLEVENT_WINDOW_MOVE: - case VCLEVENT_WINDOW_RESIZE: + case VclEventId::WindowMove: + case VclEventId::WindowResize: { NotifyAccessibleEvent( accessibility::AccessibleEventId::BOUNDRECT_CHANGED, aOldValue, aNewValue ); } break; - case VCLEVENT_WINDOW_MENUBARADDED: + case VclEventId::WindowMenubarAdded: { MenuBar* pMenuBar = static_cast<MenuBar*>(rVclWindowEvent.GetData()); if ( pMenuBar ) @@ -311,7 +312,7 @@ void VCLXAccessibleComponent::ProcessWindowEvent( const VclWindowEvent& rVclWind } } break; - case VCLEVENT_WINDOW_MENUBARREMOVED: + case VclEventId::WindowMenubarRemoved: { MenuBar* pMenuBar = static_cast<MenuBar*>(rVclWindowEvent.GetData()); if ( pMenuBar ) @@ -325,13 +326,13 @@ void VCLXAccessibleComponent::ProcessWindowEvent( const VclWindowEvent& rVclWind } } break; - case VCLEVENT_WINDOW_MINIMIZE: + case VclEventId::WindowMinimize: { aNewValue <<= accessibility::AccessibleStateType::ICONIFIED; NotifyAccessibleEvent( accessibility::AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue ); } break; - case VCLEVENT_WINDOW_NORMALIZE: + case VclEventId::WindowNormalize: { aOldValue <<= accessibility::AccessibleStateType::ICONIFIED; NotifyAccessibleEvent( accessibility::AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue ); diff --git a/toolkit/source/awt/vclxmenu.cxx b/toolkit/source/awt/vclxmenu.cxx index 45252bc718e4..aafa5b9c7529 100644 --- a/toolkit/source/awt/vclxmenu.cxx +++ b/toolkit/source/awt/vclxmenu.cxx @@ -87,7 +87,7 @@ IMPL_LINK( VCLXMenu, MenuEventListener, VclMenuEvent&, rMenuEvent, void ) { switch ( rMenuEvent.GetId() ) { - case VCLEVENT_MENU_SELECT: + case VclEventId::MenuSelect: { if ( maMenuListeners.getLength() ) { @@ -98,12 +98,12 @@ IMPL_LINK( VCLXMenu, MenuEventListener, VclMenuEvent&, rMenuEvent, void ) } } break; - case VCLEVENT_OBJECT_DYING: + case VclEventId::ObjectDying: { mpMenu = nullptr; } break; - case VCLEVENT_MENU_HIGHLIGHT: + case VclEventId::MenuHighlight: { if ( maMenuListeners.getLength() ) { @@ -114,7 +114,7 @@ IMPL_LINK( VCLXMenu, MenuEventListener, VclMenuEvent&, rMenuEvent, void ) } } break; - case VCLEVENT_MENU_ACTIVATE: + case VclEventId::MenuActivate: { if ( maMenuListeners.getLength() ) { @@ -125,7 +125,7 @@ IMPL_LINK( VCLXMenu, MenuEventListener, VclMenuEvent&, rMenuEvent, void ) } } break; - case VCLEVENT_MENU_DEACTIVATE: + case VclEventId::MenuDeactivate: { if ( maMenuListeners.getLength() ) { @@ -138,19 +138,19 @@ IMPL_LINK( VCLXMenu, MenuEventListener, VclMenuEvent&, rMenuEvent, void ) break; // ignore accessibility events - case VCLEVENT_MENU_ENABLE: - case VCLEVENT_MENU_INSERTITEM: - case VCLEVENT_MENU_REMOVEITEM: - case VCLEVENT_MENU_SUBMENUACTIVATE: - case VCLEVENT_MENU_SUBMENUDEACTIVATE: - case VCLEVENT_MENU_SUBMENUCHANGED: - case VCLEVENT_MENU_DEHIGHLIGHT: - case VCLEVENT_MENU_DISABLE: - case VCLEVENT_MENU_ITEMTEXTCHANGED: - case VCLEVENT_MENU_ITEMCHECKED: - case VCLEVENT_MENU_ITEMUNCHECKED: - case VCLEVENT_MENU_SHOW: - case VCLEVENT_MENU_HIDE: + case VclEventId::MenuEnable: + case VclEventId::MenuInsertItem: + case VclEventId::MenuRemoveItem: + case VclEventId::MenuSubmenuActivate: + case VclEventId::MenuSubmenuDeactivate: + case VclEventId::MenuSubmenuChanged: + case VclEventId::MenuDehighlight: + case VclEventId::MenuDisable: + case VclEventId::MenuItemTextChanged: + case VclEventId::MenuItemChecked: + case VclEventId::MenuItemUnchecked: + case VclEventId::MenuShow: + case VclEventId::MenuHide: break; default: OSL_FAIL( "MenuEventListener - Unknown event!" ); diff --git a/toolkit/source/awt/vclxspinbutton.cxx b/toolkit/source/awt/vclxspinbutton.cxx index 2488359b13b7..30e44899f8f6 100644 --- a/toolkit/source/awt/vclxspinbutton.cxx +++ b/toolkit/source/awt/vclxspinbutton.cxx @@ -205,8 +205,8 @@ namespace toolkit switch ( _rVclWindowEvent.GetId() ) { - case VCLEVENT_SPINBUTTON_UP: - case VCLEVENT_SPINBUTTON_DOWN: + case VclEventId::SpinbuttonUp: + case VclEventId::SpinbuttonDown: if ( maAdjustmentListeners.getLength() ) { AdjustmentEvent aEvent; diff --git a/toolkit/source/awt/vclxtabpagecontainer.cxx b/toolkit/source/awt/vclxtabpagecontainer.cxx index 7e8b451dd7d8..6219648d513c 100644 --- a/toolkit/source/awt/vclxtabpagecontainer.cxx +++ b/toolkit/source/awt/vclxtabpagecontainer.cxx @@ -157,7 +157,7 @@ void VCLXTabPageContainer::ProcessWindowEvent( const VclWindowEvent& _rVclWindow { switch ( _rVclWindowEvent.GetId() ) { - case VCLEVENT_TABPAGE_ACTIVATE: + case VclEventId::TabpageActivate: { sal_uLong page = reinterpret_cast<sal_uLong>(_rVclWindowEvent.GetData()); awt::tab::TabPageActivatedEvent aEvent(nullptr,page); diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx index 1695a8750f28..b5dbe26218ae 100644 --- a/toolkit/source/awt/vclxtoolkit.cxx +++ b/toolkit/source/awt/vclxtoolkit.cxx @@ -1745,40 +1745,41 @@ IMPL_LINK(VCLXToolkit, eventListenerHandler, ::VclSimpleEvent&, rEvent, void) { switch (rEvent.GetId()) { - case VCLEVENT_WINDOW_SHOW: + case VclEventId::WindowShow: callTopWindowListeners( &rEvent, &css::awt::XTopWindowListener::windowOpened); break; - case VCLEVENT_WINDOW_HIDE: + case VclEventId::WindowHide: callTopWindowListeners( &rEvent, &css::awt::XTopWindowListener::windowClosed); break; - case VCLEVENT_WINDOW_ACTIVATE: + case VclEventId::WindowActivate: callTopWindowListeners( &rEvent, &css::awt::XTopWindowListener::windowActivated); break; - case VCLEVENT_WINDOW_DEACTIVATE: + case VclEventId::WindowDeactivate: callTopWindowListeners( &rEvent, &css::awt::XTopWindowListener::windowDeactivated); break; - case VCLEVENT_WINDOW_CLOSE: + case VclEventId::WindowClose: callTopWindowListeners( &rEvent, &css::awt::XTopWindowListener::windowClosing); break; - case VCLEVENT_WINDOW_GETFOCUS: + case VclEventId::WindowGetFocus: callFocusListeners(&rEvent, true); break; - case VCLEVENT_WINDOW_LOSEFOCUS: + case VclEventId::WindowLoseFocus: callFocusListeners(&rEvent, false); break; - case VCLEVENT_WINDOW_MINIMIZE: + case VclEventId::WindowMinimize: callTopWindowListeners( &rEvent, &css::awt::XTopWindowListener::windowMinimized); break; - case VCLEVENT_WINDOW_NORMALIZE: + case VclEventId::WindowNormalize: callTopWindowListeners( &rEvent, &css::awt::XTopWindowListener::windowNormalized); break; + default: break; } } @@ -1786,10 +1787,11 @@ IMPL_LINK(VCLXToolkit, keyListenerHandler, ::VclWindowEvent&, rEvent, bool) { switch (rEvent.GetId()) { - case VCLEVENT_WINDOW_KEYINPUT: + case VclEventId::WindowKeyInput: return callKeyHandlers(&rEvent, true); - case VCLEVENT_WINDOW_KEYUP: + case VclEventId::WindowKeyUp: return callKeyHandlers(&rEvent, false); + default: break; } return false; } @@ -1981,7 +1983,7 @@ void SAL_CALL VCLXToolkit::keyPress( const css::awt::KeyEvent & aKeyEvent ) throw css::uno::RuntimeException( "invalid event source" ); ::KeyEvent aVCLKeyEvent = VCLUnoHelper::createVCLKeyEvent( aKeyEvent ); - ::Application::PostKeyEvent( VCLEVENT_WINDOW_KEYINPUT, pWindow, &aVCLKeyEvent ); + ::Application::PostKeyEvent( VclEventId::WindowKeyInput, pWindow, &aVCLKeyEvent ); } void SAL_CALL VCLXToolkit::keyRelease( const css::awt::KeyEvent & aKeyEvent ) @@ -1996,7 +1998,7 @@ void SAL_CALL VCLXToolkit::keyRelease( const css::awt::KeyEvent & aKeyEvent ) throw css::uno::RuntimeException( "invalid event source" ); ::KeyEvent aVCLKeyEvent = VCLUnoHelper::createVCLKeyEvent( aKeyEvent ); - ::Application::PostKeyEvent( VCLEVENT_WINDOW_KEYUP, pWindow, &aVCLKeyEvent ); + ::Application::PostKeyEvent( VclEventId::WindowKeyUp, pWindow, &aVCLKeyEvent ); } @@ -2012,7 +2014,7 @@ void SAL_CALL VCLXToolkit::mousePress( const css::awt::MouseEvent & aMouseEvent throw css::uno::RuntimeException( "invalid event source" ); ::MouseEvent aVCLMouseEvent = VCLUnoHelper::createVCLMouseEvent( aMouseEvent ); - ::Application::PostMouseEvent( VCLEVENT_WINDOW_MOUSEBUTTONDOWN, pWindow, &aVCLMouseEvent ); + ::Application::PostMouseEvent( VclEventId::WindowMouseButtonDown, pWindow, &aVCLMouseEvent ); } void SAL_CALL VCLXToolkit::mouseRelease( const css::awt::MouseEvent & aMouseEvent ) @@ -2027,7 +2029,7 @@ void SAL_CALL VCLXToolkit::mouseRelease( const css::awt::MouseEvent & aMouseEven throw css::uno::RuntimeException( "invalid event source" ); ::MouseEvent aVCLMouseEvent = VCLUnoHelper::createVCLMouseEvent( aMouseEvent ); - ::Application::PostMouseEvent( VCLEVENT_WINDOW_MOUSEBUTTONUP, pWindow, &aVCLMouseEvent ); + ::Application::PostMouseEvent( VclEventId::WindowMouseButtonUp, pWindow, &aVCLMouseEvent ); } void SAL_CALL VCLXToolkit::mouseMove( const css::awt::MouseEvent & aMouseEvent ) @@ -2042,7 +2044,7 @@ void SAL_CALL VCLXToolkit::mouseMove( const css::awt::MouseEvent & aMouseEvent ) throw css::uno::RuntimeException( "invalid event source" ); ::MouseEvent aVCLMouseEvent = VCLUnoHelper::createVCLMouseEvent( aMouseEvent ); - ::Application::PostMouseEvent( VCLEVENT_WINDOW_MOUSEMOVE, pWindow, &aVCLMouseEvent ); + ::Application::PostMouseEvent( VclEventId::WindowMouseMove, pWindow, &aVCLMouseEvent ); } diff --git a/toolkit/source/awt/vclxwindow.cxx b/toolkit/source/awt/vclxwindow.cxx index e4a449925886..f2aa9f04d723 100644 --- a/toolkit/source/awt/vclxwindow.cxx +++ b/toolkit/source/awt/vclxwindow.cxx @@ -438,19 +438,19 @@ void VCLXWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) switch ( rVclWindowEvent.GetId() ) { - case VCLEVENT_WINDOW_ENABLED: - case VCLEVENT_WINDOW_DISABLED: + case VclEventId::WindowEnabled: + case VclEventId::WindowDisabled: { Callback aCallback = CallWindow2Listener( mpImpl->getWindow2Listeners(), - ( VCLEVENT_WINDOW_ENABLED == rVclWindowEvent.GetId() ), + ( VclEventId::WindowEnabled == rVclWindowEvent.GetId() ), EventObject( *this ) ); ImplExecuteAsyncWithoutSolarLock( aCallback ); } break; - case VCLEVENT_WINDOW_PAINT: + case VclEventId::WindowPaint: { if ( mpImpl->getPaintListeners().getLength() ) { @@ -462,7 +462,7 @@ void VCLXWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) } } break; - case VCLEVENT_WINDOW_MOVE: + case VclEventId::WindowMove: { if ( mpImpl->getWindowListeners().getLength() ) { @@ -473,7 +473,7 @@ void VCLXWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) } } break; - case VCLEVENT_WINDOW_RESIZE: + case VclEventId::WindowResize: { if ( mpImpl->getWindowListeners().getLength() ) { @@ -484,7 +484,7 @@ void VCLXWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) } } break; - case VCLEVENT_WINDOW_SHOW: + case VclEventId::WindowShow: { if ( mpImpl->getWindowListeners().getLength() ) { @@ -503,7 +503,7 @@ void VCLXWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) } } break; - case VCLEVENT_WINDOW_HIDE: + case VclEventId::WindowHide: { if ( mpImpl->getWindowListeners().getLength() ) { @@ -522,7 +522,7 @@ void VCLXWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) } } break; - case VCLEVENT_WINDOW_ACTIVATE: + case VclEventId::WindowActivate: { if ( mpImpl->getTopWindowListeners().getLength() ) { @@ -532,7 +532,7 @@ void VCLXWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) } } break; - case VCLEVENT_WINDOW_DEACTIVATE: + case VclEventId::WindowDeactivate: { if ( mpImpl->getTopWindowListeners().getLength() ) { @@ -542,7 +542,7 @@ void VCLXWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) } } break; - case VCLEVENT_WINDOW_CLOSE: + case VclEventId::WindowClose: { if ( mpImpl->getDockableWindowListeners().getLength() ) { @@ -558,14 +558,14 @@ void VCLXWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) } } break; - case VCLEVENT_CONTROL_GETFOCUS: - case VCLEVENT_WINDOW_GETFOCUS: + case VclEventId::ControlGetFocus: + case VclEventId::WindowGetFocus: { if ( ( rVclWindowEvent.GetWindow()->IsCompoundControl() - && rVclWindowEvent.GetId() == VCLEVENT_CONTROL_GETFOCUS + && rVclWindowEvent.GetId() == VclEventId::ControlGetFocus ) || ( !rVclWindowEvent.GetWindow()->IsCompoundControl() - && rVclWindowEvent.GetId() == VCLEVENT_WINDOW_GETFOCUS + && rVclWindowEvent.GetId() == VclEventId::WindowGetFocus ) ) { @@ -580,14 +580,14 @@ void VCLXWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) } } break; - case VCLEVENT_CONTROL_LOSEFOCUS: - case VCLEVENT_WINDOW_LOSEFOCUS: + case VclEventId::ControlLoseFocus: + case VclEventId::WindowLoseFocus: { if ( ( rVclWindowEvent.GetWindow()->IsCompoundControl() - && rVclWindowEvent.GetId() == VCLEVENT_CONTROL_LOSEFOCUS + && rVclWindowEvent.GetId() == VclEventId::ControlLoseFocus ) || ( !rVclWindowEvent.GetWindow()->IsCompoundControl() - && rVclWindowEvent.GetId() == VCLEVENT_WINDOW_LOSEFOCUS + && rVclWindowEvent.GetId() == VclEventId::WindowLoseFocus ) ) { @@ -616,7 +616,7 @@ void VCLXWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) } } break; - case VCLEVENT_WINDOW_MINIMIZE: + case VclEventId::WindowMinimize: { if ( mpImpl->getTopWindowListeners().getLength() ) { @@ -626,7 +626,7 @@ void VCLXWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) } } break; - case VCLEVENT_WINDOW_NORMALIZE: + case VclEventId::WindowNormalize: { if ( mpImpl->getTopWindowListeners().getLength() ) { @@ -636,7 +636,7 @@ void VCLXWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) } } break; - case VCLEVENT_WINDOW_KEYINPUT: + case VclEventId::WindowKeyInput: { if ( mpImpl->getKeyListeners().getLength() ) { @@ -647,7 +647,7 @@ void VCLXWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) } } break; - case VCLEVENT_WINDOW_KEYUP: + case VclEventId::WindowKeyUp: { if ( mpImpl->getKeyListeners().getLength() ) { @@ -658,7 +658,7 @@ void VCLXWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) } } break; - case VCLEVENT_WINDOW_COMMAND: + case VclEventId::WindowCommand: { CommandEvent* pCmdEvt = static_cast<CommandEvent*>(rVclWindowEvent.GetData()); if ( mpImpl->getMouseListeners().getLength() && ( pCmdEvt->GetCommand() == CommandEventId::ContextMenu ) ) @@ -684,7 +684,7 @@ void VCLXWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) } } break; - case VCLEVENT_WINDOW_MOUSEMOVE: + case VclEventId::WindowMouseMove: { MouseEvent* pMouseEvt = static_cast<MouseEvent*>(rVclWindowEvent.GetData()); if ( mpImpl->getMouseListeners().getLength() && ( pMouseEvt->IsEnterWindow() || pMouseEvt->IsLeaveWindow() ) ) @@ -711,7 +711,7 @@ void VCLXWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) } } break; - case VCLEVENT_WINDOW_MOUSEBUTTONDOWN: + case VclEventId::WindowMouseButtonDown: { if ( mpImpl->getMouseListeners().getLength() ) { @@ -722,7 +722,7 @@ void VCLXWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) } } break; - case VCLEVENT_WINDOW_MOUSEBUTTONUP: + case VclEventId::WindowMouseButtonUp: { if ( mpImpl->getMouseListeners().getLength() ) { @@ -734,7 +734,7 @@ void VCLXWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) } } break; - case VCLEVENT_WINDOW_STARTDOCKING: + case VclEventId::WindowStartDocking: { if ( mpImpl->getDockableWindowListeners().getLength() ) { @@ -755,7 +755,7 @@ void VCLXWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) } } break; - case VCLEVENT_WINDOW_DOCKING: + case VclEventId::WindowDocking: { if ( mpImpl->getDockableWindowListeners().getLength() ) { @@ -786,7 +786,7 @@ void VCLXWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) } } break; - case VCLEVENT_WINDOW_ENDDOCKING: + case VclEventId::WindowEndDocking: { if ( mpImpl->getDockableWindowListeners().getLength() ) { @@ -804,7 +804,7 @@ void VCLXWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) } } break; - case VCLEVENT_WINDOW_PREPARETOGGLEFLOATING: + case VclEventId::WindowPrepareToggleFloating: { if ( mpImpl->getDockableWindowListeners().getLength() ) { @@ -824,7 +824,7 @@ void VCLXWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) } } break; - case VCLEVENT_WINDOW_TOGGLEFLOATING: + case VclEventId::WindowToggleFloating: { if ( mpImpl->getDockableWindowListeners().getLength() ) { @@ -834,7 +834,7 @@ void VCLXWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) } } break; - case VCLEVENT_WINDOW_ENDPOPUPMODE: + case VclEventId::WindowEndPopupMode: { if ( mpImpl->getDockableWindowListeners().getLength() ) { @@ -852,7 +852,7 @@ void VCLXWindow::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) } } break; - + default: break; } } @@ -935,7 +935,7 @@ void VCLXWindow::dispose( ) throw(css::uno::RuntimeException, std::exception) // #i14103# dispose the accessible context after the window has been destroyed, // otherwise the old value in the child event fired in VCLXAccessibleComponent::ProcessWindowEvent() - // for VCLEVENT_WINDOW_CHILDDESTROYED contains a reference to an already disposed accessible object + // for VclEventId::WindowChildDestroyed contains a reference to an already disposed accessible object try { css::uno::Reference< css::lang::XComponent > xComponent( mpImpl->mxAccessibleContext, css::uno::UNO_QUERY ); diff --git a/toolkit/source/awt/vclxwindows.cxx b/toolkit/source/awt/vclxwindows.cxx index 4c3b6041c9c7..1acff4ecfd33 100644 --- a/toolkit/source/awt/vclxwindows.cxx +++ b/toolkit/source/awt/vclxwindows.cxx @@ -572,7 +572,7 @@ void VCLXButton::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { switch ( rVclWindowEvent.GetId() ) { - case VCLEVENT_BUTTON_CLICK: + case VclEventId::ButtonClick: { css::uno::Reference< css::awt::XWindow > xKeepAlive( this ); // since we call listeners below, there is a potential that we will be destroyed @@ -593,7 +593,7 @@ void VCLXButton::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) } break; - case VCLEVENT_PUSHBUTTON_TOGGLE: + case VclEventId::PushbuttonToggle: { PushButton& rButton = dynamic_cast< PushButton& >( *rVclWindowEvent.GetWindow() ); @@ -1011,7 +1011,7 @@ void VCLXCheckBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { switch ( rVclWindowEvent.GetId() ) { - case VCLEVENT_CHECKBOX_TOGGLE: + case VclEventId::CheckboxToggle: { css::uno::Reference< css::awt::XWindow > xKeepAlive( this ); // since we call listeners below, there is a potential that we will be destroyed @@ -1293,7 +1293,7 @@ void VCLXRadioButton::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent switch ( rVclWindowEvent.GetId() ) { - case VCLEVENT_BUTTON_CLICK: + case VclEventId::ButtonClick: if ( !IsSynthesizingVCLEvent() && maActionListeners.getLength() ) { css::awt::ActionEvent aEvent; @@ -1304,7 +1304,7 @@ void VCLXRadioButton::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ImplClickedOrToggled( false ); break; - case VCLEVENT_RADIOBUTTON_TOGGLE: + case VclEventId::RadiobuttonToggle: ImplClickedOrToggled( true ); break; @@ -1426,10 +1426,10 @@ void VCLXSpinField::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { switch ( rVclWindowEvent.GetId() ) { - case VCLEVENT_SPINFIELD_UP: - case VCLEVENT_SPINFIELD_DOWN: - case VCLEVENT_SPINFIELD_FIRST: - case VCLEVENT_SPINFIELD_LAST: + case VclEventId::SpinfieldUp: + case VclEventId::SpinfieldDown: + case VclEventId::SpinfieldFirst: + case VclEventId::SpinfieldLast: { css::uno::Reference< css::awt::XWindow > xKeepAlive( this ); // since we call listeners below, there is a potential that we will be destroyed @@ -1442,14 +1442,15 @@ void VCLXSpinField::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) aEvent.Source = static_cast<cppu::OWeakObject*>(this); switch ( rVclWindowEvent.GetId() ) { - case VCLEVENT_SPINFIELD_UP: maSpinListeners.up( aEvent ); + case VclEventId::SpinfieldUp: maSpinListeners.up( aEvent ); break; - case VCLEVENT_SPINFIELD_DOWN: maSpinListeners.down( aEvent ); + case VclEventId::SpinfieldDown: maSpinListeners.down( aEvent ); break; - case VCLEVENT_SPINFIELD_FIRST: maSpinListeners.first( aEvent ); + case VclEventId::SpinfieldFirst: maSpinListeners.first( aEvent ); break; - case VCLEVENT_SPINFIELD_LAST: maSpinListeners.last( aEvent ); + case VclEventId::SpinfieldLast: maSpinListeners.last( aEvent ); break; + default: break; } } @@ -1783,7 +1784,7 @@ void VCLXListBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) switch ( rVclWindowEvent.GetId() ) { - case VCLEVENT_LISTBOX_SELECT: + case VclEventId::ListboxSelect: { VclPtr< ListBox > pListBox = GetAs< ListBox >(); if( pListBox ) @@ -1806,7 +1807,7 @@ void VCLXListBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) } break; - case VCLEVENT_LISTBOX_DOUBLECLICK: + case VclEventId::ListboxDoubleClick: if ( GetWindow() && maActionListeners.getLength() ) { css::awt::ActionEvent aEvent; @@ -2676,14 +2677,14 @@ void VCLXMultiPage::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) css::uno::Reference< css::awt::XWindow > xKeepAlive( this ); switch ( rVclWindowEvent.GetId() ) { - case VCLEVENT_TABPAGE_DEACTIVATE: + case VclEventId::TabpageDeactivate: { sal_uLong nPageID = reinterpret_cast<sal_uLong>( rVclWindowEvent.GetData() ); maTabListeners.deactivated( nPageID ); break; } - case VCLEVENT_TABPAGE_ACTIVATE: + case VclEventId::TabpageActivate: { sal_uLong nPageID = reinterpret_cast<sal_uLong>( rVclWindowEvent.GetData() ); maTabListeners.activated( nPageID ); @@ -2865,7 +2866,7 @@ void VCLXFixedHyperlink::ProcessWindowEvent( const VclWindowEvent& rVclWindowEve { switch ( rVclWindowEvent.GetId() ) { - case VCLEVENT_BUTTON_CLICK: + case VclEventId::ButtonClick: { if ( maActionListeners.getLength() ) { @@ -3674,7 +3675,7 @@ void VCLXScrollBar::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { switch ( rVclWindowEvent.GetId() ) { - case VCLEVENT_SCROLLBAR_SCROLL: + case VclEventId::ScrollbarScroll: { css::uno::Reference< css::awt::XWindow > xKeepAlive( this ); // since we call listeners below, there is a potential that we will be destroyed @@ -4085,7 +4086,7 @@ void VCLXEdit::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) { switch ( rVclWindowEvent.GetId() ) { - case VCLEVENT_EDIT_MODIFY: + case VclEventId::EditModify: { css::uno::Reference< css::awt::XWindow > xKeepAlive( this ); // since we call listeners below, there is a potential that we will be destroyed @@ -4404,7 +4405,7 @@ void VCLXComboBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) switch ( rVclWindowEvent.GetId() ) { - case VCLEVENT_COMBOBOX_SELECT: + case VclEventId::ComboboxSelect: if ( maItemListeners.getLength() ) { VclPtr< ComboBox > pComboBox = GetAs< ComboBox >(); @@ -4425,7 +4426,7 @@ void VCLXComboBox::ProcessWindowEvent( const VclWindowEvent& rVclWindowEvent ) } break; - case VCLEVENT_COMBOBOX_DOUBLECLICK: + case VclEventId::ComboboxDoubleClick: if ( maActionListeners.getLength() ) { css::awt::ActionEvent aEvent; diff --git a/vcl/osx/a11yfocustracker.cxx b/vcl/osx/a11yfocustracker.cxx index 1389ae3c18ea..5f2e1c94ad64 100644 --- a/vcl/osx/a11yfocustracker.cxx +++ b/vcl/osx/a11yfocustracker.cxx @@ -49,25 +49,25 @@ void AquaA11yFocusTracker::WindowEventHandler(void * pThis, VclSimpleEvent& rEve pThis); switch (rEvent.GetId()) { - case VCLEVENT_WINDOW_PAINT: + case VclEventId::WindowPaint: pFocusTracker-> toolbox_open_floater( getWindow(&rEvent) ); break; - case VCLEVENT_WINDOW_GETFOCUS: + case VclEventId::WindowGetFocus: pFocusTracker->window_got_focus( getWindow(&rEvent) ); break; - case VCLEVENT_OBJECT_DYING: + case VclEventId::ObjectDying: pFocusTracker->m_aDocumentWindowList.erase( getWindow(&rEvent) ); SAL_FALLTHROUGH; - case VCLEVENT_TOOLBOX_HIGHLIGHTOFF: + case VclEventId::ToolboxHighlightOff: pFocusTracker->toolbox_highlight_off( getWindow(&rEvent) ); break; - case VCLEVENT_TOOLBOX_HIGHLIGHT: + case VclEventId::ToolboxHighlight: pFocusTracker->toolbox_highlight_on( getWindow(&rEvent) ); break; - case VCLEVENT_TABPAGE_ACTIVATE: + case VclEventId::TabpageActivate: pFocusTracker->tabpage_activated( getWindow(&rEvent) ); break; - case VCLEVENT_MENU_HIGHLIGHT: + case VclEventId::MenuHighlight: // Inspired by code in WindowEventHandler in // vcl/unx/gtk/a11y/atkutil.cxx, find out what kind of event // it is to avoid blindly using a static_cast and crash, @@ -209,11 +209,11 @@ void AquaA11yFocusTracker::menu_highlighted(const VclMenuEvent *pEvent) void AquaA11yFocusTracker::window_got_focus(vcl::Window *pWindow) { - // The menu bar is handled through VCLEVENT_MENU_HIGHLIGHTED + // The menu bar is handled through VclEventId::MenuHighlightED if( ! pWindow || !pWindow->IsReallyVisible() || pWindow->GetType() == WINDOW_MENUBARWINDOW ) return; - // ToolBoxes are handled through VCLEVENT_TOOLBOX_HIGHLIGHT + // ToolBoxes are handled through VclEventId::ToolboxHighlight if( pWindow->GetType() == WINDOW_TOOLBOX ) return; diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx index 7b06b5dde778..e839815415f3 100644 --- a/vcl/source/app/svapp.cxx +++ b/vcl/source/app/svapp.cxx @@ -165,7 +165,7 @@ struct ImplEventHook struct ImplPostEventData { - sal_uLong mnEvent; + VclEventId mnEvent; VclPtr<vcl::Window> mpWin; ImplSVEvent * mnEventId; KeyEvent maKeyEvent; @@ -173,14 +173,14 @@ struct ImplPostEventData ZoomEvent maZoomEvent; ScrollEvent maScrollEvent; - ImplPostEventData( sal_uLong nEvent, vcl::Window* pWin, const KeyEvent& rKeyEvent ) : + ImplPostEventData( VclEventId nEvent, vcl::Window* pWin, const KeyEvent& rKeyEvent ) : mnEvent( nEvent ), mpWin( pWin ), mnEventId( nullptr ), maKeyEvent( rKeyEvent ) {} - ImplPostEventData( sal_uLong nEvent, vcl::Window* pWin, const MouseEvent& rMouseEvent ) : + ImplPostEventData( VclEventId nEvent, vcl::Window* pWin, const MouseEvent& rMouseEvent ) : mnEvent( nEvent ), mpWin( pWin ), mnEventId( nullptr ), maMouseEvent( rMouseEvent ) {} #if !HAVE_FEATURE_DESKTOP - ImplPostEventData( sal_uLong nEvent, vcl::Window* pWin, const ZoomEvent& rZoomEvent ) : + ImplPostEventData( VclEventId nEvent, vcl::Window* pWin, const ZoomEvent& rZoomEvent ) : mnEvent( nEvent ), mpWin( pWin ), mnEventId( 0 ), maZoomEvent( rZoomEvent ) {} - ImplPostEventData( sal_uLong nEvent, vcl::Window* pWin, const ScrollEvent& rScrollEvent ) : + ImplPostEventData( VclEventId nEvent, vcl::Window* pWin, const ScrollEvent& rScrollEvent ) : mnEvent( nEvent ), mpWin( pWin ), mnEventId( 0 ), maScrollEvent( rScrollEvent ) {} #endif @@ -394,8 +394,8 @@ namespace return false; KeyEvent aVCLKeyEvt(nCharCode, nCode); - Application::PostKeyEvent(VCLEVENT_WINDOW_KEYINPUT, xWin.get(), &aVCLKeyEvt); - Application::PostKeyEvent(VCLEVENT_WINDOW_KEYUP, xWin.get(), &aVCLKeyEvt); + Application::PostKeyEvent(VclEventId::WindowKeyInput, xWin.get(), &aVCLKeyEvt); + Application::PostKeyEvent(VclEventId::WindowKeyUp, xWin.get(), &aVCLKeyEvt); return true; } @@ -702,7 +702,7 @@ void Application::SetSettings( const AllSettings& rSettings ) DataChangedEvent aDCEvt( DataChangedEventType::SETTINGS, &aOldSettings, nChangeFlags ); // notify data change handler - ImplCallEventListeners( VCLEVENT_APPLICATION_DATACHANGED, nullptr, &aDCEvt); + ImplCallEventListeners( VclEventId::ApplicationDataChanged, nullptr, &aDCEvt); // Update all windows vcl::Window* pFirstFrame = pSVData->maWinData.mpFirstFrame; @@ -820,7 +820,7 @@ void Application::NotifyAllWindows( DataChangedEvent& rDCEvt ) } } -void Application::ImplCallEventListeners( sal_uLong nEvent, vcl::Window *pWin, void* pData ) +void Application::ImplCallEventListeners( VclEventId nEvent, vcl::Window *pWin, void* pData ) { ImplSVData* pSVData = ImplGetSVData(); VclWindowEvent aEvent( pWin, nEvent, pData ); @@ -870,7 +870,7 @@ void Application::RemoveKeyListener( const Link<VclWindowEvent&,bool>& rKeyListe } } -bool Application::HandleKey( sal_uLong nEvent, vcl::Window *pWin, KeyEvent* pKeyEvent ) +bool Application::HandleKey( VclEventId nEvent, vcl::Window *pWin, KeyEvent* pKeyEvent ) { // let listeners process the key event VclWindowEvent aEvent( pWin, nEvent, static_cast<void *>(pKeyEvent) ); @@ -897,7 +897,7 @@ bool Application::HandleKey( sal_uLong nEvent, vcl::Window *pWin, KeyEvent* pKey return bProcessed; } -ImplSVEvent * Application::PostKeyEvent( sal_uLong nEvent, vcl::Window *pWin, KeyEvent* pKeyEvent ) +ImplSVEvent * Application::PostKeyEvent( VclEventId nEvent, vcl::Window *pWin, KeyEvent* pKeyEvent ) { const SolarMutexGuard aGuard; ImplSVEvent * nEventId = nullptr; @@ -922,7 +922,7 @@ ImplSVEvent * Application::PostKeyEvent( sal_uLong nEvent, vcl::Window *pWin, Ke return nEventId; } -ImplSVEvent * Application::PostMouseEvent( sal_uLong nEvent, vcl::Window *pWin, MouseEvent* pMouseEvent ) +ImplSVEvent * Application::PostMouseEvent( VclEventId nEvent, vcl::Window *pWin, MouseEvent* pMouseEvent ) { const SolarMutexGuard aGuard; ImplSVEvent * nEventId = nullptr; @@ -966,37 +966,37 @@ IMPL_STATIC_LINK( Application, PostEventHandler, void*, pCallData, void ) switch( pData->mnEvent ) { - case VCLEVENT_WINDOW_MOUSEMOVE: + case VclEventId::WindowMouseMove: nEvent = SalEvent::ExternalMouseMove; pEventData = &pData->maMouseEvent; break; - case VCLEVENT_WINDOW_MOUSEBUTTONDOWN: + case VclEventId::WindowMouseButtonDown: nEvent = SalEvent::ExternalMouseButtonDown; pEventData = &pData->maMouseEvent; break; - case VCLEVENT_WINDOW_MOUSEBUTTONUP: + case VclEventId::WindowMouseButtonUp: nEvent = SalEvent::ExternalMouseButtonUp; pEventData = &pData->maMouseEvent; break; - case VCLEVENT_WINDOW_KEYINPUT: + case VclEventId::WindowKeyInput: nEvent = SalEvent::ExternalKeyInput; pEventData = &pData->maKeyEvent; break; - case VCLEVENT_WINDOW_KEYUP: + case VclEventId::WindowKeyUp: nEvent = SalEvent::ExternalKeyUp; pEventData = &pData->maKeyEvent; break; - case VCLEVENT_WINDOW_ZOOM: + case VclEventId::WindowZoom: nEvent = SalEvent::ExternalZoom; pEventData = &pData->maZoomEvent; break; - case VCLEVENT_WINDOW_SCROLL: + case VclEventId::WindowScroll: nEvent = SalEvent::ExternalScroll; pEventData = &pData->maScrollEvent; break; diff --git a/vcl/source/app/vclevent.cxx b/vcl/source/app/vclevent.cxx index a7ec9491a4bf..2cab94c4561e 100644 --- a/vcl/source/app/vclevent.cxx +++ b/vcl/source/app/vclevent.cxx @@ -30,7 +30,7 @@ using ::com::sun::star::uno::Reference; using ::com::sun::star::accessibility::XAccessible; -VclAccessibleEvent::VclAccessibleEvent( sal_uLong n, const Reference<XAccessible>& rxAccessible ) : +VclAccessibleEvent::VclAccessibleEvent( VclEventId n, const Reference<XAccessible>& rxAccessible ) : VclSimpleEvent(n), mxAccessible(rxAccessible) { @@ -84,14 +84,14 @@ void VclEventListeners::removeListener( const Link<VclSimpleEvent&,void>& rListe m_aListeners.erase( std::remove(m_aListeners.begin(), m_aListeners.end(), rListener ), m_aListeners.end() ); } -VclWindowEvent::VclWindowEvent( vcl::Window* pWin, sal_uLong n, void* pDat ) : VclSimpleEvent(n) +VclWindowEvent::VclWindowEvent( vcl::Window* pWin, VclEventId n, void* pDat ) : VclSimpleEvent(n) { pWindow = pWin; pData = pDat; } VclWindowEvent::~VclWindowEvent() {} -VclMenuEvent::VclMenuEvent( Menu* pM, sal_uLong n, sal_uInt16 nPos ) +VclMenuEvent::VclMenuEvent( Menu* pM, VclEventId n, sal_uInt16 nPos ) : VclSimpleEvent(n), pMenu(pM), mnPos(nPos) {} diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx index e331115d005e..6eceff68a954 100644 --- a/vcl/source/control/button.cxx +++ b/vcl/source/control/button.cxx @@ -124,7 +124,7 @@ void Button::SetCommandHandler(const OUString& aCommand) void Button::Click() { - ImplCallEventListenersAndHandler( VCLEVENT_BUTTON_CLICK, [this] () { maClickHdl.Call(this); } ); + ImplCallEventListenersAndHandler( VclEventId::ButtonClick, [this] () { maClickHdl.Call(this); } ); } OUString Button::GetStandardText( StandardButtonType eButton ) @@ -1554,7 +1554,7 @@ bool PushButton::PreNotify( NotifyEvent& rNEvt ) void PushButton::Toggle() { - ImplCallEventListenersAndHandler( VCLEVENT_PUSHBUTTON_TOGGLE, nullptr ); + ImplCallEventListenersAndHandler( VclEventId::PushbuttonToggle, nullptr ); } void PushButton::SetSymbol( SymbolType eSymbol ) @@ -2620,7 +2620,7 @@ bool RadioButton::PreNotify( NotifyEvent& rNEvt ) void RadioButton::Toggle() { - ImplCallEventListenersAndHandler( VCLEVENT_RADIOBUTTON_TOGGLE, [this] () { maToggleHdl.Call(*this); } ); + ImplCallEventListenersAndHandler( VclEventId::RadiobuttonToggle, [this] () { maToggleHdl.Call(*this); } ); } bool RadioButton::SetModeRadioImage( const Image& rImage ) @@ -3537,7 +3537,7 @@ bool CheckBox::PreNotify( NotifyEvent& rNEvt ) void CheckBox::Toggle() { - ImplCallEventListenersAndHandler( VCLEVENT_CHECKBOX_TOGGLE, [this] () { maToggleHdl.Call(*this); } ); + ImplCallEventListenersAndHandler( VclEventId::CheckboxToggle, [this] () { maToggleHdl.Call(*this); } ); } void CheckBox::SetState( TriState eState ) diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx index 08a750e6ffc1..15b7344966bc 100644 --- a/vcl/source/control/combobox.cxx +++ b/vcl/source/control/combobox.cxx @@ -268,7 +268,7 @@ bool ComboBox::IsAutocompleteEnabled() const IMPL_LINK_NOARG(ComboBox::Impl, ImplClickBtnHdl, void*, void) { - m_rThis.CallEventListeners( VCLEVENT_DROPDOWN_PRE_OPEN ); + m_rThis.CallEventListeners( VclEventId::DropdownPreOpen ); m_pSubEdit->GrabFocus(); if (!m_pImplLB->GetEntryList()->GetMRUCount()) ImplUpdateFloatSelection(); @@ -277,7 +277,7 @@ IMPL_LINK_NOARG(ComboBox::Impl, ImplClickBtnHdl, void*, void) m_pBtn->SetPressed( true ); m_rThis.SetSelection( Selection( 0, SELECTION_MAX ) ); m_pFloatWin->StartFloat( true ); - m_rThis.CallEventListeners( VCLEVENT_DROPDOWN_OPEN ); + m_rThis.CallEventListeners( VclEventId::DropdownOpen ); m_rThis.ImplClearLayoutData(); if (m_pImplLB) @@ -304,7 +304,7 @@ IMPL_LINK_NOARG(ComboBox::Impl, ImplPopupModeEndHdl, FloatingWindow*, void) m_pImplLB->GetMainWindow()->ImplClearLayoutData(); m_pBtn->SetPressed( false ); - m_rThis.CallEventListeners( VCLEVENT_DROPDOWN_CLOSE ); + m_rThis.CallEventListeners( VclEventId::DropdownClose ); } IMPL_LINK(ComboBox::Impl, ImplAutocompleteHdl, Edit&, rEdit, void) @@ -435,7 +435,7 @@ IMPL_LINK_NOARG(ComboBox::Impl, ImplSelectHdl, LinkParamNone*, void) IMPL_LINK_NOARG( ComboBox::Impl, ImplListItemSelectHdl, LinkParamNone*, void ) { - m_rThis.CallEventListeners( VCLEVENT_DROPDOWN_SELECT ); + m_rThis.CallEventListeners( VclEventId::DropdownSelect ); } IMPL_LINK_NOARG(ComboBox::Impl, ImplCancelHdl, LinkParamNone*, void) @@ -471,23 +471,23 @@ void ComboBox::ToggleDropDown() m_pImpl->ImplUpdateFloatSelection(); else m_pImpl->m_pImplLB->SelectEntry( 0 , true ); - CallEventListeners( VCLEVENT_DROPDOWN_PRE_OPEN ); + CallEventListeners( VclEventId::DropdownPreOpen ); m_pImpl->m_pBtn->SetPressed( true ); SetSelection( Selection( 0, SELECTION_MAX ) ); m_pImpl->m_pFloatWin->StartFloat( true ); - CallEventListeners( VCLEVENT_DROPDOWN_OPEN ); + CallEventListeners( VclEventId::DropdownOpen ); } } } void ComboBox::Select() { - ImplCallEventListenersAndHandler( VCLEVENT_COMBOBOX_SELECT, [this] () { m_pImpl->m_SelectHdl.Call(*this); } ); + ImplCallEventListenersAndHandler( VclEventId::ComboboxSelect, [this] () { m_pImpl->m_SelectHdl.Call(*this); } ); } void ComboBox::DoubleClick() { - ImplCallEventListenersAndHandler( VCLEVENT_COMBOBOX_DOUBLECLICK, [this] () { m_pImpl->m_DoubleClickHdl.Call(*this); } ); + ImplCallEventListenersAndHandler( VclEventId::ComboboxDoubleClick, [this] () { m_pImpl->m_DoubleClickHdl.Call(*this); } ); } bool ComboBox::IsAutoSizeEnabled() const { return m_pImpl->m_isDDAutoSize; } @@ -715,13 +715,13 @@ bool ComboBox::EventNotify( NotifyEvent& rNEvt ) && !m_pImpl->m_pFloatWin->IsInPopupMode() && aKeyEvt.GetKeyCode().IsMod2()) { - CallEventListeners( VCLEVENT_DROPDOWN_PRE_OPEN ); + CallEventListeners( VclEventId::DropdownPreOpen ); m_pImpl->m_pBtn->SetPressed( true ); if (m_pImpl->m_pImplLB->GetEntryList()->GetMRUCount()) m_pImpl->m_pImplLB->SelectEntry( 0 , true ); SetSelection( Selection( 0, SELECTION_MAX ) ); m_pImpl->m_pFloatWin->StartFloat( false ); - CallEventListeners( VCLEVENT_DROPDOWN_OPEN ); + CallEventListeners( VclEventId::DropdownOpen ); bDone = true; } else if ((nKeyCode == KEY_UP) && m_pImpl->m_pFloatWin @@ -785,7 +785,7 @@ bool ComboBox::EventNotify( NotifyEvent& rNEvt ) void ComboBox::SetText( const OUString& rStr ) { - CallEventListeners( VCLEVENT_COMBOBOX_SETTEXT ); + CallEventListeners( VclEventId::ComboboxSetText ); Edit::SetText( rStr ); m_pImpl->ImplUpdateFloatSelection(); @@ -793,7 +793,7 @@ void ComboBox::SetText( const OUString& rStr ) void ComboBox::SetText( const OUString& rStr, const Selection& rNewSelection ) { - CallEventListeners( VCLEVENT_COMBOBOX_SETTEXT ); + CallEventListeners( VclEventId::ComboboxSetText ); Edit::SetText( rStr, rNewSelection ); m_pImpl->ImplUpdateFloatSelection(); @@ -876,7 +876,7 @@ sal_Int32 ComboBox::InsertEntry(const OUString& rStr, sal_Int32 const nPos) nRealPos = m_pImpl->m_pImplLB->InsertEntry( nRealPos, rStr ); nRealPos -= m_pImpl->m_pImplLB->GetEntryList()->GetMRUCount(); - CallEventListeners( VCLEVENT_COMBOBOX_ITEMADDED, reinterpret_cast<void*>(nRealPos) ); + CallEventListeners( VclEventId::ComboboxItemAdded, reinterpret_cast<void*>(nRealPos) ); return nRealPos; } @@ -897,7 +897,7 @@ sal_Int32 ComboBox::InsertEntryWithImage( nRealPos = m_pImpl->m_pImplLB->InsertEntry( nRealPos, rStr, rImage ); nRealPos -= m_pImpl->m_pImplLB->GetEntryList()->GetMRUCount(); - CallEventListeners( VCLEVENT_COMBOBOX_ITEMADDED, reinterpret_cast<void*>(nRealPos) ); + CallEventListeners( VclEventId::ComboboxItemAdded, reinterpret_cast<void*>(nRealPos) ); return nRealPos; } @@ -913,13 +913,13 @@ void ComboBox::RemoveEntryAt(sal_Int32 const nPos) return; m_pImpl->m_pImplLB->RemoveEntry( nPos + nMRUCount ); - CallEventListeners( VCLEVENT_COMBOBOX_ITEMREMOVED, reinterpret_cast<void*>(nPos) ); + CallEventListeners( VclEventId::ComboboxItemRemoved, reinterpret_cast<void*>(nPos) ); } void ComboBox::Clear() { m_pImpl->m_pImplLB->Clear(); - CallEventListeners( VCLEVENT_COMBOBOX_ITEMREMOVED, reinterpret_cast<void*>(-1) ); + CallEventListeners( VclEventId::ComboboxItemRemoved, reinterpret_cast<void*>(-1) ); } Image ComboBox::GetEntryImage( sal_Int32 nPos ) const diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx index a5fd5bc021d3..9016b8661f2e 100644 --- a/vcl/source/control/ctrl.cxx +++ b/vcl/source/control/ctrl.cxx @@ -236,7 +236,7 @@ bool Control::EventNotify( NotifyEvent& rNEvt ) { mbHasControlFocus = true; CompatStateChanged( StateChangedType::ControlFocus ); - if ( ImplCallEventListenersAndHandler( VCLEVENT_CONTROL_GETFOCUS, [this] () { maGetFocusHdl.Call(*this); } ) ) + if ( ImplCallEventListenersAndHandler( VclEventId::ControlGetFocus, [this] () { maGetFocusHdl.Call(*this); } ) ) // been destroyed within the handler return true; } @@ -250,7 +250,7 @@ bool Control::EventNotify( NotifyEvent& rNEvt ) { mbHasControlFocus = false; CompatStateChanged( StateChangedType::ControlFocus ); - if ( ImplCallEventListenersAndHandler( VCLEVENT_CONTROL_LOSEFOCUS, [this] () { maLoseFocusHdl.Call(*this); } ) ) + if ( ImplCallEventListenersAndHandler( VclEventId::ControlLoseFocus, [this] () { maLoseFocusHdl.Call(*this); } ) ) // been destroyed within the handler return true; } @@ -298,7 +298,7 @@ void Control::AppendLayoutData( const Control& rSubControl ) const } } -bool Control::ImplCallEventListenersAndHandler( sal_uLong nEvent, std::function<void()> const & callHandler ) +bool Control::ImplCallEventListenersAndHandler( VclEventId nEvent, std::function<void()> const & callHandler ) { VclPtr<Control> xThis(this); diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx index 1542d5bd428b..f33c785fb653 100644 --- a/vcl/source/control/edit.cxx +++ b/vcl/source/control/edit.cxx @@ -933,7 +933,7 @@ void Edit::ImplSetText( const OUString& rText, const Selection* pNewSelection ) else ImplInsertText( rText, pNewSelection ); - CallEventListeners( VCLEVENT_EDIT_MODIFY ); + CallEventListeners( VclEventId::EditModify ); } } @@ -1865,9 +1865,9 @@ void Edit::GetFocus() maSelection.Max() = maText.getLength(); } if ( mbIsSubEdit ) - static_cast<Edit*>(GetParent())->CallEventListeners( VCLEVENT_EDIT_SELECTIONCHANGED ); + static_cast<Edit*>(GetParent())->CallEventListeners( VclEventId::EditSelectionChanged ); else - CallEventListeners( VCLEVENT_EDIT_SELECTIONCHANGED ); + CallEventListeners( VclEventId::EditSelectionChanged ); } ImplShowCursor(); @@ -2345,12 +2345,12 @@ void Edit::Modify() if ( mpUpdateDataTimer ) mpUpdateDataTimer->Start(); - if ( ImplCallEventListenersAndHandler( VCLEVENT_EDIT_MODIFY, [this] () { maModifyHdl.Call(*this); } ) ) + if ( ImplCallEventListenersAndHandler( VclEventId::EditModify, [this] () { maModifyHdl.Call(*this); } ) ) // have been destroyed while calling into the handlers return; // #i13677# notify edit listeners about caret position change - CallEventListeners( VCLEVENT_EDIT_CARETCHANGED ); + CallEventListeners( VclEventId::EditCaretChanged ); // FIXME: this is currently only on OS X // check for other platforms that need similar handling if( ImplGetSVData()->maNWFData.mbNoFocusRects && @@ -2499,22 +2499,22 @@ void Edit::ImplSetSelection( const Selection& rSelection, bool bPaint ) if (bSelection) { if ( mbIsSubEdit ) - static_cast<Edit*>(GetParent())->CallEventListeners( VCLEVENT_EDIT_SELECTIONCHANGED ); + static_cast<Edit*>(GetParent())->CallEventListeners( VclEventId::EditSelectionChanged ); else - CallEventListeners( VCLEVENT_EDIT_SELECTIONCHANGED ); + CallEventListeners( VclEventId::EditSelectionChanged ); } if (bCaret) { if ( mbIsSubEdit ) - static_cast<Edit*>(GetParent())->CallEventListeners( VCLEVENT_EDIT_CARETCHANGED ); + static_cast<Edit*>(GetParent())->CallEventListeners( VclEventId::EditCaretChanged ); else - CallEventListeners( VCLEVENT_EDIT_CARETCHANGED ); + CallEventListeners( VclEventId::EditCaretChanged ); } // #103511# notify combobox listeners of deselection if( !maSelection && GetParent() && GetParent()->GetType() == WINDOW_COMBOBOX ) - static_cast<Edit*>(GetParent())->CallEventListeners( VCLEVENT_COMBOBOX_DESELECT ); + static_cast<Edit*>(GetParent())->CallEventListeners( VclEventId::ComboboxDeselect ); } } } diff --git a/vcl/source/control/fixedhyper.cxx b/vcl/source/control/fixedhyper.cxx index 8cfff9620358..6843485e14f1 100644 --- a/vcl/source/control/fixedhyper.cxx +++ b/vcl/source/control/fixedhyper.cxx @@ -90,7 +90,7 @@ void FixedHyperlink::MouseButtonUp( const MouseEvent& ) { // calls the link if the control is enabled and the mouse is over the text. if ( IsEnabled() && ImplIsOverText(GetPointerPosPixel()) ) - ImplCallEventListenersAndHandler( VCLEVENT_BUTTON_CLICK, [this] () { m_aClickHdl.Call(*this); } ); + ImplCallEventListenersAndHandler( VclEventId::ButtonClick, [this] () { m_aClickHdl.Call(*this); } ); } void FixedHyperlink::RequestHelp( const HelpEvent& rHEvt ) diff --git a/vcl/source/control/imp_listbox.cxx b/vcl/source/control/imp_listbox.cxx index af9309d9612d..a09bdb98c9e8 100644 --- a/vcl/source/control/imp_listbox.cxx +++ b/vcl/source/control/imp_listbox.cxx @@ -921,7 +921,7 @@ void ImplListBoxWindow::MouseMove( const MouseEvent& rMEvt ) mbTravelSelect = false; } // When list box selection change by mouse move, notify - // VCLEVENT_LISTBOX_SELECT vcl event. + // VclEventId::ListboxSelect vcl event. else { maListItemSelectHdl.Call(nullptr); diff --git a/vcl/source/control/listbox.cxx b/vcl/source/control/listbox.cxx index d8f882bbf94a..3d523d0ac747 100644 --- a/vcl/source/control/listbox.cxx +++ b/vcl/source/control/listbox.cxx @@ -63,7 +63,7 @@ ListBox::~ListBox() void ListBox::dispose() { - CallEventListeners( VCLEVENT_OBJECT_DYING ); + CallEventListeners( VclEventId::ObjectDying ); mpImplLB.disposeAndClear(); mpFloatWin.disposeAndClear(); @@ -203,17 +203,17 @@ IMPL_LINK_NOARG(ListBox, ImplSelectHdl, LinkParamNone*, void) IMPL_LINK( ListBox, ImplFocusHdl, sal_Int32, nPos, void ) { - CallEventListeners( VCLEVENT_LISTBOX_FOCUS, reinterpret_cast<void*>(nPos) ); + CallEventListeners( VclEventId::ListboxFocus, reinterpret_cast<void*>(nPos) ); } IMPL_LINK_NOARG( ListBox, ImplListItemSelectHdl, LinkParamNone*, void ) { - CallEventListeners( VCLEVENT_DROPDOWN_SELECT ); + CallEventListeners( VclEventId::DropdownSelect ); } IMPL_LINK_NOARG(ListBox, ImplScrollHdl, ImplListBox*, void) { - CallEventListeners( VCLEVENT_LISTBOX_SCROLLED ); + CallEventListeners( VclEventId::ListboxScrolled ); } IMPL_LINK_NOARG(ListBox, ImplCancelHdl, LinkParamNone*, void) @@ -260,11 +260,11 @@ IMPL_LINK_NOARG(ListBox, ImplClickBtnHdl, void*, void) { if( !mpFloatWin->IsInPopupMode() ) { - CallEventListeners( VCLEVENT_DROPDOWN_PRE_OPEN ); + CallEventListeners( VclEventId::DropdownPreOpen ); mpImplWin->GrabFocus(); mpBtn->SetPressed( true ); mpFloatWin->StartFloat( true ); - CallEventListeners( VCLEVENT_DROPDOWN_OPEN ); + CallEventListeners( VclEventId::DropdownOpen ); ImplClearLayoutData(); if( mpImplLB ) @@ -301,7 +301,7 @@ IMPL_LINK_NOARG(ListBox, ImplPopupModeEndHdl, FloatingWindow*, void) mpImplWin->ImplClearLayoutData(); mpBtn->SetPressed( false ); - CallEventListeners( VCLEVENT_DROPDOWN_CLOSE ); + CallEventListeners( VclEventId::DropdownClose ); } void ListBox::ToggleDropDown() @@ -312,11 +312,11 @@ void ListBox::ToggleDropDown() mpFloatWin->EndPopupMode(); else { - CallEventListeners( VCLEVENT_DROPDOWN_PRE_OPEN ); + CallEventListeners( VclEventId::DropdownPreOpen ); mpImplWin->GrabFocus(); mpBtn->SetPressed( true ); mpFloatWin->StartFloat( true ); - CallEventListeners( VCLEVENT_DROPDOWN_OPEN ); + CallEventListeners( VclEventId::DropdownOpen ); } } } @@ -840,10 +840,10 @@ bool ListBox::PreNotify( NotifyEvent& rNEvt ) if( mpFloatWin && !mpFloatWin->IsInPopupMode() && aKeyEvt.GetKeyCode().IsMod2() ) { - CallEventListeners( VCLEVENT_DROPDOWN_PRE_OPEN ); + CallEventListeners( VclEventId::DropdownPreOpen ); mpBtn->SetPressed( true ); mpFloatWin->StartFloat( false ); - CallEventListeners( VCLEVENT_DROPDOWN_OPEN ); + CallEventListeners( VclEventId::DropdownOpen ); bDone = true; } else @@ -912,12 +912,12 @@ bool ListBox::PreNotify( NotifyEvent& rNEvt ) void ListBox::Select() { - ImplCallEventListenersAndHandler( VCLEVENT_LISTBOX_SELECT, [this] () { maSelectHdl.Call(*this); } ); + ImplCallEventListenersAndHandler( VclEventId::ListboxSelect, [this] () { maSelectHdl.Call(*this); } ); } void ListBox::DoubleClick() { - ImplCallEventListenersAndHandler( VCLEVENT_LISTBOX_DOUBLECLICK, [this] () { maDoubleClickHdl.Call(*this); } ); + ImplCallEventListenersAndHandler( VclEventId::ListboxDoubleClick, [this] () { maDoubleClickHdl.Call(*this); } ); } void ListBox::Clear() @@ -933,7 +933,7 @@ void ListBox::Clear() mpImplWin->SetImage( aImage ); mpImplWin->Invalidate(); } - CallEventListeners( VCLEVENT_LISTBOX_ITEMREMOVED, reinterpret_cast<void*>(-1) ); + CallEventListeners( VclEventId::ListboxItemRemoved, reinterpret_cast<void*>(-1) ); } void ListBox::SetNoSelection() @@ -947,14 +947,14 @@ void ListBox::SetNoSelection() mpImplWin->SetImage( aImage ); mpImplWin->Invalidate(); } - CallEventListeners(VCLEVENT_LISTBOX_STATEUPDATE); + CallEventListeners(VclEventId::ListboxStateUpdate); } sal_Int32 ListBox::InsertEntry( const OUString& rStr, sal_Int32 nPos ) { sal_Int32 nRealPos = mpImplLB->InsertEntry( nPos + mpImplLB->GetEntryList()->GetMRUCount(), rStr ); nRealPos = sal::static_int_cast<sal_Int32>(nRealPos - mpImplLB->GetEntryList()->GetMRUCount()); - CallEventListeners( VCLEVENT_LISTBOX_ITEMADDED, reinterpret_cast<void*>(nRealPos) ); + CallEventListeners( VclEventId::ListboxItemAdded, reinterpret_cast<void*>(nRealPos) ); return nRealPos; } @@ -962,7 +962,7 @@ sal_Int32 ListBox::InsertEntry( const OUString& rStr, const Image& rImage, sal_I { sal_Int32 nRealPos = mpImplLB->InsertEntry( nPos + mpImplLB->GetEntryList()->GetMRUCount(), rStr, rImage ); nRealPos = sal::static_int_cast<sal_Int32>(nRealPos - mpImplLB->GetEntryList()->GetMRUCount()); - CallEventListeners( VCLEVENT_LISTBOX_ITEMADDED, reinterpret_cast<void*>(nRealPos) ); + CallEventListeners( VclEventId::ListboxItemAdded, reinterpret_cast<void*>(nRealPos) ); return nRealPos; } @@ -974,7 +974,7 @@ void ListBox::RemoveEntry( const OUString& rStr ) void ListBox::RemoveEntry( sal_Int32 nPos ) { mpImplLB->RemoveEntry( nPos + mpImplLB->GetEntryList()->GetMRUCount() ); - CallEventListeners( VCLEVENT_LISTBOX_ITEMREMOVED, reinterpret_cast<void*>(nPos) ); + CallEventListeners( VclEventId::ListboxItemRemoved, reinterpret_cast<void*>(nPos) ); } Image ListBox::GetEntryImage( sal_Int32 nPos ) const @@ -1071,13 +1071,13 @@ void ListBox::SelectEntryPos( sal_Int32 nPos, bool bSelect ) mpImplLB->SelectEntry( nPos + mpImplLB->GetEntryList()->GetMRUCount(), bSelect ); newSelectCount = GetSelectEntryCount(); if (oldSelectCount == 0 && newSelectCount > 0) - CallEventListeners(VCLEVENT_LISTBOX_STATEUPDATE); + CallEventListeners(VclEventId::ListboxStateUpdate); //Only when bSelect == true, send both Selection & Focus events if (nCurrentPos != nPos && bSelect) { - CallEventListeners( VCLEVENT_LISTBOX_SELECT, reinterpret_cast<void*>(nPos)); + CallEventListeners( VclEventId::ListboxSelect, reinterpret_cast<void*>(nPos)); if (HasFocus()) - CallEventListeners( VCLEVENT_LISTBOX_FOCUS, reinterpret_cast<void*>(nPos)); + CallEventListeners( VclEventId::ListboxFocus, reinterpret_cast<void*>(nPos)); } } } diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx index c16f4f52de57..5ddc7dc25e4e 100644 --- a/vcl/source/control/scrbar.cxx +++ b/vcl/source/control/scrbar.cxx @@ -1310,12 +1310,12 @@ bool ScrollBar::PreNotify( NotifyEvent& rNEvt ) void ScrollBar::Scroll() { - ImplCallEventListenersAndHandler( VCLEVENT_SCROLLBAR_SCROLL, [this] () { maScrollHdl.Call(this); } ); + ImplCallEventListenersAndHandler( VclEventId::ScrollbarScroll, [this] () { maScrollHdl.Call(this); } ); } void ScrollBar::EndScroll() { - ImplCallEventListenersAndHandler( VCLEVENT_SCROLLBAR_ENDSCROLL, [this] () { maEndScrollHdl.Call(this); } ); + ImplCallEventListenersAndHandler( VclEventId::ScrollbarEndScroll, [this] () { maEndScrollHdl.Call(this); } ); } long ScrollBar::DoScroll( long nNewPos ) diff --git a/vcl/source/control/spinbtn.cxx b/vcl/source/control/spinbtn.cxx index 4c1a7085eb2b..029c313219a8 100644 --- a/vcl/source/control/spinbtn.cxx +++ b/vcl/source/control/spinbtn.cxx @@ -82,7 +82,7 @@ void SpinButton::Up() ImplMoveFocus(true); } - ImplCallEventListenersAndHandler(VCLEVENT_SPINBUTTON_UP, nullptr ); + ImplCallEventListenersAndHandler(VclEventId::SpinbuttonUp, nullptr ); } void SpinButton::Down() @@ -95,7 +95,7 @@ void SpinButton::Down() ImplMoveFocus(false); } - ImplCallEventListenersAndHandler(VCLEVENT_SPINBUTTON_DOWN, nullptr ); + ImplCallEventListenersAndHandler(VclEventId::SpinbuttonDown, nullptr ); } void SpinButton::Resize() diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx index ad36af9932ee..169b6c30e054 100644 --- a/vcl/source/control/spinfld.cxx +++ b/vcl/source/control/spinfld.cxx @@ -359,22 +359,22 @@ void SpinField::dispose() void SpinField::Up() { - ImplCallEventListenersAndHandler( VCLEVENT_SPINFIELD_UP, [this] () { maUpHdlLink.Call(*this); } ); + ImplCallEventListenersAndHandler( VclEventId::SpinfieldUp, [this] () { maUpHdlLink.Call(*this); } ); } void SpinField::Down() { - ImplCallEventListenersAndHandler( VCLEVENT_SPINFIELD_DOWN, [this] () { maDownHdlLink.Call(*this); } ); + ImplCallEventListenersAndHandler( VclEventId::SpinfieldDown, [this] () { maDownHdlLink.Call(*this); } ); } void SpinField::First() { - ImplCallEventListenersAndHandler( VCLEVENT_SPINFIELD_FIRST, [this] () { maFirstHdlLink.Call(*this); } ); + ImplCallEventListenersAndHandler( VclEventId::SpinfieldFirst, [this] () { maFirstHdlLink.Call(*this); } ); } void SpinField::Last() { - ImplCallEventListenersAndHandler( VCLEVENT_SPINFIELD_LAST, [this] () { maLastHdlLink.Call(*this); } ); + ImplCallEventListenersAndHandler( VclEventId::SpinfieldLast, [this] () { maLastHdlLink.Call(*this); } ); } void SpinField::MouseButtonDown( const MouseEvent& rMEvt ) diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx index f570721551c8..0dc66120df89 100644 --- a/vcl/source/control/tabctrl.cxx +++ b/vcl/source/control/tabctrl.cxx @@ -997,7 +997,7 @@ IMPL_LINK_NOARG(TabControl, ImplListBoxSelectHdl, ListBox&, void) IMPL_LINK( TabControl, ImplWindowEventListener, VclWindowEvent&, rEvent, void ) { - if ( rEvent.GetId() == VCLEVENT_WINDOW_KEYINPUT ) + if ( rEvent.GetId() == VclEventId::WindowKeyInput ) { // Do not handle events from TabControl or its children, which is done in Notify(), where the events can be consumed. if ( !IsWindowOrChild( rEvent.GetWindow() ) ) @@ -1674,7 +1674,7 @@ void TabControl::InsertPage( sal_uInt16 nPageId, const OUString& rText, if( mpTabCtrlData->mpListBox ) // reposition/resize listbox Resize(); - CallEventListeners( VCLEVENT_TABPAGE_INSERTED, reinterpret_cast<void*>(nPageId) ); + CallEventListeners( VclEventId::TabpageInserted, reinterpret_cast<void*>(nPageId) ); } void TabControl::RemovePage( sal_uInt16 nPageId ) @@ -1719,7 +1719,7 @@ void TabControl::RemovePage( sal_uInt16 nPageId ) ImplFreeLayoutData(); - CallEventListeners( VCLEVENT_TABPAGE_REMOVED, reinterpret_cast<void*>(nPageId) ); + CallEventListeners( VclEventId::TabpageRemoved, reinterpret_cast<void*>(nPageId) ); } } @@ -1737,7 +1737,7 @@ void TabControl::Clear() if ( IsUpdateMode() ) Invalidate(); - CallEventListeners( VCLEVENT_TABPAGE_REMOVEDALL ); + CallEventListeners( VclEventId::TabpageRemovedAll ); } void TabControl::EnablePage( sal_uInt16 i_nPageId, bool i_bEnable ) @@ -1869,7 +1869,7 @@ void TabControl::SelectTabPage( sal_uInt16 nPageId ) { ImplFreeLayoutData(); - CallEventListeners( VCLEVENT_TABPAGE_DEACTIVATE, reinterpret_cast<void*>(mnCurPageId) ); + CallEventListeners( VclEventId::TabpageDeactivate, reinterpret_cast<void*>(mnCurPageId) ); if ( DeactivatePage() ) { mnActPageId = nPageId; @@ -1880,7 +1880,7 @@ void TabControl::SelectTabPage( sal_uInt16 nPageId ) SetCurPageId( nPageId ); if( mpTabCtrlData->mpListBox ) mpTabCtrlData->mpListBox->SelectEntryPos( GetPagePos( nPageId ) ); - CallEventListeners( VCLEVENT_TABPAGE_ACTIVATE, reinterpret_cast<void*>(nPageId) ); + CallEventListeners( VclEventId::TabpageActivate, reinterpret_cast<void*>(nPageId) ); } } } @@ -1940,7 +1940,7 @@ void TabControl::SetPageText( sal_uInt16 nPageId, const OUString& rText ) if ( IsUpdateMode() ) Invalidate(); ImplFreeLayoutData(); - CallEventListeners( VCLEVENT_TABPAGE_PAGETEXTCHANGED, reinterpret_cast<void*>(nPageId) ); + CallEventListeners( VclEventId::TabpagePageTextChanged, reinterpret_cast<void*>(nPageId) ); } } diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx index 1b38fc55d8ce..5004862dd0cd 100644 --- a/vcl/source/edit/vclmedit.cxx +++ b/vcl/source/edit/vclmedit.cxx @@ -1070,7 +1070,7 @@ void VclMultiLineEdit::Modify() { aModifyHdlLink.Call( *this ); - CallEventListeners( VCLEVENT_EDIT_MODIFY ); + CallEventListeners( VclEventId::EditModify ); if ( pUpdateDataTimer ) pUpdateDataTimer->Start(); @@ -1078,12 +1078,12 @@ void VclMultiLineEdit::Modify() void VclMultiLineEdit::SelectionChanged() { - CallEventListeners(VCLEVENT_EDIT_SELECTIONCHANGED); + CallEventListeners(VclEventId::EditSelectionChanged); } void VclMultiLineEdit::CaretChanged() { - CallEventListeners(VCLEVENT_EDIT_CARETCHANGED); + CallEventListeners(VclEventId::EditCaretChanged); } IMPL_LINK_NOARG(VclMultiLineEdit, ImpUpdateDataHdl, Timer *, void) diff --git a/vcl/source/window/accessibility.cxx b/vcl/source/window/accessibility.cxx index ab2ac82bee85..0d0b21b60d8e 100644 --- a/vcl/source/window/accessibility.cxx +++ b/vcl/source/window/accessibility.cxx @@ -439,7 +439,7 @@ void Window::SetAccessibleName( const OUString& rName ) delete mpWindowImpl->mpAccessibleInfos->pAccessibleName; mpWindowImpl->mpAccessibleInfos->pAccessibleName = new OUString( rName ); - CallEventListeners( VCLEVENT_WINDOW_FRAMETITLECHANGED, &oldName ); + CallEventListeners( VclEventId::WindowFrameTitleChanged, &oldName ); } OUString Window::GetAccessibleName() const diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index 688cfb5116e5..1b789020c6ed 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -719,7 +719,7 @@ void Dialog::DataChanged( const DataChangedEvent& rDCEvt ) bool Dialog::Close() { VclPtr<vcl::Window> xWindow = this; - CallEventListeners( VCLEVENT_WINDOW_CLOSE ); + CallEventListeners( VclEventId::WindowClose ); if ( xWindow->IsDisposed() ) return false; diff --git a/vcl/source/window/dndeventdispatcher.cxx b/vcl/source/window/dndeventdispatcher.cxx index c9c5aa607463..e02d8fc0e8fd 100644 --- a/vcl/source/window/dndeventdispatcher.cxx +++ b/vcl/source/window/dndeventdispatcher.cxx @@ -70,7 +70,7 @@ vcl::Window* DNDEventDispatcher::findTopLevelWindow(Point location) IMPL_LINK(DNDEventDispatcher, WindowEventListener, VclWindowEvent&, rEvent, void) { - if (rEvent.GetId() == VCLEVENT_OBJECT_DYING) + if (rEvent.GetId() == VclEventId::ObjectDying) { designate_currentwindow(nullptr); } diff --git a/vcl/source/window/dockmgr.cxx b/vcl/source/window/dockmgr.cxx index 1467df89f029..7f32e74a9a8d 100644 --- a/vcl/source/window/dockmgr.cxx +++ b/vcl/source/window/dockmgr.cxx @@ -918,7 +918,7 @@ void ImplDockingWindowWrapper::StartDocking( const Point& rPoint, Rectangle& rRe { DockingData data( rPoint, rRect, IsFloatingMode() ); - GetWindow()->CallEventListeners( VCLEVENT_WINDOW_STARTDOCKING, &data ); + GetWindow()->CallEventListeners( VclEventId::WindowStartDocking, &data ); mbDocking = true; } @@ -926,7 +926,7 @@ bool ImplDockingWindowWrapper::Docking( const Point& rPoint, Rectangle& rRect ) { DockingData data( rPoint, rRect, IsFloatingMode() ); - GetWindow()->CallEventListeners( VCLEVENT_WINDOW_DOCKING, &data ); + GetWindow()->CallEventListeners( VclEventId::WindowDocking, &data ); rRect = data.maTrackRect; return data.mbFloating; } @@ -966,7 +966,7 @@ void ImplDockingWindowWrapper::EndDocking( const Rectangle& rRect, bool bFloatMo } EndDockingData data( aRect, IsFloatingMode(), IsDockingCanceled() ); - GetWindow()->CallEventListeners( VCLEVENT_WINDOW_ENDDOCKING, &data ); + GetWindow()->CallEventListeners( VclEventId::WindowEndDocking, &data ); mbDocking = false; @@ -979,7 +979,7 @@ void ImplDockingWindowWrapper::EndDocking( const Rectangle& rRect, bool bFloatMo bool ImplDockingWindowWrapper::PrepareToggleFloatingMode() { bool bFloating = true; - GetWindow()->CallEventListeners( VCLEVENT_WINDOW_PREPARETOGGLEFLOATING, &bFloating ); + GetWindow()->CallEventListeners( VclEventId::WindowPrepareToggleFloating, &bFloating ); return bFloating; } @@ -992,7 +992,7 @@ void ImplDockingWindowWrapper::ToggleFloatingMode() static_cast<DockingWindow*>(GetWindow())->ToggleFloatingMode(); // now notify listeners - GetWindow()->CallEventListeners( VCLEVENT_WINDOW_TOGGLEFLOATING ); + GetWindow()->CallEventListeners( VclEventId::WindowToggleFloating ); // must be enabled in Window::Notify to prevent permanent docking during mouse move mbStartDockingEnabled = false; @@ -1128,7 +1128,7 @@ IMPL_LINK_NOARG(ImplDockingWindowWrapper, PopupModeEnd, FloatingWindow*, void) mpFloatWin.disposeAndClear(); // call handler - which will destroy the window and thus the wrapper as well ! - GetWindow()->CallEventListeners( VCLEVENT_WINDOW_ENDPOPUPMODE, &aData ); + GetWindow()->CallEventListeners( VclEventId::WindowEndPopupMode, &aData ); } bool ImplDockingWindowWrapper::IsInPopupMode() const diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx index fe8492850299..67c67c0a7a3d 100644 --- a/vcl/source/window/dockwin.cxx +++ b/vcl/source/window/dockwin.cxx @@ -626,7 +626,7 @@ bool DockingWindow::PrepareToggleFloatingMode() bool DockingWindow::Close() { VclPtr<vcl::Window> xWindow = this; - CallEventListeners( VCLEVENT_WINDOW_CLOSE ); + CallEventListeners( VclEventId::WindowClose ); if ( xWindow->IsDisposed() ) return false; diff --git a/vcl/source/window/event.cxx b/vcl/source/window/event.cxx index 54997dda317d..e8bb662355ed 100644 --- a/vcl/source/window/event.cxx +++ b/vcl/source/window/event.cxx @@ -68,7 +68,7 @@ bool Window::PreNotify( NotifyEvent& rNEvt ) } if ( bCompoundFocusChanged || ( rNEvt.GetWindow() == this ) ) - CallEventListeners( VCLEVENT_WINDOW_GETFOCUS ); + CallEventListeners( VclEventId::WindowGetFocus ); } else if( rNEvt.GetType() == MouseNotifyEvent::LOSEFOCUS ) { @@ -80,7 +80,7 @@ bool Window::PreNotify( NotifyEvent& rNEvt ) } if ( bCompoundFocusChanged || ( rNEvt.GetWindow() == this ) ) - CallEventListeners( VCLEVENT_WINDOW_LOSEFOCUS ); + CallEventListeners( VclEventId::WindowLoseFocus ); } // #82968# mouse and key events will be notified after processing ( in ImplNotifyKeyMouseCommandEventListeners() )! @@ -203,7 +203,7 @@ bool Window::EventNotify( NotifyEvent& rNEvt ) return bRet; } -void Window::CallEventListeners( sal_uLong nEvent, void* pData ) +void Window::CallEventListeners( VclEventId nEvent, void* pData ) { VclWindowEvent aEvent( this, nEvent, pData ); @@ -400,7 +400,7 @@ void Window::ImplNotifyKeyMouseCommandEventListeners( NotifyEvent& rNEvt ) aCommandEvent = CommandEvent( ScreenToOutputPixel( aPos ), pCEvt->GetCommand(), pCEvt->IsMouseEvent(), pCEvt->GetEventData() ); } - CallEventListeners( VCLEVENT_WINDOW_COMMAND, &aCommandEvent ); + CallEventListeners( VclEventId::WindowCommand, &aCommandEvent ); } } } @@ -417,11 +417,11 @@ void Window::ImplNotifyKeyMouseCommandEventListeners( NotifyEvent& rNEvt ) if ( mpWindowImpl->mbCompoundControl || ( rNEvt.GetWindow() == this ) ) { if ( rNEvt.GetWindow() == this ) - CallEventListeners( VCLEVENT_WINDOW_MOUSEMOVE, const_cast<MouseEvent *>(rNEvt.GetMouseEvent()) ); + CallEventListeners( VclEventId::WindowMouseMove, const_cast<MouseEvent *>(rNEvt.GetMouseEvent()) ); else { MouseEvent aMouseEvent = ImplTranslateMouseEvent( *rNEvt.GetMouseEvent(), rNEvt.GetWindow(), this ); - CallEventListeners( VCLEVENT_WINDOW_MOUSEMOVE, &aMouseEvent ); + CallEventListeners( VclEventId::WindowMouseMove, &aMouseEvent ); } } } @@ -430,11 +430,11 @@ void Window::ImplNotifyKeyMouseCommandEventListeners( NotifyEvent& rNEvt ) if ( mpWindowImpl->mbCompoundControl || ( rNEvt.GetWindow() == this ) ) { if ( rNEvt.GetWindow() == this ) - CallEventListeners( VCLEVENT_WINDOW_MOUSEBUTTONUP, const_cast<MouseEvent *>(rNEvt.GetMouseEvent()) ); + CallEventListeners( VclEventId::WindowMouseButtonUp, const_cast<MouseEvent *>(rNEvt.GetMouseEvent()) ); else { MouseEvent aMouseEvent = ImplTranslateMouseEvent( *rNEvt.GetMouseEvent(), rNEvt.GetWindow(), this ); - CallEventListeners( VCLEVENT_WINDOW_MOUSEBUTTONUP, &aMouseEvent ); + CallEventListeners( VclEventId::WindowMouseButtonUp, &aMouseEvent ); } } } @@ -443,23 +443,23 @@ void Window::ImplNotifyKeyMouseCommandEventListeners( NotifyEvent& rNEvt ) if ( mpWindowImpl->mbCompoundControl || ( rNEvt.GetWindow() == this ) ) { if ( rNEvt.GetWindow() == this ) - CallEventListeners( VCLEVENT_WINDOW_MOUSEBUTTONDOWN, const_cast<MouseEvent *>(rNEvt.GetMouseEvent()) ); + CallEventListeners( VclEventId::WindowMouseButtonDown, const_cast<MouseEvent *>(rNEvt.GetMouseEvent()) ); else { MouseEvent aMouseEvent = ImplTranslateMouseEvent( *rNEvt.GetMouseEvent(), rNEvt.GetWindow(), this ); - CallEventListeners( VCLEVENT_WINDOW_MOUSEBUTTONDOWN, &aMouseEvent ); + CallEventListeners( VclEventId::WindowMouseButtonDown, &aMouseEvent ); } } } else if( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT ) { if ( mpWindowImpl->mbCompoundControl || ( rNEvt.GetWindow() == this ) ) - CallEventListeners( VCLEVENT_WINDOW_KEYINPUT, const_cast<KeyEvent *>(rNEvt.GetKeyEvent()) ); + CallEventListeners( VclEventId::WindowKeyInput, const_cast<KeyEvent *>(rNEvt.GetKeyEvent()) ); } else if( rNEvt.GetType() == MouseNotifyEvent::KEYUP ) { if ( mpWindowImpl->mbCompoundControl || ( rNEvt.GetWindow() == this ) ) - CallEventListeners( VCLEVENT_WINDOW_KEYUP, const_cast<KeyEvent *>(rNEvt.GetKeyEvent()) ); + CallEventListeners( VclEventId::WindowKeyUp, const_cast<KeyEvent *>(rNEvt.GetKeyEvent()) ); } if ( xWindow->IsDisposed() ) @@ -524,7 +524,7 @@ void Window::ImplCallResize() // #88419# Most classes don't call the base class in Resize() and Move(), // => Call ImpleResize/Move instead of Resize/Move directly... - CallEventListeners( VCLEVENT_WINDOW_RESIZE ); + CallEventListeners( VclEventId::WindowResize ); } void Window::ImplCallMove() @@ -566,7 +566,7 @@ void Window::ImplCallMove() Move(); - CallEventListeners( VCLEVENT_WINDOW_MOVE ); + CallEventListeners( VclEventId::WindowMove ); } void Window::ImplCallFocusChangeActivate( vcl::Window* pNewOverlapWindow, diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx index a0e0002c57be..0f42dd69887e 100644 --- a/vcl/source/window/layout.cxx +++ b/vcl/source/window/layout.cxx @@ -1544,7 +1544,7 @@ void VclFrame::setAllocation(const Size &rAllocation) IMPL_LINK(VclFrame, WindowEventListener, VclWindowEvent&, rEvent, void) { - if (rEvent.GetId() == VCLEVENT_OBJECT_DYING) + if (rEvent.GetId() == VclEventId::ObjectDying) designate_label(nullptr); } diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index 0727b30c1e5f..00b931e32ba9 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -141,7 +141,7 @@ Menu::~Menu() void Menu::dispose() { - ImplCallEventListeners( VCLEVENT_OBJECT_DYING, ITEMPOS_INVALID ); + ImplCallEventListeners( VclEventId::ObjectDying, ITEMPOS_INVALID ); // at the window free the reference to the accessible component // and make sure the MenuFloatingWindow knows about our destruction @@ -210,7 +210,7 @@ void Menu::Activate() ImplMenuDelData aDelData( this ); - ImplCallEventListeners( VCLEVENT_MENU_ACTIVATE, ITEMPOS_INVALID ); + ImplCallEventListeners( VclEventId::MenuActivate, ITEMPOS_INVALID ); if( !aDelData.isDeleted() ) { @@ -251,7 +251,7 @@ void Menu::Deactivate() ImplMenuDelData aDelData( this ); Menu* pStartMenu = ImplGetStartMenu(); - ImplCallEventListeners( VCLEVENT_MENU_DEACTIVATE, ITEMPOS_INVALID ); + ImplCallEventListeners( VclEventId::MenuDeactivate, ITEMPOS_INVALID ); if( !aDelData.isDeleted() ) { @@ -300,7 +300,7 @@ void Menu::Select() { ImplMenuDelData aDelData( this ); - ImplCallEventListeners( VCLEVENT_MENU_SELECT, GetItemPos( GetCurItemId() ) ); + ImplCallEventListeners( VclEventId::MenuSelect, GetItemPos( GetCurItemId() ) ); if ( !aDelData.isDeleted() && !aSelectHdl.Call( this ) ) { if( !aDelData.isDeleted() ) @@ -328,14 +328,14 @@ void Menu::ImplSelectWithStart( Menu* pSMenu ) } #endif -void Menu::ImplCallEventListeners( sal_uLong nEvent, sal_uInt16 nPos ) +void Menu::ImplCallEventListeners( VclEventId nEvent, sal_uInt16 nPos ) { ImplMenuDelData aDelData( this ); VclMenuEvent aEvent( this, nEvent, nPos ); // This is needed by atk accessibility bridge - if ( nEvent == VCLEVENT_MENU_HIGHLIGHT ) + if ( nEvent == VclEventId::MenuHighlight ) { Application::ImplCallEventListeners( aEvent ); } @@ -404,7 +404,7 @@ void Menu::InsertItem(sal_uInt16 nItemId, const OUString& rStr, MenuItemBits nIt if ( pWin->IsVisible() ) pWin->Invalidate(); } - ImplCallEventListeners( VCLEVENT_MENU_INSERTITEM, nPos ); + ImplCallEventListeners( VclEventId::MenuInsertItem, nPos ); } void Menu::InsertItem(sal_uInt16 nItemId, const Image& rImage, @@ -546,7 +546,7 @@ void Menu::InsertSeparator(const OString &rIdent, sal_uInt16 nPos) delete mpLayoutData; mpLayoutData = nullptr; - ImplCallEventListeners( VCLEVENT_MENU_INSERTITEM, nPos ); + ImplCallEventListeners( VclEventId::MenuInsertItem, nPos ); } void Menu::RemoveItem( sal_uInt16 nPos ) @@ -574,7 +574,7 @@ void Menu::RemoveItem( sal_uInt16 nPos ) mpLayoutData = nullptr; if ( bRemove ) - ImplCallEventListeners( VCLEVENT_MENU_REMOVEITEM, nPos ); + ImplCallEventListeners( VclEventId::MenuRemoveItem, nPos ); } void ImplCopyItem( Menu* pThis, const Menu& rMenu, sal_uInt16 nPos, sal_uInt16 nNewPos ) @@ -804,7 +804,7 @@ void Menu::SetPopupMenu( sal_uInt16 nItemId, PopupMenu* pMenu ) oldSubMenu.disposeAndClear(); - ImplCallEventListeners( VCLEVENT_MENU_SUBMENUCHANGED, nPos ); + ImplCallEventListeners( VclEventId::MenuSubmenuChanged, nPos ); } PopupMenu* Menu::GetPopupMenu( sal_uInt16 nItemId ) const @@ -932,7 +932,7 @@ void Menu::CheckItem( sal_uInt16 nItemId, bool bCheck ) if( ImplGetSalMenu() ) ImplGetSalMenu()->CheckItem( nPos, bCheck ); - ImplCallEventListeners( bCheck ? VCLEVENT_MENU_ITEMCHECKED : VCLEVENT_MENU_ITEMUNCHECKED, nPos ); + ImplCallEventListeners( bCheck ? VclEventId::MenuItemChecked : VclEventId::MenuItemUnchecked, nPos ); } bool Menu::IsItemChecked( sal_uInt16 nItemId ) const @@ -976,7 +976,7 @@ void Menu::EnableItem( sal_uInt16 nItemId, bool bEnable ) if( ImplGetSalMenu() ) ImplGetSalMenu()->EnableItem( nPos, bEnable ); - ImplCallEventListeners( bEnable ? VCLEVENT_MENU_ENABLE : VCLEVENT_MENU_DISABLE, nPos ); + ImplCallEventListeners( bEnable ? VclEventId::MenuEnable : VclEventId::MenuDisable, nPos ); } } @@ -1039,7 +1039,7 @@ void Menu::SetItemText( sal_uInt16 nItemId, const OUString& rStr ) pWin->Invalidate(); } - ImplCallEventListeners( VCLEVENT_MENU_ITEMTEXTCHANGED, nPos ); + ImplCallEventListeners( VclEventId::MenuItemTextChanged, nPos ); } } @@ -2137,7 +2137,7 @@ void Menu::ImplCallHighlight(sal_uInt16 nItem) MenuItemData* pData = pItemList->GetDataFromPos(nItem); if ( pData ) nSelectedId = pData->nId; - ImplCallEventListeners( VCLEVENT_MENU_HIGHLIGHT, GetItemPos( GetCurItemId() ) ); + ImplCallEventListeners( VclEventId::MenuHighlight, GetItemPos( GetCurItemId() ) ); if( !aDelData.isDeleted() ) nSelectedId = 0; @@ -2635,7 +2635,7 @@ bool MenuBar::HandleMenuHighlightEvent( Menu *pMenu, sal_uInt16 nHighlightEventI ImplMenuDelData aDelData( pMenu ); if( mnHighlightedItemPos != ITEMPOS_INVALID ) - pMenu->ImplCallEventListeners( VCLEVENT_MENU_DEHIGHLIGHT, mnHighlightedItemPos ); + pMenu->ImplCallEventListeners( VclEventId::MenuDehighlight, mnHighlightedItemPos ); if( !aDelData.isDeleted() ) { @@ -2949,7 +2949,7 @@ sal_uInt16 PopupMenu::ImplExecute( const VclPtr<vcl::Window>& pW, const Rectangl { pData->bIsTemporary = true; } - ImplCallEventListeners(VCLEVENT_MENU_SUBMENUCHANGED, nPos); + ImplCallEventListeners(VclEventId::MenuSubmenuChanged, nPos); } } else if (!(nMenuFlags & MenuFlags::NoAutoMnemonics)) @@ -3037,7 +3037,7 @@ sal_uInt16 PopupMenu::ImplExecute( const VclPtr<vcl::Window>& pW, const Rectangl aPos = static_cast<MenuFloatingWindow *>(pSFrom->pWindow.get())->GetHighlightedItem(); pWin->SetPosInParent( aPos ); // store position to be sent in SUBMENUDEACTIVATE - pSFrom->ImplCallEventListeners( VCLEVENT_MENU_SUBMENUACTIVATE, aPos ); + pSFrom->ImplCallEventListeners( VclEventId::MenuSubmenuActivate, aPos ); } } if ( bPreSelectFirst ) diff --git a/vcl/source/window/menubarwindow.cxx b/vcl/source/window/menubarwindow.cxx index f412db46a7cd..f92290104608 100644 --- a/vcl/source/window/menubarwindow.cxx +++ b/vcl/source/window/menubarwindow.cxx @@ -255,11 +255,11 @@ IMPL_LINK( MenuBarWindow, ToolboxEventHdl, VclWindowEvent&, rEvent, void ) MenuBar::MenuBarButtonCallbackArg aArg; aArg.nId = 0xffff; - aArg.bHighlight = (rEvent.GetId() == VCLEVENT_TOOLBOX_HIGHLIGHT); + aArg.bHighlight = (rEvent.GetId() == VclEventId::ToolboxHighlight); aArg.pMenuBar = dynamic_cast<MenuBar*>(pMenu.get()); - if( rEvent.GetId() == VCLEVENT_TOOLBOX_HIGHLIGHT ) + if( rEvent.GetId() == VclEventId::ToolboxHighlight ) aArg.nId = aCloseBtn->GetHighlightItemId(); - else if( rEvent.GetId() == VCLEVENT_TOOLBOX_HIGHLIGHTOFF ) + else if( rEvent.GetId() == VclEventId::ToolboxHighlightOff ) { sal_uInt16 nPos = static_cast< sal_uInt16 >(reinterpret_cast<sal_IntPtr>(rEvent.GetData())); aArg.nId = aCloseBtn->GetItemId(nPos); @@ -276,10 +276,10 @@ IMPL_LINK( MenuBarWindow, ShowHideListener, VclWindowEvent&, rEvent, void ) if( ! pMenu ) return; - if( rEvent.GetId() == VCLEVENT_WINDOW_SHOW ) - pMenu->ImplCallEventListeners( VCLEVENT_MENU_SHOW, ITEMPOS_INVALID ); - else if( rEvent.GetId() == VCLEVENT_WINDOW_HIDE ) - pMenu->ImplCallEventListeners( VCLEVENT_MENU_HIDE, ITEMPOS_INVALID ); + if( rEvent.GetId() == VclEventId::WindowShow ) + pMenu->ImplCallEventListeners( VclEventId::MenuShow, ITEMPOS_INVALID ); + else if( rEvent.GetId() == VclEventId::WindowHide ) + pMenu->ImplCallEventListeners( VclEventId::MenuHide, ITEMPOS_INVALID ); } void MenuBarWindow::ImplCreatePopup( bool bPreSelectFirst ) @@ -502,7 +502,7 @@ void MenuBarWindow::ChangeHighlightItem( sal_uInt16 n, bool bSelectEntry, bool b if ( nHighlightedItem != nRolloveredItem ) Invalidate(); //HighlightItem( nHighlightedItem, false ); - pMenu->ImplCallEventListeners( VCLEVENT_MENU_DEHIGHLIGHT, nHighlightedItem ); + pMenu->ImplCallEventListeners( VclEventId::MenuDehighlight, nHighlightedItem ); } nHighlightedItem = (sal_uInt16)n; diff --git a/vcl/source/window/menufloatingwindow.cxx b/vcl/source/window/menufloatingwindow.cxx index 366aeed1ad1d..79586c00c9cc 100644 --- a/vcl/source/window/menufloatingwindow.cxx +++ b/vcl/source/window/menufloatingwindow.cxx @@ -65,7 +65,7 @@ void MenuFloatingWindow::doShutdown() // #105373# notify toolkit that highlight was removed // otherwise the entry will not be read when the menu is opened again if( nHighlightedItem != ITEMPOS_INVALID ) - pMenu->ImplCallEventListeners( VCLEVENT_MENU_DEHIGHLIGHT, nHighlightedItem ); + pMenu->ImplCallEventListeners( VclEventId::MenuDehighlight, nHighlightedItem ); if (!bKeyInput && pMenu && pMenu->pStartedFrom && !pMenu->pStartedFrom->IsMenuBar()) { // #102461# remove highlight in parent @@ -374,10 +374,10 @@ IMPL_LINK( MenuFloatingWindow, ShowHideListener, VclWindowEvent&, rEvent, void ) if( ! pMenu ) return; - if( rEvent.GetId() == VCLEVENT_WINDOW_SHOW ) - pMenu->ImplCallEventListeners( VCLEVENT_MENU_SHOW, ITEMPOS_INVALID ); - else if( rEvent.GetId() == VCLEVENT_WINDOW_HIDE ) - pMenu->ImplCallEventListeners( VCLEVENT_MENU_HIDE, ITEMPOS_INVALID ); + if( rEvent.GetId() == VclEventId::WindowShow ) + pMenu->ImplCallEventListeners( VclEventId::MenuShow, ITEMPOS_INVALID ); + else if( rEvent.GetId() == VclEventId::WindowHide ) + pMenu->ImplCallEventListeners( VclEventId::MenuHide, ITEMPOS_INVALID ); } void MenuFloatingWindow::EnableScrollMenu( bool b ) @@ -444,7 +444,7 @@ void MenuFloatingWindow::StopExecute() } // notify parent, needed for accessibility if( pMenu && pMenu->pStartedFrom ) - pMenu->pStartedFrom->ImplCallEventListeners( VCLEVENT_MENU_SUBMENUDEACTIVATE, nPosInParent ); + pMenu->pStartedFrom->ImplCallEventListeners( VclEventId::MenuSubmenuDeactivate, nPosInParent ); } void MenuFloatingWindow::KillActivePopup( PopupMenu* pThisOnly ) @@ -703,7 +703,7 @@ void MenuFloatingWindow::ChangeHighlightItem( sal_uInt16 n, bool bStartPopupTime if ( nHighlightedItem != ITEMPOS_INVALID ) { InvalidateItem(nHighlightedItem); - pMenu->ImplCallEventListeners( VCLEVENT_MENU_DEHIGHLIGHT, nHighlightedItem ); + pMenu->ImplCallEventListeners( VclEventId::MenuDehighlight, nHighlightedItem ); } nHighlightedItem = (sal_uInt16)n; diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx index 4d71a01a6ce3..52b9e3744bde 100644 --- a/vcl/source/window/paint.cxx +++ b/vcl/source/window/paint.cxx @@ -999,7 +999,7 @@ void Window::PostPaint(vcl::RenderContext& /*rRenderContext*/) void Window::Paint(vcl::RenderContext& /*rRenderContext*/, const Rectangle& rRect) { - CallEventListeners(VCLEVENT_WINDOW_PAINT, const_cast<Rectangle *>(&rRect)); + CallEventListeners(VclEventId::WindowPaint, const_cast<Rectangle *>(&rRect)); } void Window::SetPaintTransparent( bool bTransparent ) diff --git a/vcl/source/window/settings.cxx b/vcl/source/window/settings.cxx index 16b0e4101b07..6bb516eb956e 100644 --- a/vcl/source/window/settings.cxx +++ b/vcl/source/window/settings.cxx @@ -130,7 +130,7 @@ void Window::UpdateSettings( const AllSettings& rSettings, bool bChild ) DataChangedEvent aDCEvt( DataChangedEventType::SETTINGS, &aOldSettings, nChangeFlags ); DataChanged( aDCEvt ); // notify data change handler - CallEventListeners( VCLEVENT_WINDOW_DATACHANGED, &aDCEvt); + CallEventListeners( VclEventId::WindowDataChanged, &aDCEvt); } if ( bChild ) diff --git a/vcl/source/window/stacking.cxx b/vcl/source/window/stacking.cxx index 019dc0545b24..cba9b3f1b912 100644 --- a/vcl/source/window/stacking.cxx +++ b/vcl/source/window/stacking.cxx @@ -732,8 +732,8 @@ void Window::ImplResetReallyVisible() // For this, the data member of the event must not be NULL. // Previously, we did this in Window::Show, but there some events got lost in certain situations. if( bBecameReallyInvisible && ImplIsAccessibleCandidate() ) - CallEventListeners( VCLEVENT_WINDOW_HIDE, this ); - // TODO. It's kind of a hack that we're re-using the VCLEVENT_WINDOW_HIDE. Normally, we should + CallEventListeners( VclEventId::WindowHide, this ); + // TODO. It's kind of a hack that we're re-using the VclEventId::WindowHide. Normally, we should // introduce another event which explicitly triggers the Accessibility implementations. vcl::Window* pWindow = mpWindowImpl->mpFirstOverlap; diff --git a/vcl/source/window/status.cxx b/vcl/source/window/status.cxx index 5a48fbdcd13b..8aab54b743a2 100644 --- a/vcl/source/window/status.cxx +++ b/vcl/source/window/status.cxx @@ -449,7 +449,7 @@ void StatusBar::ImplDrawItem(vcl::RenderContext& rRenderContext, bool bOffScreen } if (!rRenderContext.ImplIsRecordLayout()) - CallEventListeners(VCLEVENT_STATUSBAR_DRAWITEM, reinterpret_cast<void*>(pItem->mnId)); + CallEventListeners(VclEventId::StatusbarDrawItem, reinterpret_cast<void*>(pItem->mnId)); } void DrawProgress(vcl::Window* pWindow, vcl::RenderContext& rRenderContext, const Point& rPos, @@ -876,13 +876,13 @@ void StatusBar::DataChanged( const DataChangedEvent& rDCEvt ) void StatusBar::Click() { - CallEventListeners( VCLEVENT_STATUSBAR_CLICK ); + CallEventListeners( VclEventId::StatusbarClick ); maClickHdl.Call( this ); } void StatusBar::DoubleClick() { - CallEventListeners( VCLEVENT_STATUSBAR_DOUBLECLICK ); + CallEventListeners( VclEventId::StatusbarDoubleClick ); maDoubleClickHdl.Call( this ); } @@ -929,7 +929,7 @@ void StatusBar::InsertItem( sal_uInt16 nItemId, sal_uLong nWidth, if ( ImplIsItemUpdate() ) Invalidate(); - CallEventListeners( VCLEVENT_STATUSBAR_ITEMADDED, reinterpret_cast<void*>(nItemId) ); + CallEventListeners( VclEventId::StatusbarItemAdded, reinterpret_cast<void*>(nItemId) ); } void StatusBar::RemoveItem( sal_uInt16 nItemId ) @@ -944,7 +944,7 @@ void StatusBar::RemoveItem( sal_uInt16 nItemId ) if ( ImplIsItemUpdate() ) Invalidate(); - CallEventListeners( VCLEVENT_STATUSBAR_ITEMREMOVED, reinterpret_cast<void*>(nItemId) ); + CallEventListeners( VclEventId::StatusbarItemRemoved, reinterpret_cast<void*>(nItemId) ); } } @@ -963,7 +963,7 @@ void StatusBar::ShowItem( sal_uInt16 nItemId ) if ( ImplIsItemUpdate() ) Invalidate(); - CallEventListeners( VCLEVENT_STATUSBAR_SHOWITEM, reinterpret_cast<void*>(nItemId) ); + CallEventListeners( VclEventId::StatusbarShowItem, reinterpret_cast<void*>(nItemId) ); } } } @@ -983,7 +983,7 @@ void StatusBar::HideItem( sal_uInt16 nItemId ) if ( ImplIsItemUpdate() ) Invalidate(); - CallEventListeners( VCLEVENT_STATUSBAR_HIDEITEM, reinterpret_cast<void*>(nItemId) ); + CallEventListeners( VclEventId::StatusbarHideItem, reinterpret_cast<void*>(nItemId) ); } } } @@ -1010,7 +1010,7 @@ void StatusBar::Clear() if ( ImplIsItemUpdate() ) Invalidate(); - CallEventListeners( VCLEVENT_STATUSBAR_ALLITEMSREMOVED ); + CallEventListeners( VclEventId::StatusbarAllItemsRemoved ); } sal_uInt16 StatusBar::GetItemCount() const @@ -1468,7 +1468,7 @@ void StatusBar::SetAccessibleName( sal_uInt16 nItemId, const OUString& rName ) if ( pItem->maAccessibleName != rName ) { pItem->maAccessibleName = rName; - CallEventListeners( VCLEVENT_STATUSBAR_NAMECHANGED, reinterpret_cast<void*>(pItem->mnId) ); + CallEventListeners( VclEventId::StatusbarNameChanged, reinterpret_cast<void*>(pItem->mnId) ); } } } diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx index 100f12120f1c..1d19490c8368 100644 --- a/vcl/source/window/syswin.cxx +++ b/vcl/source/window/syswin.cxx @@ -272,7 +272,7 @@ TaskPaneList* SystemWindow::GetTaskPaneList() bool SystemWindow::Close() { VclPtr<vcl::Window> xWindow = this; - CallEventListeners( VCLEVENT_WINDOW_CLOSE ); + CallEventListeners( VclEventId::WindowClose ); if ( xWindow->IsDisposed() ) return false; @@ -936,7 +936,7 @@ void SystemWindow::SetMenuBar(MenuBar* pMenuBar) pOldWindow = nullptr; if ( pOldWindow ) { - CallEventListeners( VCLEVENT_WINDOW_MENUBARREMOVED, static_cast<void*>(pOldMenuBar) ); + CallEventListeners( VclEventId::WindowMenubarRemoved, static_cast<void*>(pOldMenuBar) ); pOldWindow->SetAccessible( css::uno::Reference< css::accessibility::XAccessible >() ); } if ( pMenuBar ) @@ -946,7 +946,7 @@ void SystemWindow::SetMenuBar(MenuBar* pMenuBar) pNewWindow = MenuBar::ImplCreate(mpWindowImpl->mpBorderWindow, pOldWindow, pMenuBar); static_cast<ImplBorderWindow*>(mpWindowImpl->mpBorderWindow.get())->SetMenuBarWindow(pNewWindow); - CallEventListeners( VCLEVENT_WINDOW_MENUBARADDED, static_cast<void*>(pMenuBar) ); + CallEventListeners( VclEventId::WindowMenubarAdded, static_cast<void*>(pMenuBar) ); } else static_cast<ImplBorderWindow*>(mpWindowImpl->mpBorderWindow.get())->SetMenuBarWindow( nullptr ); diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx index 7d51ab3d1582..6ad9c21822fe 100644 --- a/vcl/source/window/toolbox.cxx +++ b/vcl/source/window/toolbox.cxx @@ -3622,7 +3622,7 @@ void ToolBox::MouseMove( const MouseEvent& rMEvt ) if ( mnCurPos != TOOLBOX_ITEM_NOTFOUND ) { InvalidateItem(mnCurPos); - CallEventListeners( VCLEVENT_TOOLBOX_HIGHLIGHTOFF, reinterpret_cast< void* >( mnCurPos ) ); + CallEventListeners( VclEventId::ToolboxHighlightOff, reinterpret_cast< void* >( mnCurPos ) ); } mnCurPos = nNewPos; @@ -3719,7 +3719,7 @@ void ToolBox::MouseMove( const MouseEvent& rMEvt ) ImplHideFocus(); sal_uInt16 nPos = GetItemPos( mnHighItemId ); InvalidateItem(nPos); - CallEventListeners( VCLEVENT_TOOLBOX_HIGHLIGHTOFF, reinterpret_cast< void* >( nPos ) ); + CallEventListeners( VclEventId::ToolboxHighlightOff, reinterpret_cast< void* >( nPos ) ); } if ( mpData->mbMenubuttonSelected ) { @@ -3729,7 +3729,7 @@ void ToolBox::MouseMove( const MouseEvent& rMEvt ) mnHighItemId = it->mnId; InvalidateItem(nTempPos); ImplShowFocus(); - CallEventListeners( VCLEVENT_TOOLBOX_HIGHLIGHT ); + CallEventListeners( VclEventId::ToolboxHighlight ); } } } @@ -3757,7 +3757,7 @@ void ToolBox::MouseMove( const MouseEvent& rMEvt ) { InvalidateItem(nClearPos); if( nClearPos != mnCurPos ) - CallEventListeners( VCLEVENT_TOOLBOX_HIGHLIGHTOFF, reinterpret_cast< void* >( nClearPos ) ); + CallEventListeners( VclEventId::ToolboxHighlightOff, reinterpret_cast< void* >( nClearPos ) ); } ImplHideFocus(); mnHighItemId = 0; @@ -5358,7 +5358,7 @@ void ToolBox::ImplChangeHighlight( ImplToolItem* pItem, bool bNoGrabFocus ) // set mnHighItemId to 0 already to prevent this hen/egg problem mnHighItemId = 0; InvalidateItem(nPos); - CallEventListeners( VCLEVENT_TOOLBOX_HIGHLIGHTOFF, reinterpret_cast< void* >( nPos ) ); + CallEventListeners( VclEventId::ToolboxHighlightOff, reinterpret_cast< void* >( nPos ) ); } if( !bNoGrabFocus && pItem != pOldItem && pOldItem && pOldItem->mpWindow ) @@ -5401,7 +5401,7 @@ void ToolBox::ImplChangeHighlight( ImplToolItem* pItem, bool bNoGrabFocus ) if( pItem->mpWindow ) pItem->mpWindow->GrabFocus(); if( pItem != pOldItem ) - CallEventListeners( VCLEVENT_TOOLBOX_HIGHLIGHT ); + CallEventListeners( VclEventId::ToolboxHighlight ); } } else diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx index 04ba01cd1603..38d8dd7a4531 100644 --- a/vcl/source/window/toolbox2.cxx +++ b/vcl/source/window/toolbox2.cxx @@ -299,7 +299,7 @@ void ToolBox::ImplInvalidate( bool bNewCalc, bool bFullPaint ) } // request new layout by layoutmanager - CallEventListeners( VCLEVENT_TOOLBOX_FORMATCHANGED ); + CallEventListeners( VclEventId::ToolboxFormatChanged ); } void ToolBox::ImplUpdateItem( sal_uInt16 nIndex ) @@ -327,40 +327,40 @@ void ToolBox::ImplUpdateItem( sal_uInt16 nIndex ) void ToolBox::Click() { - CallEventListeners( VCLEVENT_TOOLBOX_CLICK ); + CallEventListeners( VclEventId::ToolboxClick ); maClickHdl.Call( this ); } void ToolBox::DoubleClick() { - CallEventListeners( VCLEVENT_TOOLBOX_DOUBLECLICK ); + CallEventListeners( VclEventId::ToolboxDoubleClick ); maDoubleClickHdl.Call( this ); } void ToolBox::Activate() { mnActivateCount++; - CallEventListeners( VCLEVENT_TOOLBOX_ACTIVATE ); + CallEventListeners( VclEventId::ToolboxActivate ); maActivateHdl.Call( this ); } void ToolBox::Deactivate() { mnActivateCount--; - CallEventListeners( VCLEVENT_TOOLBOX_DEACTIVATE ); + CallEventListeners( VclEventId::ToolboxDeactivate ); maDeactivateHdl.Call( this ); } void ToolBox::Highlight() { - CallEventListeners( VCLEVENT_TOOLBOX_HIGHLIGHT ); + CallEventListeners( VclEventId::ToolboxHighlight ); } void ToolBox::Select() { VclPtr<vcl::Window> xWindow = this; - CallEventListeners( VCLEVENT_TOOLBOX_SELECT ); + CallEventListeners( VclEventId::ToolboxSelect ); maSelectHdl.Call( this ); if ( xWindow->IsDisposed() ) @@ -388,7 +388,7 @@ void ToolBox::InsertItem( sal_uInt16 nItemId, const Image& rImage, ToolBoxItemBi // Notify sal_uInt16 nNewPos = sal::static_int_cast<sal_uInt16>(( nPos == TOOLBOX_APPEND ) ? ( mpData->m_aItems.size() - 1 ) : nPos); - CallEventListeners( VCLEVENT_TOOLBOX_ITEMADDED, reinterpret_cast< void* >(nNewPos ) ); + CallEventListeners( VclEventId::ToolboxItemAdded, reinterpret_cast< void* >(nNewPos ) ); } void ToolBox::InsertItem( sal_uInt16 nItemId, const Image& rImage, const OUString& rText, ToolBoxItemBits nBits, @@ -408,7 +408,7 @@ void ToolBox::InsertItem( sal_uInt16 nItemId, const Image& rImage, const OUStrin // Notify sal_uInt16 nNewPos = sal::static_int_cast<sal_uInt16>(( nPos == TOOLBOX_APPEND ) ? ( mpData->m_aItems.size() - 1 ) : nPos); - CallEventListeners( VCLEVENT_TOOLBOX_ITEMADDED, reinterpret_cast< void* >( nNewPos ) ); + CallEventListeners( VclEventId::ToolboxItemAdded, reinterpret_cast< void* >( nNewPos ) ); } void ToolBox::InsertItem( sal_uInt16 nItemId, const OUString& rText, ToolBoxItemBits nBits, sal_uInt16 nPos ) @@ -426,7 +426,7 @@ void ToolBox::InsertItem( sal_uInt16 nItemId, const OUString& rText, ToolBoxItem // Notify sal_uInt16 nNewPos = sal::static_int_cast<sal_uInt16>(( nPos == TOOLBOX_APPEND ) ? ( mpData->m_aItems.size() - 1 ) : nPos); - CallEventListeners( VCLEVENT_TOOLBOX_ITEMADDED, reinterpret_cast< void* >( nNewPos ) ); + CallEventListeners( VclEventId::ToolboxItemAdded, reinterpret_cast< void* >( nNewPos ) ); } void ToolBox::InsertItem(const OUString& rCommand, const css::uno::Reference<css::frame::XFrame>& rFrame, ToolBoxItemBits nBits, @@ -479,7 +479,7 @@ void ToolBox::InsertWindow( sal_uInt16 nItemId, vcl::Window* pWindow, // Notify sal_uInt16 nNewPos = sal::static_int_cast<sal_uInt16>(( nPos == TOOLBOX_APPEND ) ? ( mpData->m_aItems.size() - 1 ) : nPos); - CallEventListeners( VCLEVENT_TOOLBOX_ITEMADDED, reinterpret_cast< void* >( nNewPos ) ); + CallEventListeners( VclEventId::ToolboxItemAdded, reinterpret_cast< void* >( nNewPos ) ); } void ToolBox::InsertSpace() @@ -495,7 +495,7 @@ void ToolBox::InsertSpace() // Notify sal_uInt16 nNewPos = sal::static_int_cast<sal_uInt16>(mpData->m_aItems.size() - 1); - CallEventListeners( VCLEVENT_TOOLBOX_ITEMADDED, reinterpret_cast< void* >( nNewPos ) ); + CallEventListeners( VclEventId::ToolboxItemAdded, reinterpret_cast< void* >( nNewPos ) ); } void ToolBox::InsertSeparator( sal_uInt16 nPos, sal_uInt16 nPixSize ) @@ -513,7 +513,7 @@ void ToolBox::InsertSeparator( sal_uInt16 nPos, sal_uInt16 nPixSize ) // Notify sal_uInt16 nNewPos = sal::static_int_cast<sal_uInt16>(( nPos == TOOLBOX_APPEND ) ? ( mpData->m_aItems.size() - 1 ) : nPos); - CallEventListeners( VCLEVENT_TOOLBOX_ITEMADDED, reinterpret_cast< void* >( nNewPos ) ); + CallEventListeners( VclEventId::ToolboxItemAdded, reinterpret_cast< void* >( nNewPos ) ); } void ToolBox::InsertBreak( sal_uInt16 nPos ) @@ -529,7 +529,7 @@ void ToolBox::InsertBreak( sal_uInt16 nPos ) // Notify sal_uInt16 nNewPos = sal::static_int_cast<sal_uInt16>(( nPos == TOOLBOX_APPEND ) ? ( mpData->m_aItems.size() - 1 ) : nPos); - CallEventListeners( VCLEVENT_TOOLBOX_ITEMADDED, reinterpret_cast< void* >( nNewPos ) ); + CallEventListeners( VclEventId::ToolboxItemAdded, reinterpret_cast< void* >( nNewPos ) ); } void ToolBox::RemoveItem( sal_uInt16 nPos ) @@ -560,7 +560,7 @@ void ToolBox::RemoveItem( sal_uInt16 nPos ) mpData->ImplClearLayoutData(); // Notify - CallEventListeners( VCLEVENT_TOOLBOX_ITEMREMOVED, reinterpret_cast< void* >( nPos ) ); + CallEventListeners( VclEventId::ToolboxItemRemoved, reinterpret_cast< void* >( nPos ) ); } } @@ -587,7 +587,7 @@ void ToolBox::CopyItem( const ToolBox& rToolBox, sal_uInt16 nItemId ) // Notify sal_uInt16 nNewPos2 = sal::static_int_cast<sal_uInt16>(mpData->m_aItems.size() - 1); - CallEventListeners( VCLEVENT_TOOLBOX_ITEMADDED, reinterpret_cast< void* >( nNewPos2 ) ); + CallEventListeners( VclEventId::ToolboxItemAdded, reinterpret_cast< void* >( nNewPos2 ) ); } } @@ -603,7 +603,7 @@ void ToolBox::Clear() ImplInvalidate( true, true ); // Notify - CallEventListeners( VCLEVENT_TOOLBOX_ALLITEMSCHANGED ); + CallEventListeners( VclEventId::ToolboxAllItemsChanged ); } void ToolBox::SetButtonType( ButtonType eNewType ) @@ -1078,10 +1078,10 @@ void ToolBox::SetItemText( sal_uInt16 nItemId, const OUString& rText ) pItem->maText = MnemonicGenerator::EraseAllMnemonicChars(rText); // Notify button changed event to prepare accessibility bridge - CallEventListeners( VCLEVENT_TOOLBOX_BUTTONSTATECHANGED, reinterpret_cast< void* >( nPos ) ); + CallEventListeners( VclEventId::ToolboxButtonStateChanged, reinterpret_cast< void* >( nPos ) ); // Notify - CallEventListeners( VCLEVENT_TOOLBOX_ITEMTEXTCHANGED, reinterpret_cast< void* >( nPos ) ); + CallEventListeners( VclEventId::ToolboxItemTextChanged, reinterpret_cast< void* >( nPos ) ); } } @@ -1106,7 +1106,7 @@ void ToolBox::SetItemWindow( sal_uInt16 nItemId, vcl::Window* pNewWindow ) if ( pNewWindow ) pNewWindow->Hide(); ImplInvalidate( true ); - CallEventListeners( VCLEVENT_TOOLBOX_ITEMWINDOWCHANGED, reinterpret_cast< void* >( nPos ) ); + CallEventListeners( VclEventId::ToolboxItemWindowChanged, reinterpret_cast< void* >( nPos ) ); } } @@ -1252,10 +1252,10 @@ void ToolBox::SetItemState( sal_uInt16 nItemId, TriState eState ) ImplUpdateItem( nPos ); // Notify button changed event to prepare accessibility bridge - CallEventListeners( VCLEVENT_TOOLBOX_BUTTONSTATECHANGED, reinterpret_cast< void* >( nPos ) ); + CallEventListeners( VclEventId::ToolboxButtonStateChanged, reinterpret_cast< void* >( nPos ) ); // Call accessible listener to notify state_changed event - CallEventListeners( VCLEVENT_TOOLBOX_ITEMUPDATED, reinterpret_cast< void* >(nPos) ); + CallEventListeners( VclEventId::ToolboxItemUpdated, reinterpret_cast< void* >(nPos) ); } } } @@ -1293,9 +1293,9 @@ void ToolBox::EnableItem( sal_uInt16 nItemId, bool bEnable ) ImplUpdateInputEnable(); // Notify button changed event to prepare accessibility bridge - CallEventListeners( VCLEVENT_TOOLBOX_BUTTONSTATECHANGED, reinterpret_cast< void* >( nPos ) ); + CallEventListeners( VclEventId::ToolboxButtonStateChanged, reinterpret_cast< void* >( nPos ) ); - CallEventListeners( bEnable ? VCLEVENT_TOOLBOX_ITEMENABLED : VCLEVENT_TOOLBOX_ITEMDISABLED, reinterpret_cast< void* >( nPos ) ); + CallEventListeners( bEnable ? VclEventId::ToolboxItemEnabled : VclEventId::ToolboxItemDisabled, reinterpret_cast< void* >( nPos ) ); } } } @@ -1672,7 +1672,7 @@ void ToolBox::UpdateCustomMenu() IMPL_LINK( ToolBox, ImplCustomMenuListener, VclMenuEvent&, rEvent, void ) { - if( rEvent.GetMenu() == GetMenu() && rEvent.GetId() == VCLEVENT_MENU_SELECT ) + if( rEvent.GetMenu() == GetMenu() && rEvent.GetId() == VclEventId::MenuSelect ) { sal_uInt16 id = GetMenu()->GetItemId( rEvent.GetItemPos() ); if( id >= TOOLBOX_MENUITEM_START ) diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx index 7bba641f6463..1bf8a4defef3 100644 --- a/vcl/source/window/window.cxx +++ b/vcl/source/window/window.cxx @@ -164,12 +164,12 @@ void Window::dispose() mpWindowImpl->mbInDispose = true; - CallEventListeners( VCLEVENT_OBJECT_DYING ); + CallEventListeners( VclEventId::ObjectDying ); // do not send child events for frames that were registered as native frames if( !ImplIsAccessibleNativeFrame() && mpWindowImpl->mbReallyVisible ) if ( ImplIsAccessibleCandidate() && GetAccessibleParentWindow() ) - GetAccessibleParentWindow()->CallEventListeners( VCLEVENT_WINDOW_CHILDDESTROYED, this ); + GetAccessibleParentWindow()->CallEventListeners( VclEventId::WindowChildDestroyed, this ); // remove associated data structures from dockingmanager ImplGetDockingManager()->RemoveWindow( this ); @@ -1178,7 +1178,7 @@ void Window::ImplInit( vcl::Window* pParent, WinBits nStyle, SystemParentData* p ImplInitAppFontData( this ); if ( GetAccessibleParentWindow() && GetParent() != Application::GetDefDialogParent() ) - GetAccessibleParentWindow()->CallEventListeners( VCLEVENT_WINDOW_CHILDCREATED, this ); + GetAccessibleParentWindow()->CallEventListeners( VclEventId::WindowChildCreated, this ); } void Window::ImplInitAppFontData( vcl::Window* pWindow ) @@ -1300,8 +1300,8 @@ void Window::ImplSetReallyVisible() // Previously, we did this in Window::Show, but there some events got lost in certain situations. Now // we're doing it when the visibility really changes if( bBecameReallyVisible && ImplIsAccessibleCandidate() ) - CallEventListeners( VCLEVENT_WINDOW_SHOW, this ); - // TODO. It's kind of a hack that we're re-using the VCLEVENT_WINDOW_SHOW. Normally, we should + CallEventListeners( VclEventId::WindowShow, this ); + // TODO. It's kind of a hack that we're re-using the VclEventId::WindowShow. Normally, we should // introduce another event which explicitly triggers the Accessibility implementations. vcl::Window* pWindow = mpWindowImpl->mpFirstOverlap; @@ -1914,7 +1914,7 @@ void Window::RequestHelp( const HelpEvent& rHEvt ) void Window::Command( const CommandEvent& rCEvt ) { - CallEventListeners( VCLEVENT_WINDOW_COMMAND, const_cast<CommandEvent *>(&rCEvt) ); + CallEventListeners( VclEventId::WindowCommand, const_cast<CommandEvent *>(&rCEvt) ); NotifyEvent aNEvt( MouseNotifyEvent::COMMAND, this, &rCEvt ); if ( !CompatNotify( aNEvt ) ) @@ -2383,7 +2383,7 @@ void Window::Show(bool bVisible, ShowFlags nFlags) // Since #104887#, the notifications for the access bridge are done in Impl(Set|Reset)ReallyVisible. Here, we // now only notify with a NULL data pointer, for all other clients except the access bridge. if ( !bRealVisibilityChanged ) - CallEventListeners( mpWindowImpl->mbVisible ? VCLEVENT_WINDOW_SHOW : VCLEVENT_WINDOW_HIDE ); + CallEventListeners( mpWindowImpl->mbVisible ? VclEventId::WindowShow : VclEventId::WindowHide ); if( xWindow->IsDisposed() ) return; @@ -2465,7 +2465,7 @@ void Window::Enable( bool bEnable, bool bChild ) mpWindowImpl->mpSysObj->Enable( bEnable && !mpWindowImpl->mbInputDisabled ); CompatStateChanged( StateChangedType::Enable ); - CallEventListeners( bEnable ? VCLEVENT_WINDOW_ENABLED : VCLEVENT_WINDOW_DISABLED ); + CallEventListeners( bEnable ? VclEventId::WindowEnabled : VclEventId::WindowDisabled ); } if ( bChild ) @@ -3060,17 +3060,17 @@ void Window::SetText( const OUString& rStr ) else if ( mpWindowImpl->mbFrame ) mpWindowImpl->mpFrame->SetTitle( rStr ); - CallEventListeners( VCLEVENT_WINDOW_FRAMETITLECHANGED, &oldTitle ); + CallEventListeners( VclEventId::WindowFrameTitleChanged, &oldTitle ); // #107247# needed for accessibility - // The VCLEVENT_WINDOW_FRAMETITLECHANGED is (mis)used to notify accessible name changes. + // The VclEventId::WindowFrameTitleChanged is (mis)used to notify accessible name changes. // Therefore a window, which is labeled by this window, must also notify an accessible // name change. if ( IsReallyVisible() ) { vcl::Window* pWindow = GetAccessibleRelationLabelFor(); if ( pWindow && pWindow != this ) - pWindow->CallEventListeners( VCLEVENT_WINDOW_FRAMETITLECHANGED, &oldTitle ); + pWindow->CallEventListeners( VclEventId::WindowFrameTitleChanged, &oldTitle ); } CompatStateChanged( StateChangedType::Text ); @@ -3184,7 +3184,7 @@ void Window::ImplCallDeactivateListeners( vcl::Window *pNew ) if ( !pNew || !ImplIsChild( pNew ) ) { VclPtr<vcl::Window> xWindow(this); - CallEventListeners( VCLEVENT_WINDOW_DEACTIVATE ); + CallEventListeners( VclEventId::WindowDeactivate ); if( xWindow->IsDisposed() ) return; @@ -3201,7 +3201,7 @@ void Window::ImplCallActivateListeners( vcl::Window *pOld ) if ( !pOld || !ImplIsChild( pOld ) ) { VclPtr<vcl::Window> xWindow(this); - CallEventListeners( VCLEVENT_WINDOW_ACTIVATE, pOld ); + CallEventListeners( VclEventId::WindowActivate, pOld ); if( xWindow->IsDisposed() ) return; @@ -3473,10 +3473,10 @@ void Window::ImplIsInTaskPaneList( bool mbIsInTaskList ) void Window::ImplNotifyIconifiedState( bool bIconified ) { - mpWindowImpl->mpFrameWindow->CallEventListeners( bIconified ? VCLEVENT_WINDOW_MINIMIZE : VCLEVENT_WINDOW_NORMALIZE ); + mpWindowImpl->mpFrameWindow->CallEventListeners( bIconified ? VclEventId::WindowMinimize : VclEventId::WindowNormalize ); // #109206# notify client window as well to have toolkit topwindow listeners notified if( mpWindowImpl->mpFrameWindow->mpWindowImpl->mpClientWindow && mpWindowImpl->mpFrameWindow != mpWindowImpl->mpFrameWindow->mpWindowImpl->mpClientWindow ) - mpWindowImpl->mpFrameWindow->mpWindowImpl->mpClientWindow->CallEventListeners( bIconified ? VCLEVENT_WINDOW_MINIMIZE : VCLEVENT_WINDOW_NORMALIZE ); + mpWindowImpl->mpFrameWindow->mpWindowImpl->mpClientWindow->CallEventListeners( bIconified ? VclEventId::WindowMinimize : VclEventId::WindowNormalize ); } bool Window::HasActiveChildFrame() diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index 4b5ce2a4f4f0..effc5bb0591a 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -862,20 +862,20 @@ static bool ImplHandleKey( vcl::Window* pWindow, MouseNotifyEvent nSVEvent, KeyEvent aKeyEvent( (sal_Unicode)nCharCode, aKeyCode, nRepeat ); if( bForward ) { - sal_uInt16 nVCLEvent; + VclEventId nVCLEvent; switch( nSVEvent ) { case MouseNotifyEvent::KEYINPUT: - nVCLEvent = VCLEVENT_WINDOW_KEYINPUT; + nVCLEvent = VclEventId::WindowKeyInput; break; case MouseNotifyEvent::KEYUP: - nVCLEvent = VCLEVENT_WINDOW_KEYUP; + nVCLEvent = VclEventId::WindowKeyUp; break; default: - nVCLEvent = 0; + nVCLEvent = VclEventId::NONE; break; } - if( nVCLEvent && Application::HandleKey( nVCLEvent, pWindow, &aKeyEvent ) ) + if( nVCLEvent != VclEventId::NONE && Application::HandleKey( nVCLEvent, pWindow, &aKeyEvent ) ) return true; } diff --git a/vcl/unx/gtk/a11y/atkutil.cxx b/vcl/unx/gtk/a11y/atkutil.cxx index 34192595a8de..e2f3573125e3 100644 --- a/vcl/unx/gtk/a11y/atkutil.cxx +++ b/vcl/unx/gtk/a11y/atkutil.cxx @@ -508,11 +508,11 @@ static void handle_get_focus(::VclWindowEvent const * pEvent) vcl::Window *pWindow = pEvent->GetWindow(); - // The menu bar is handled through VCLEVENT_MENU_HIGHLIGHTED + // The menu bar is handled through VclEventId::MenuHighlightED if( ! pWindow || !pWindow->IsReallyVisible() || pWindow->GetType() == WINDOW_MENUBARWINDOW ) return; - // ToolBoxes are handled through VCLEVENT_TOOLBOX_HIGHLIGHT + // ToolBoxes are handled through VclEventId::ToolboxHighlight if( pWindow->GetType() == WINDOW_TOOLBOX ) return; @@ -601,28 +601,28 @@ void WindowEventHandler(void *, VclSimpleEvent& rEvent) { switch (rEvent.GetId()) { - case VCLEVENT_WINDOW_SHOW: + case VclEventId::WindowShow: break; - case VCLEVENT_WINDOW_HIDE: + case VclEventId::WindowHide: break; - case VCLEVENT_WINDOW_CLOSE: + case VclEventId::WindowClose: break; - case VCLEVENT_WINDOW_GETFOCUS: + case VclEventId::WindowGetFocus: handle_get_focus(static_cast< ::VclWindowEvent const * >(&rEvent)); break; - case VCLEVENT_WINDOW_LOSEFOCUS: + case VclEventId::WindowLoseFocus: break; - case VCLEVENT_WINDOW_MINIMIZE: + case VclEventId::WindowMinimize: break; - case VCLEVENT_WINDOW_NORMALIZE: + case VclEventId::WindowNormalize: break; - case VCLEVENT_WINDOW_KEYINPUT: - case VCLEVENT_WINDOW_KEYUP: - case VCLEVENT_WINDOW_COMMAND: - case VCLEVENT_WINDOW_MOUSEMOVE: + case VclEventId::WindowKeyInput: + case VclEventId::WindowKeyUp: + case VclEventId::WindowCommand: + case VclEventId::WindowMouseMove: break; - case VCLEVENT_MENU_HIGHLIGHT: + case VclEventId::MenuHighlight: if (const VclMenuEvent* pMenuEvent = dynamic_cast<const VclMenuEvent*>(&rEvent)) { handle_menu_highlighted(pMenuEvent); @@ -635,26 +635,26 @@ void WindowEventHandler(void *, VclSimpleEvent& rEvent) } break; - case VCLEVENT_TOOLBOX_HIGHLIGHT: + case VclEventId::ToolboxHighlight: handle_toolbox_highlight(static_cast< ::VclWindowEvent const * >(&rEvent)->GetWindow()); break; - case VCLEVENT_TOOLBOX_BUTTONSTATECHANGED: + case VclEventId::ToolboxButtonStateChanged: handle_toolbox_buttonchange(static_cast< ::VclWindowEvent const * >(&rEvent)); break; - case VCLEVENT_OBJECT_DYING: + case VclEventId::ObjectDying: g_aWindowList.list.erase( static_cast< ::VclWindowEvent const * >(&rEvent)->GetWindow() ); SAL_FALLTHROUGH; - case VCLEVENT_TOOLBOX_HIGHLIGHTOFF: + case VclEventId::ToolboxHighlightOff: handle_toolbox_highlightoff(static_cast< ::VclWindowEvent const * >(&rEvent)->GetWindow()); break; - case VCLEVENT_TABPAGE_ACTIVATE: + case VclEventId::TabpageActivate: handle_tabpage_activated(static_cast< ::VclWindowEvent const * >(&rEvent)->GetWindow()); break; - case VCLEVENT_COMBOBOX_SETTEXT: + case VclEventId::ComboboxSetText: // This looks quite strange to me. Stumbled over this when fixing #i104290#. // This kicked in when leaving the combobox in the toolbar, after that the events worked. // I guess this was a try to work around missing combobox events, which didn't do the full job, and shouldn't be necessary anymore. |