X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftags%2Fstable%2Fsrc%2Fgtkmm%2Fdockable.cpp;h=4745311afe69fc9bf14aed7c384e85fe93930b88;hb=47fce282611fbba1044921d22ca887f9b53ad91a;hp=588b5d43b7c84dedefa0cf85ff4b767c023e17b2;hpb=f6184c2a9c2245aae802c31c8f3300e1b744359c;p=synfig.git

diff --git a/synfig-studio/tags/stable/src/gtkmm/dockable.cpp b/synfig-studio/tags/stable/src/gtkmm/dockable.cpp
index 588b5d4..4745311 100644
--- a/synfig-studio/tags/stable/src/gtkmm/dockable.cpp
+++ b/synfig-studio/tags/stable/src/gtkmm/dockable.cpp
@@ -40,6 +40,8 @@
 #include <gtkmm/table.h>
 #include <gtk/gtk.h>
 
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -116,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();
@@ -201,7 +203,7 @@ Dockable::on_drag_data_received(const Glib::RefPtr<Gdk::DragContext>& context, i
 }
 
 void
-Dockable::on_drag_end(const Glib::RefPtr<Gdk::DragContext>&context)
+Dockable::on_drag_end(const Glib::RefPtr<Gdk::DragContext>&/*context*/)
 {
 	if(!dnd_success_)
 	{
@@ -211,13 +213,13 @@ Dockable::on_drag_end(const Glib::RefPtr<Gdk::DragContext>&context)
 }
 
 void
-Dockable::on_drag_begin(const Glib::RefPtr<Gdk::DragContext>&context)
+Dockable::on_drag_begin(const Glib::RefPtr<Gdk::DragContext>&/*context*/)
 {
 	dnd_success_=false;
 }
 
 void
-Dockable::on_drag_data_get(const Glib::RefPtr<Gdk::DragContext>&, Gtk::SelectionData& selection_data, guint info, guint time)
+Dockable::on_drag_data_get(const Glib::RefPtr<Gdk::DragContext>&, Gtk::SelectionData& selection_data, guint /*info*/, guint /*time*/)
 {
 	Dockable* tmp(this);
 	dnd_success_=true;
@@ -326,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();