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 /include | |
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>
Diffstat (limited to 'include')
-rw-r--r-- | include/svtools/dialogcontrolling.hxx | 8 | ||||
-rw-r--r-- | include/svtools/ivctrl.hxx | 2 | ||||
-rw-r--r-- | include/svtools/treelistbox.hxx | 2 | ||||
-rw-r--r-- | include/vcl/ctrl.hxx | 2 | ||||
-rw-r--r-- | include/vcl/menu.hxx | 2 | ||||
-rw-r--r-- | include/vcl/svapp.hxx | 8 | ||||
-rw-r--r-- | include/vcl/vclevent.hxx | 305 | ||||
-rw-r--r-- | include/vcl/window.hxx | 3 |
8 files changed, 166 insertions, 166 deletions
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; |