X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fmtest.cc;h=3103a8305365d8aebf01703c1efce77013d80a0d;hb=fc5c247aa152235a749180bd0e86efe0ce32a20a;hp=e3f3855010f27f710ec110295a566c4eef2e24f2;hpb=666e0870554705f4fb466fc6b188fe9b4000ca49;p=ardour.git

diff --git a/gtk2_ardour/mtest.cc b/gtk2_ardour/mtest.cc
index e3f3855010..3103a83053 100644
--- a/gtk2_ardour/mtest.cc
+++ b/gtk2_ardour/mtest.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000-2007 Paul Davis 
+    Copyright (C) 2000-2007 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -26,7 +26,6 @@
 
 using namespace Gtk;
 using namespace std;
-using namespace sigc;
 using namespace Glib;
 
 void
@@ -47,7 +46,7 @@ make_action (Glib::RefPtr<ActionGroup> group, string name, string label, RefPtr<
 	act->set_accel_group (accels);
 
 	cerr << "action " << name << " has path " << act->get_accel_path() << endl;
-	
+
 	return act;
 }
 
@@ -64,12 +63,12 @@ make_action (Glib::RefPtr<ActionGroup> group, string name, string label)
 	return act;
 }
 
-bool 
-lookup_entry (const ustring accel_path, Gtk::AccelKey& key)
+bool
+lookup_entry (const string accel_path, Gtk::AccelKey& key)
 {
 	GtkAccelKey gkey;
 	bool known = gtk_accel_map_lookup_entry (accel_path.c_str(), &gkey);
-	
+
 	if (known) {
 		key = AccelKey (gkey.accel_key, Gdk::ModifierType (gkey.accel_mods));
 	} else {
@@ -83,9 +82,9 @@ RefPtr<ActionGroup>
 copy_actions (const RefPtr<ActionGroup> src)
 {
 	RefPtr<ActionGroup> grp = ActionGroup::create (src->get_name());
-	
+
 	ListHandle<RefPtr<Action> > group_actions = src->get_actions();
-	
+
 	for (ListHandle<RefPtr<Action> >::iterator a = group_actions.begin(); a != group_actions.end(); ++a) {
 		RefPtr<Action> act = Action::create ((*a)->get_name(), (*a)->property_label());
 		grp->add (act);
@@ -129,20 +128,20 @@ main (int argc, char* argv[])
 
 	uimanager->add_ui_from_file ("mtest.menus");
 	other_uimanager->add_ui_from_file ("mtest_other.menus");
-	
+
 	// AccelMap::load ("mtest.bindings");
 
 	RefPtr<AccelGroup> accels = hidden.get_accel_group();
 
 	make_action (actions, "TopMenu", "top");
-	make_action (actions, "Foo", "foo", accels, bind (sigc::ptr_fun (printit), "foo"), GDK_p, Gdk::ModifierType (0));
+	make_action (actions, "Foo", "foo", accels, sigc::bind (sigc::ptr_fun (printit), "foo"), GDK_p, Gdk::ModifierType (0));
 
 	make_action (other_actions, "OTopMenu", "otop");
-	make_action (other_actions, "OFoo", "foo", accels, bind (sigc::ptr_fun (printit), "o-foo"), GDK_p, Gdk::ModifierType (0));
+	make_action (other_actions, "OFoo", "foo", accels, sigc::bind (sigc::ptr_fun (printit), "o-foo"), GDK_p, Gdk::ModifierType (0));
+
+	make_action (shared_actions, "Bar", "bar", accels, sigc::bind (sigc::ptr_fun (printit), "barshared"), GDK_p, Gdk::CONTROL_MASK);
+	RefPtr<Action> act = make_action (shared_actions, "Baz", "baz", accels, sigc::bind (sigc::ptr_fun (printit), "baz-shared"), GDK_p, Gdk::SHIFT_MASK);
 
-	make_action (shared_actions, "Bar", "bar", accels, bind (sigc::ptr_fun (printit), "barshared"), GDK_p, Gdk::CONTROL_MASK);
-	RefPtr<Action> act = make_action (shared_actions, "Baz", "baz", accels, bind (sigc::ptr_fun (printit), "baz-shared"), GDK_p, Gdk::SHIFT_MASK);
-	
 	act->connect_proxy (button);
 	act->connect_proxy (other_button);