From c362a5af8fc91ee403f4fd16321118f92a43a290 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Fri, 31 Mar 2023 18:12:10 +0200 Subject: [PATCH] Allow compilation with MSVC and sigc++ 2.3 (revert this at some point) libsigc++ before 2.5.1 could not determine the return type of a value unless SIGC_FUNCTORS_DEDUCE_RESULT_TYPE_WITH_DECLTYPE was specified. --- gtk2_ardour/vca_master_strip.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gtk2_ardour/vca_master_strip.cc b/gtk2_ardour/vca_master_strip.cc index 9d45009600..9c29e60e0a 100644 --- a/gtk2_ardour/vca_master_strip.cc +++ b/gtk2_ardour/vca_master_strip.cc @@ -51,6 +51,8 @@ using std::string; PBD::Signal1 VCAMasterStrip::CatchDeletion; +static bool no_propagate (GdkEventButton*) { return false; } + VCAMasterStrip::VCAMasterStrip (Session* s, std::shared_ptr v) : SessionHandlePtr (s) , _vca (v) @@ -109,7 +111,7 @@ VCAMasterStrip::VCAMasterStrip (Session* s, std::shared_ptr v) /* horizontally centered, with a little space (5%) at the top */ vertical_button.set_angle (90); vertical_button.set_layout_font (UIConfiguration::instance().get_NormalBoldFont()); - vertical_button.signal_button_press_event().connect ([](GdkEventButton*) { return false;}, false); + vertical_button.signal_button_press_event().connect (sigc::ptr_fun (&no_propagate), false); vertical_button.signal_button_release_event().connect (sigc::mem_fun (*this, &VCAMasterStrip::vertical_button_release), false); vertical_button.set_fallthrough_to_parent (true); vertical_button.set_active_color (_vca->presentation_info().color ());