From 96369e97a014a279db61b8e37bc54270f7beaccb Mon Sep 17 00:00:00 2001
From: Luboš Luňák <l.lunak@collabora.com>
Date: Sun, 14 Sep 2014 13:07:31 +0200
Subject: convert ListBox's ImplBtn to use boost signal2

Change-Id: I18680e47688da02c9e211bf7f8d861622735e749
---
 vcl/source/control/combobox.cxx | 6 ++----
 vcl/source/control/ilstbox.cxx  | 4 ++--
 vcl/source/control/lstbox.cxx   | 8 +++-----
 3 files changed, 7 insertions(+), 11 deletions(-)

(limited to 'vcl/source')

diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index a5d619fc0af5..0ac87c7f203b 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -148,7 +148,7 @@ void ComboBox::ImplInit( Window* pParent, WinBits nStyle )
 
         mpBtn = new ImplBtn( this, WB_NOLIGHTBORDER | WB_RECTSTYLE );
         ImplInitDropDownButton( mpBtn );
-        mpBtn->SetMBDownHdl( LINK( this, ComboBox, ImplClickBtnHdl ) );
+        mpBtn->buttonDownSignal.connect( boost::bind( &ComboBox::ImplClickButtonHandler, this, _1 ));
         mpBtn->Show();
 
         nEditStyle |= WB_NOBORDER;
@@ -234,7 +234,7 @@ bool ComboBox::IsAutocompleteEnabled() const
     return mpSubEdit->GetAutocompleteHdl().IsSet();
 }
 
-IMPL_LINK_NOARG(ComboBox, ImplClickBtnHdl)
+void ComboBox::ImplClickButtonHandler( ImplBtn* )
 {
     ImplCallEventListeners( VCLEVENT_DROPDOWN_PRE_OPEN );
     mpSubEdit->GrabFocus();
@@ -250,8 +250,6 @@ IMPL_LINK_NOARG(ComboBox, ImplClickBtnHdl)
     ImplClearLayoutData();
     if( mpImplLB )
         mpImplLB->GetMainWindow().ImplClearLayoutData();
-
-    return 0;
 }
 
 IMPL_LINK_NOARG(ComboBox, ImplPopupModeEndHdl)
diff --git a/vcl/source/control/ilstbox.cxx b/vcl/source/control/ilstbox.cxx
index b1f02fca1f5a..bbc1f2ad5e53 100644
--- a/vcl/source/control/ilstbox.cxx
+++ b/vcl/source/control/ilstbox.cxx
@@ -2599,7 +2599,7 @@ ImplWin::ImplWin( Window* pParent, WinBits nWinStyle ) :
 void ImplWin::MBDown()
 {
     if( IsEnabled() )
-        maMBDownHdl.Call( this );
+        buttonDownSignal( this );
 }
 
 void ImplWin::MouseButtonDown( const MouseEvent& )
@@ -2874,7 +2874,7 @@ ImplBtn::ImplBtn( Window* pParent, WinBits nWinStyle ) :
 void ImplBtn::MBDown()
 {
     if( IsEnabled() )
-       maMBDownHdl.Call( this );
+       buttonDownSignal( this );
 }
 
 void ImplBtn::MouseButtonDown( const MouseEvent& )
diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx
index d6c676451445..ef18971d37fa 100644
--- a/vcl/source/control/lstbox.cxx
+++ b/vcl/source/control/lstbox.cxx
@@ -136,7 +136,7 @@ void ListBox::ImplInit( Window* pParent, WinBits nStyle )
         mpFloatWin->GetDropTarget()->addDropTargetListener(xDrop);
 
         mpImplWin = new ImplWin( this, (nStyle & (WB_LEFT|WB_RIGHT|WB_CENTER))|WB_NOBORDER );
-        mpImplWin->SetMBDownHdl( LINK( this, ListBox, ImplClickBtnHdl ) );
+        mpImplWin->buttonDownSignal.connect( boost::bind( &ListBox::ImplClickButtonHandler, this, _1 ));
         mpImplWin->SetUserDrawHdl( LINK( this, ListBox, ImplUserDrawHdl ) );
         mpImplWin->Show();
         mpImplWin->GetDropTarget()->addDropTargetListener(xDrop);
@@ -144,7 +144,7 @@ void ListBox::ImplInit( Window* pParent, WinBits nStyle )
 
         mpBtn = new ImplBtn( this, WB_NOLIGHTBORDER | WB_RECTSTYLE );
         ImplInitDropDownButton( mpBtn );
-        mpBtn->SetMBDownHdl( LINK( this, ListBox, ImplClickBtnHdl ) );
+        mpBtn->buttonDownSignal.connect( boost::bind( &ListBox::ImplClickButtonHandler, this, _1 ));
         mpBtn->Show();
         mpBtn->GetDropTarget()->addDropTargetListener(xDrop);
     }
@@ -299,7 +299,7 @@ IMPL_LINK_NOARG(ListBox, ImplDoubleClickHdl)
     return 1;
 }
 
-IMPL_LINK_NOARG(ListBox, ImplClickBtnHdl)
+void ListBox::ImplClickButtonHandler( Control* )
 {
     if( !mpFloatWin->IsInPopupMode() )
     {
@@ -315,8 +315,6 @@ IMPL_LINK_NOARG(ListBox, ImplClickBtnHdl)
         if( mpImplWin )
             mpImplWin->ImplClearLayoutData();
     }
-
-    return 0;
 }
 
 IMPL_LINK_NOARG(ListBox, ImplPopupModeEndHdl)
-- 
cgit