From 458c54990b0deae0ab43f18e01c6dd4f8a682cc7 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Sun, 27 Jul 2025 13:19:24 -0600
Subject: [PATCH] gtkmm2ext: change action registration functions to return
 ToggleAction or RadioAction

---
 libs/gtkmm2ext/actions.cc          | 23 ++++++++++-------------
 libs/gtkmm2ext/gtkmm2ext/actions.h |  8 ++++----
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/libs/gtkmm2ext/actions.cc b/libs/gtkmm2ext/actions.cc
index 073de5c4b7..087a0b839f 100644
--- a/libs/gtkmm2ext/actions.cc
+++ b/libs/gtkmm2ext/actions.cc
@@ -430,7 +430,7 @@ ActionManager::register_action (RefPtr<ActionGroup> group,
 	return RefPtr<Action>();
 }
 
-RefPtr<Action>
+RefPtr<RadioAction>
 ActionManager::register_radio_action (RefPtr<ActionGroup> group,
                                       Gtk::RadioAction::Group& rgroup,
                                       const char* name, const char* label,
@@ -439,9 +439,8 @@ ActionManager::register_radio_action (RefPtr<ActionGroup> group,
 	string fullpath;
 
 	DEBUG_TRACE (PBD::DEBUG::Actions, string_compose ("creating action %1 in %2\n", name, group->get_name()));
-	RefPtr<Action> act = RadioAction::create (rgroup, name, label);
+	RefPtr<RadioAction> act = RadioAction::create (rgroup, name, label);
 	DEBUG_TRACE (PBD::DEBUG::Actions, string_compose ("created action %1 in %2 success: %3\n", name, group->get_name(), (bool) act));
-	RefPtr<RadioAction> ract = RefPtr<RadioAction>::cast_dynamic(act);
 
 	fullpath = group->get_name();
 	fullpath += '/';
@@ -453,22 +452,20 @@ ActionManager::register_radio_action (RefPtr<ActionGroup> group,
 	}
 
 	/* already registered */
-	return RefPtr<Action>();
+	return RefPtr<RadioAction>();
 }
 
-RefPtr<Action>
+RefPtr<RadioAction>
 ActionManager::register_radio_action (RefPtr<ActionGroup> group,
                                       Gtk::RadioAction::Group& rgroup,
                                       const char* name, const char* label,
-                                      sigc::slot<void,GtkAction*> sl,
+                                      sigc::slot<void,GtkRadioAction*> sl,
                                       int value)
 {
 	string fullpath;
 
-	RefPtr<Action> act = RadioAction::create (rgroup, name, label);
+	RefPtr<RadioAction> act = RadioAction::create (rgroup, name, label);
 	DEBUG_TRACE (PBD::DEBUG::Actions, string_compose ("created radio-action %1 in %2 success: %3\n", name, group->get_name(), (bool) act));
-	RefPtr<RadioAction> ract = RefPtr<RadioAction>::cast_dynamic(act);
-	ract->property_value() = value;
 
 	fullpath = group->get_name();
 	fullpath += '/';
@@ -481,10 +478,10 @@ ActionManager::register_radio_action (RefPtr<ActionGroup> group,
 
 	/* already registered */
 
-	return RefPtr<Action>();
+	return RefPtr<RadioAction>();
 }
 
-RefPtr<Action>
+RefPtr<ToggleAction>
 ActionManager::register_toggle_action (RefPtr<ActionGroup> group,
                                    const char* name, const char* label, sigc::slot<void> sl)
 {
@@ -494,7 +491,7 @@ ActionManager::register_toggle_action (RefPtr<ActionGroup> group,
 	fullpath += '/';
 	fullpath += name;
 
-	RefPtr<Action> act = ToggleAction::create (name, label);
+	RefPtr<ToggleAction> act = ToggleAction::create (name, label);
 	DEBUG_TRACE (PBD::DEBUG::Actions, string_compose ("created action %1 in %2 success: %3\n", name, group->get_name(), (bool) act));
 
 	if (actions.insert (ActionMap::value_type (fullpath, act)).second) {
@@ -503,7 +500,7 @@ ActionManager::register_toggle_action (RefPtr<ActionGroup> group,
 	}
 
 	/* already registered */
-	return RefPtr<Action>();
+	return RefPtr<ToggleAction>();
 }
 
 void
diff --git a/libs/gtkmm2ext/gtkmm2ext/actions.h b/libs/gtkmm2ext/gtkmm2ext/actions.h
index 5b19bdba2a..528167fd24 100644
--- a/libs/gtkmm2ext/gtkmm2ext/actions.h
+++ b/libs/gtkmm2ext/gtkmm2ext/actions.h
@@ -87,16 +87,16 @@ namespace ActionManager {
 	LIBGTKMM2EXT_API extern Glib::RefPtr<Gtk::Action> register_action (Glib::RefPtr<Gtk::ActionGroup> group, const char* name, const char* label);
 	LIBGTKMM2EXT_API extern Glib::RefPtr<Gtk::Action> register_action (Glib::RefPtr<Gtk::ActionGroup> group,
 	                                                                   const char* name, const char* label, sigc::slot<void> sl);
-	LIBGTKMM2EXT_API extern Glib::RefPtr<Gtk::Action> register_radio_action (Glib::RefPtr<Gtk::ActionGroup> group,
+	LIBGTKMM2EXT_API extern Glib::RefPtr<Gtk::RadioAction> register_radio_action (Glib::RefPtr<Gtk::ActionGroup> group,
 	                                                 Gtk::RadioAction::Group&,
 	                                                 const char* name, const char* label,
-	                                                 sigc::slot<void,GtkAction*> sl,
+	                                                 sigc::slot<void,GtkRadioAction*> sl,
 	                                                 int value);
-	LIBGTKMM2EXT_API extern Glib::RefPtr<Gtk::Action> register_radio_action (Glib::RefPtr<Gtk::ActionGroup> group,
+	LIBGTKMM2EXT_API extern Glib::RefPtr<Gtk::RadioAction> register_radio_action (Glib::RefPtr<Gtk::ActionGroup> group,
 	                                                 Gtk::RadioAction::Group&,
 	                                                 const char* name, const char* label,
 	                                                 sigc::slot<void> sl);
-	LIBGTKMM2EXT_API extern Glib::RefPtr<Gtk::Action> register_toggle_action (Glib::RefPtr<Gtk::ActionGroup> group,
+	LIBGTKMM2EXT_API extern Glib::RefPtr<Gtk::ToggleAction> register_toggle_action (Glib::RefPtr<Gtk::ActionGroup> group,
 	                                                  const char* name, const char* label, sigc::slot<void> sl);
 
 	LIBGTKMM2EXT_API extern Glib::RefPtr<Gtk::Action>       get_action (const std::string& name, bool or_die = true);