diff options
| author | Noel Grandin <noel@peralex.com> | 2015-08-19 09:11:34 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-08-26 11:15:35 +0200 |
| commit | 167bc621ef825ed5b961502fe9324a675ee34e42 (patch) | |
| tree | 523838d8adc14a62f846529ee6eab3343b2fe87b /vcl/workben | |
| parent | 46a27805fb707544a844a961a3743b8b992282f0 (diff) | |
Convert vcl Button Link<> click handler to typed Link<Button*,void>
Change-Id: Ie80dfb003118d40741549c41ebcc7eda4819f05b
Diffstat (limited to 'vcl/workben')
| -rw-r--r-- | vcl/workben/svpclient.cxx | 10 | ||||
| -rw-r--r-- | vcl/workben/vcldemo.cxx | 6 |
2 files changed, 6 insertions, 10 deletions
diff --git a/vcl/workben/svpclient.cxx b/vcl/workben/svpclient.cxx index 183b018a3983..0a0dad1ec222 100644 --- a/vcl/workben/svpclient.cxx +++ b/vcl/workben/svpclient.cxx @@ -113,9 +113,9 @@ public: void parseList( const OString& rList ); static OString processCommand( const OString& rCommand ); - DECL_LINK( ListHdl, Button* ); + DECL_LINK_TYPED( ListHdl, Button*, void ); DECL_LINK( SelectHdl, ListBox* ); - DECL_STATIC_LINK( MyWin, QuitHdl, Button* ); + DECL_STATIC_LINK_TYPED( MyWin, QuitHdl, Button*, void ); }; void Main() @@ -231,16 +231,14 @@ OString MyWin::processCommand( const OString& rCommand ) return aAnswer.makeStringAndClear(); } -IMPL_LINK( MyWin, ListHdl, Button*, ) +IMPL_LINK_NOARG_TYPED( MyWin, ListHdl, Button*, void) { parseList( processCommand( "list" ) ); - return 0; } -IMPL_STATIC_LINK( MyWin, QuitHdl, Button*, ) +IMPL_STATIC_LINK_NOARG_TYPED( MyWin, QuitHdl, Button*, void) { processCommand( "quit" ); - return 0; } IMPL_LINK( MyWin, SelectHdl, ListBox*, ) diff --git a/vcl/workben/vcldemo.cxx b/vcl/workben/vcldemo.cxx index e9c22eb1ab5c..4706d29f8a33 100644 --- a/vcl/workben/vcldemo.cxx +++ b/vcl/workben/vcldemo.cxx @@ -1463,7 +1463,7 @@ class DemoWidgets : public WorkWindow VclPtr<ComboBox> mpGLCombo; VclPtr<PushButton> mpGLButton; - DECL_LINK(GLTestClick, void *); + DECL_LINK_TYPED(GLTestClick, Button*, void); public: DemoWidgets() : @@ -1554,7 +1554,7 @@ public: static void leave() { OpenGLZone::leave(); } }; -IMPL_LINK_NOARG(DemoWidgets,GLTestClick) +IMPL_LINK_NOARG_TYPED(DemoWidgets, GLTestClick, Button*, void) { sal_Int32 nSelected = mpGLCombo->GetSelectEntryPos(); @@ -1584,8 +1584,6 @@ IMPL_LINK_NOARG(DemoWidgets,GLTestClick) if (bEnterLeave) OpenGLZoneTest::leave(); - - return 0; } class DemoPopup : public FloatingWindow |