13
0

Better version of 9ccc56e162, implicit signal disconnect

This commit is contained in:
Robin Gareus 2018-12-08 23:39:50 +01:00
parent 9004a0df7a
commit 2dc3c8b365
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
2 changed files with 2 additions and 11 deletions

View File

@ -220,17 +220,12 @@ CheckOption::CheckOption (string const & i, string const & n, Glib::RefPtr<Gtk::
Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (_action);
if (tact) {
action_toggled ();
_callback_connection = tact->signal_toggled().connect (sigc::mem_fun (*this, &CheckOption::action_toggled));
tact->signal_toggled().connect (sigc::mem_fun (*this, &CheckOption::action_toggled));
}
_action->connect_property_changed ("sensitive", sigc::mem_fun (*this, &CheckOption::action_sensitivity_changed));
}
CheckOption::~CheckOption ()
{
_callback_connection.disconnect ();
}
void
CheckOption::action_toggled ()
{

View File

@ -189,11 +189,10 @@ protected:
};
/** Just a Gtk Checkbutton, masquerading as an option component */
class CheckOption : public OptionEditorComponent , public Gtkmm2ext::Activatable
class CheckOption : public OptionEditorComponent , public Gtkmm2ext::Activatable, public sigc::trackable
{
public:
CheckOption (std::string const &, std::string const &, Glib::RefPtr<Gtk::Action> act );
virtual ~CheckOption ();
void set_state_from_config () {}
void parameter_changed (std::string const &) {}
void add_to_page (OptionEditorPage*);
@ -213,9 +212,6 @@ protected:
Gtk::CheckButton* _button; ///< UI button
Gtk::Label* _label; ///< label for button, so we can use markup
private:
sigc::connection _callback_connection;
};
/** Component which provides the UI to handle a boolean option using a GTK CheckButton */