X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Finstance.cpp;h=2d4ecdb918f2a185c136cb14b9f869e5f615efb7;hb=7cac384dc4dd35cc31e3cd16064747267e576b98;hp=1516eb0e1845e49362a2c4d68fff04073e8e76b7;hpb=0701c9f1b64c96d5ed536c110dfd6cff531cca61;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/instance.cpp b/synfig-studio/trunk/src/gtkmm/instance.cpp index 1516eb0..2d4ecdb 100644 --- a/synfig-studio/trunk/src/gtkmm/instance.cpp +++ b/synfig-studio/trunk/src/gtkmm/instance.cpp @@ -385,7 +385,6 @@ Instance::close() studio::App::instance_list.front()->canvas_view_list().front()->present(); } - void Instance::insert_canvas(Gtk::TreeRow row, synfig::Canvas::Handle canvas) { @@ -437,7 +436,6 @@ Instance::insert_canvas(Gtk::TreeRow row, synfig::Canvas::Handle canvas) */ } - /* void Instance::insert_value_node(Gtk::TreeRow row,Canvas::Handle canvas,etl::handle value_node) @@ -701,7 +699,6 @@ Instance::safe_close() return true; } - void Instance::add_actions_to_group(const Glib::RefPtr& action_group, synfig::String& ui_info, const synfigapp::Action::ParamList ¶m_list, synfigapp::Action::Category category)const { @@ -1019,7 +1016,6 @@ Instance::make_param_menu(Gtk::Menu *menu,synfig::Canvas::Handle canvas, synfiga param_list2.add("origin",location); } - // Populate the convert menu by looping through // the ValueNode book and find the ones that are // relevant. @@ -1085,10 +1081,7 @@ Instance::make_param_menu(Gtk::Menu *menu,synfig::Canvas::Handle canvas, synfiga sigc::bind( sigc::bind( sigc::bind( - sigc::bind( - sigc::mem_fun(*find_canvas_view(canvas),&studio::CanvasView::on_waypoint_clicked_canvasview), - synfig::Waypoint::SIDE_UNSPECIFIED - ), + sigc::mem_fun(*find_canvas_view(canvas),&studio::CanvasView::on_waypoint_clicked_canvasview), -1 ), waypoint_set @@ -1119,7 +1112,6 @@ edit_several_waypoints(etl::handle canvas_view, std::listpack_start(widget_waypoint_model); - dialog.add_button(Gtk::StockID("gtk-apply"),1); dialog.add_button(Gtk::StockID("gtk-cancel"),0); dialog.show(); @@ -1169,7 +1161,6 @@ edit_several_waypoints(etl::handle canvas_view, std::listset_param("canvas",canvas_view->get_canvas()); action->set_param("canvas_interface",canvas_interface); - if(!canvas_interface->get_instance()->perform_action(action)) { canvas_view->get_ui_interface()->error(_("Unable to convert to animated waypoint")); @@ -1183,10 +1174,8 @@ edit_several_waypoints(etl::handle canvas_view, std::list canvas_view, std::listset_param("canvas",canvas_view->get_canvas()); action->set_param("canvas_interface",canvas_interface); action->set_param("value_node",ValueNode::Handle(value_node));