Prevent compiler warnings about unused parameters.

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

diff --git a/synfig-studio/trunk/src/gtkmm/toolbox.cpp b/synfig-studio/trunk/src/gtkmm/toolbox.cpp
index 7559f32..22ba151 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/toolbox.cpp
+++ b/synfig-studio/trunk/src/gtkmm/toolbox.cpp
@@ -481,12 +481,15 @@ Toolbox::add_state(const Smach::state_base *state)
 
        String name=state->get_name();
 
+       Gtk::StockItem stock_item;
+       Gtk::Stock::lookup(Gtk::StockID("synfig-"+name),stock_item);
+
        Gtk::ToggleButton* button;
        button=manage(new class Gtk::ToggleButton());
 
-       icon=manage(new Gtk::Image(Gtk::StockID("synfig-"+name),Gtk::IconSize(4)));
+       icon=manage(new Gtk::Image(stock_item.get_stock_id(),Gtk::IconSize(4)));
        button->add(*icon);
-       tooltips.set_tip(*button,name);
+       tooltips.set_tip(*button,stock_item.get_label());
        icon->show();
        button->show();
 
@@ -554,19 +557,27 @@ Toolbox::on_recent_files_changed()
                recent_files_menu->remove(**recent_files_menu->get_children().begin());
 
        list<string>::const_iterator iter;
-       // Check to see if the file is already on the list.
-       // If it is, then remove it from the list
        for(iter=App::get_recent_files().begin();iter!=App::get_recent_files().end();iter++)
-               recent_files_menu->items().push_back(Gtk::Menu_Helpers::MenuElem(basename(*iter),
+       {
+               string raw = basename(*iter), quoted;
+               size_t pos = 0, last_pos = 0;
+
+               // replace _ in filenames by __ or it won't show up in the menu
+               for (pos = last_pos = 0; (pos = raw.find('_', pos)) != string::npos; last_pos = pos)
+                       quoted += raw.substr(last_pos, ++pos - last_pos) + '_';
+               quoted += raw.substr(last_pos);
+
+               recent_files_menu->items().push_back(Gtk::Menu_Helpers::MenuElem(quoted,
                        sigc::hide_return(sigc::bind(sigc::ptr_fun(&App::open),*iter))
                ));
+       }
 
        // HACK
        show();
 }
 
 void
-Toolbox::on_drop_drag_data_received(const Glib::RefPtr<Gdk::DragContext>& context, int x, int y, const Gtk::SelectionData& selection_data_, guint info, guint time)
+Toolbox::on_drop_drag_data_received(const Glib::RefPtr<Gdk::DragContext>& context, int /*x*/, int /*y*/, const Gtk::SelectionData& selection_data_, guint /*info*/, guint time)
 {
        // We will make this true once we have a solid drop
        bool success(false);