X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fdockable.cpp;h=4745311afe69fc9bf14aed7c384e85fe93930b88;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=cedaa39e69695699a2d59e3a36df9af836d15771;hpb=8ef042c40521681cea99944097c4f90a5ac6cf74;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/dockable.cpp b/synfig-studio/trunk/src/gtkmm/dockable.cpp index cedaa39..4745311 100644 --- a/synfig-studio/trunk/src/gtkmm/dockable.cpp +++ b/synfig-studio/trunk/src/gtkmm/dockable.cpp @@ -118,7 +118,7 @@ Dockable::Dockable(const synfig::String& name,const synfig::String& local_name,G // event_box->set_events(Gdk::ALL_EVENTS_MASK); //!< \todo change this to only allow what is necessary for DnD - Gtk::Button* bttn_close(manage(new Gtk::Button("X"))); + Gtk::Button* bttn_close(manage(new Gtk::Button(_("X")))); //table->attach(*bttn_close, 1, 2, 0,1, Gtk::SHRINK|Gtk::FILL, Gtk::SHRINK|Gtk::FILL, 0, 0); header_box_.pack_end(*bttn_close,false,false); bttn_close->show(); @@ -328,7 +328,8 @@ Dockable::add_button(const Gtk::StockID& stock_id, const synfig::String& tooltip //ret->set_relief(Gtk::RELIEF_HALF); //ret->set_relief(Gtk::RELIEF_NONE); ret->set_label(tooltip); - //toolbar_->get_tooltips_object()->set_tip(*ret,tooltip); + if (toolbar_->get_tooltips_object()) + toolbar_->get_tooltips_object()->set_tip(*ret,tooltip); ret->show(); //icon->show();