add chinese translation from Rui-huai Zhang

[ardour.git] / gtk2_ardour / mtest.cc

diff --git a/gtk2_ardour/mtest.cc b/gtk2_ardour/mtest.cc
index 1f9442e966212aac5f5333d14791922e8e5f9d57..3103a8305365d8aebf01703c1efce77013d80a0d 100644 (file)
--- a/gtk2_ardour/mtest.cc
+++ b/gtk2_ardour/mtest.cc
@@ -26,7 +26,6 @@
 
 using namespace Gtk;
 using namespace std;
-using namespace sigc;
 using namespace Glib;
 
 void
@@ -65,7 +64,7 @@ make_action (Glib::RefPtr<ActionGroup> group, string name, string label)
 }
 
 bool
-lookup_entry (const ustring accel_path, Gtk::AccelKey& key)
+lookup_entry (const string accel_path, Gtk::AccelKey& key)
 {
        GtkAccelKey gkey;
        bool known = gtk_accel_map_lookup_entry (accel_path.c_str(), &gkey);
@@ -135,13 +134,13 @@ main (int argc, char* argv[])
        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, 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);
+       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);
 
        act->connect_proxy (button);
        act->connect_proxy (other_button);