diff options
| author | Luboš Luňák <l.lunak@collabora.com> | 2014-09-14 13:36:10 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@collabora.com> | 2014-09-14 22:07:14 +0200 |
| commit | d6a83d3f91336e23b51bfc3b3d58da799760829f (patch) | |
| tree | 4873e64f7b8f44eb8c4c47138a9c186cc8dc6284 /vcl/inc | |
| parent | 96369e97a014a279db61b8e37bc54270f7beaccb (diff) | |
convert UserDrawHdl to boost signals2
Note that ImplListBox::userDrawSignal is connected to
ImplListBoxWindow::userDrawSignal to forward the signal, just like
the Link was previously forwarded.
Change-Id: Ic8fc6f51e309bc34fb4e39c13745302649991d0a
Diffstat (limited to 'vcl/inc')
| -rw-r--r-- | vcl/inc/ilstbox.hxx | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/vcl/inc/ilstbox.hxx b/vcl/inc/ilstbox.hxx index c8a49a4fa56e..2b049357ab7c 100644 --- a/vcl/inc/ilstbox.hxx +++ b/vcl/inc/ilstbox.hxx @@ -233,7 +233,6 @@ private: Link maSelectHdl; Link maCancelHdl; Link maDoubleClickHdl; - Link maUserDrawHdl; Link maMRUChangedHdl; Link maFocusHdl; Link maListItemSelectHdl; @@ -342,13 +341,13 @@ public: const Link& GetCancelHdl() const { return maCancelHdl; } void SetDoubleClickHdl( const Link& rLink ) { maDoubleClickHdl = rLink; } const Link& GetDoubleClickHdl() const { return maDoubleClickHdl; } - void SetUserDrawHdl( const Link& rLink ) { maUserDrawHdl = rLink; } - const Link& GetUserDrawHdl() const { return maUserDrawHdl; } void SetMRUChangedHdl( const Link& rLink ) { maMRUChangedHdl = rLink; } const Link& GetMRUChangedHdl() const { return maMRUChangedHdl; } void SetFocusHdl( const Link& rLink ) { maFocusHdl = rLink ; } const Link& GetFocusHdl() const { return maFocusHdl; } + boost::signals2::signal< void ( UserDrawEvent* ) > userDrawSignal; + void SetListItemSelectHdl( const Link& rLink ) { maListItemSelectHdl = rLink ; } const Link& GetListItemSelectHdl() const { return maListItemSelectHdl; } bool IsSelectionChanged() const { return mbSelectionChanged; } @@ -478,8 +477,8 @@ public: const Link& GetCancelHdl() const { return maLBWindow.GetCancelHdl(); } void SetDoubleClickHdl( const Link& rLink ) { maLBWindow.SetDoubleClickHdl( rLink ); } const Link& GetDoubleClickHdl() const { return maLBWindow.GetDoubleClickHdl(); } - void SetUserDrawHdl( const Link& rLink ) { maLBWindow.SetUserDrawHdl( rLink ); } - const Link& GetUserDrawHdl() const { return maLBWindow.GetUserDrawHdl(); } + + boost::signals2::signal< void ( UserDrawEvent* ) > userDrawSignal; void SetFocusHdl( const Link& rLink ) { maLBWindow.SetFocusHdl( rLink ); } const Link& GetFocusHdl() const { return maLBWindow.GetFocusHdl(); } @@ -555,8 +554,6 @@ private: Rectangle maFocusRect; Size maUserItemSize; - Link maUserDrawHdl; - /// bitfield bool mbUserDrawEnabled : 1; bool mbInUserDraw : 1; @@ -589,9 +586,7 @@ public: virtual void MBDown(); boost::signals2::signal< void ( ImplWin* ) > buttonDownSignal; - - void SetUserDrawHdl( const Link& rLink ) { maUserDrawHdl = rLink; } - const Link& GetUserDrawHdl() const { return maUserDrawHdl; } + boost::signals2::signal< void ( UserDrawEvent* ) > userDrawSignal; void SetUserItemSize( const Size& rSz ) { maUserItemSize = rSz; } const Size& GetUserItemSize() const { return maUserItemSize; } |