Use American spelling of 'initialise'.

[synfig.git] / synfig-studio / trunk / src / gtkmm / canvasview.cpp

diff --git a/synfig-studio/trunk/src/gtkmm/canvasview.cpp b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
index b6e093e..ac2b165 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/canvasview.cpp
+++ b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
@@ -802,7 +802,7 @@ CanvasView::CanvasView(etl::loose_handle<Instance> instance,etl::handle<synfigap
                //         WorkArea::async_update_preview() =>
                //           WorkArea::set_zoom(float) =>
                //                 WorkArea::async_update_preview() =>
-               //                       desc.set_time(cur_time), where cur_time isn't initialised
+               //                       desc.set_time(cur_time), where cur_time isn't initialized
                work_area->set_time(0);
                work_area->zoom_out();
                w=round_to_int(get_canvas()->rend_desc().get_w()*work_area->get_zoom()+70);
@@ -2196,6 +2196,8 @@ CanvasView::on_layer_user_click(int button, Gtk::TreeRow /*row*/, LayerTree::Col
                                parammenu.items().clear();
 
                                Gtk::Menu *newlayers(manage(new Gtk::Menu()));
+                               // do we need this?  the code is all #ifdef'ed out anyway
+                               // newlayers->signal_hide().connect(sigc::bind(sigc::ptr_fun(&delete_widget), newlayers));
                                build_new_layer_menu(*newlayers);
 
                                parammenu.items().push_back(Gtk::Menu_Helpers::MenuElem("New Layer",*newlayers));
@@ -2604,7 +2606,7 @@ CanvasView::rebuild_ducks_layer_(synfig::TransformStack& transform_stack, Canvas
                        // do the bounding box thing
                        bbox|=transform_stack.perform(layer->get_bounding_rect());
 
-                       // Grab the layer's list pf parameters
+                       // Grab the layer's list of parameters
                        Layer::ParamList paramlist(layer->get_param_list());
 
                        // Grab the layer vocabulary
@@ -2990,6 +2992,7 @@ CanvasView::on_waypoint_clicked(synfigapp::ValueDesc value_desc,synfig::Waypoint
        case 2:
                {
                        Gtk::Menu* waypoint_menu(manage(new Gtk::Menu()));
+                       waypoint_menu->signal_hide().connect(sigc::bind(sigc::ptr_fun(&delete_widget), waypoint_menu));
 
                        waypoint_menu->items().push_back(Gtk::Menu_Helpers::StockMenuElem(Gtk::StockID("gtk-jump-to"),
                                sigc::bind(
@@ -3137,8 +3140,8 @@ CanvasView::on_drop_drag_data_received(const Glib::RefPtr<Gdk::DragContext>& con
                                // Strip the "file://" part from the filename
                                filename=synfig::String(filename.begin()+sizeof("file://")-1,filename.end());
 
-                               String ext;
-                               try{ext=(String(filename.begin()+filename.find_last_of('.')+1,filename.end()));}catch(...){continue;}
+                               String ext(filename_extension(filename));
+                               if (ext.size()) ext = ext.substr(1); // skip initial '.'
 
                                // If this is a SIF file, then we need to do things slightly differently
                                if(ext=="sketch")