diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-11-20 15:59:17 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-11-30 20:40:57 +0100 |
| commit | aa0657e2983007c505b1223281df4a3a4eb6e73a (patch) | |
| tree | 81cd1d9d6292ee304c4bf9a5e042f924be699f28 /include | |
| parent | 97e91f6bbc2e81fdb8e6fbf55c551cf4b23fa8dd (diff) | |
weld ImplTabButtons
create a separate .ui for the ltr-in-rtl scroll arrow region
Change-Id: I2ec9099f7441ba82555270b5a99541cd7a989890
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106288
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/svtools/tabbar.hxx | 10 | ||||
| -rw-r--r-- | include/vcl/weldutils.hxx | 5 |
2 files changed, 10 insertions, 5 deletions
diff --git a/include/svtools/tabbar.hxx b/include/svtools/tabbar.hxx index 2a9d8a43eba3..8735e0728599 100644 --- a/include/svtools/tabbar.hxx +++ b/include/svtools/tabbar.hxx @@ -267,7 +267,9 @@ carried out over an item resp. over which item the mouse click has been carried out. */ +namespace weld { class Button; +} #define WB_RANGESELECT (WinBits(0x00200000)) #define WB_MULTISELECT (WinBits(0x00400000)) @@ -308,7 +310,6 @@ struct TabBar_Impl; class SVT_DLLPUBLIC TabBar : public vcl::Window { - friend class ImplTabButton; friend class ImplTabSizer; private: @@ -363,9 +364,10 @@ private: SVT_DLLPRIVATE void ImplPrePaint(); SVT_DLLPRIVATE ImplTabBarItem* ImplGetLastTabBarItem( sal_uInt16 nItemCount ); - DECL_DLLPRIVATE_LINK(ImplClickHdl, Button*, void); - - DECL_DLLPRIVATE_LINK(ImplAddClickHandler, Button*, void); + DECL_DLLPRIVATE_LINK(ImplClickHdl, weld::Button&, void); + DECL_DLLPRIVATE_LINK(ImplAddClickHandler, weld::Button&, void); + DECL_DLLPRIVATE_LINK(MousePressHdl, const MouseEvent&, bool); + DECL_DLLPRIVATE_LINK(ContextMenuHdl, const CommandEvent&, void); ImplTabBarItem* seek( size_t i ); ImplTabBarItem* prev(); diff --git a/include/vcl/weldutils.hxx b/include/vcl/weldutils.hxx index d956849a3292..ddd34d1ed787 100644 --- a/include/vcl/weldutils.hxx +++ b/include/vcl/weldutils.hxx @@ -397,6 +397,7 @@ private: weld::Button& m_rButton; AutoTimer m_aRepeat; const Link<Button&, void> m_aLink; + const Link<const CommandEvent&, void> m_aContextLink; bool m_bModKey; DECL_LINK(MousePressHdl, const MouseEvent&, bool); @@ -404,7 +405,9 @@ private: DECL_LINK(RepeatTimerHdl, Timer*, void); public: - ButtonPressRepeater(weld::Button& rButton, const Link<Button&, void>& rLink); + ButtonPressRepeater(weld::Button& rButton, const Link<Button&, void>& rLink, + const Link<const CommandEvent&, void>& rContextLink + = Link<const CommandEvent&, void>()); void Stop() { m_aRepeat.Stop(); } bool IsModKeyPressed() const { return m_bModKey; } }; |