X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fdockable.h;h=7b0083ad8967d7178ed3752ee170a41b0c30f7e2;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=940fe54376769edc59a9a6be69c4ee998a605517;hpb=3a3c4bca3a17137bec5d7960560934b91ef4146e;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/dockable.h b/synfig-studio/trunk/src/gtkmm/dockable.h
index 940fe54..7b0083a 100644
--- a/synfig-studio/trunk/src/gtkmm/dockable.h
+++ b/synfig-studio/trunk/src/gtkmm/dockable.h
@@ -1,35 +1,36 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!	\file dockable.h
 **	\brief Template Header
 **
-**	$Id: dockable.h,v 1.1.1.1 2005/01/07 03:34:36 darco Exp $
+**	$Id$
 **
 **	\legal
-**	Copyright (c) 2002 Robert B. Quattlebaum Jr.
+**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
 **
-**	This software and associated documentation
-**	are CONFIDENTIAL and PROPRIETARY property of
-**	the above-mentioned copyright holder.
+**	This package is free software; you can redistribute it and/or
+**	modify it under the terms of the GNU General Public License as
+**	published by the Free Software Foundation; either version 2 of
+**	the License, or (at your option) any later version.
 **
-**	You may not copy, print, publish, or in any
-**	other way distribute this software without
-**	a prior written agreement with
-**	the copyright holder.
+**	This package is distributed in the hope that it will be useful,
+**	but WITHOUT ANY WARRANTY; without even the implied warranty of
+**	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+**	General Public License for more details.
 **	\endlegal
 */
 /* ========================================================================= */
 
 /* === S T A R T =========================================================== */
 
-#ifndef __SINFG_STUDIO_DOCKABLE_H
-#define __SINFG_STUDIO_DOCKABLE_H
+#ifndef __SYNFIG_STUDIO_DOCKABLE_H
+#define __SYNFIG_STUDIO_DOCKABLE_H
 
 /* === H E A D E R S ======================================================= */
 
 #include <gtkmm/stockid.h>
 #include <gtkmm/button.h>
 #include "dialogsettings.h"
-#include <sinfg/string.h>
+#include <synfig/string.h>
 #include <gtkmm/table.h>
 #include <gtkmm/tooltips.h>
 #include <gtkmm/label.h>
@@ -47,20 +48,20 @@
 /* === C L A S S E S & S T R U C T S ======================================= */
 
 namespace studio {
-	
+
 class DockManager;
 class DockBook;
-	
+
 class Dockable : public Gtk::Table
 {
 	friend class DockManager;
 	friend class DockBook;
 
-	
+
 	sigc::signal<void> signal_stock_id_changed_;
-	SigC::Connection prev_widget_delete_connection;
+	sigc::connection prev_widget_delete_connection;
 protected:
-	
+
 //	DialogSettings dialog_settings;
 
 
@@ -68,21 +69,21 @@ private:
 
 	Gtk::Toolbar *toolbar_;
 
-	sinfg::String name_;
-	sinfg::String local_name_;
+	synfig::String name_;
+	synfig::String local_name_;
 	Gtk::Tooltips tooltips_;
 	Gtk::Frame frame_;
 	Gtk::Label title_label_;
 	//Gtk::HBox button_box_;
 	Gtk::HBox header_box_;
 	//Gtk::VBox vbox_;
-	
+
 	//Gtk::HandleBox handle_box_;
 	Gtk::ScrolledWindow *scrolled_;
 	Gtk::Widget *prev_widget_;
 
 	bool use_scrolled_;
-	
+
 	Gtk::StockID stock_id_;
 
 	DockBook* parent_;
@@ -95,42 +96,42 @@ public:
 	void set_toolbar(Gtk::Toolbar& toolbar);
 
 	void set_use_scrolled(bool x) { use_scrolled_=x; }
-	
-	Dockable(const sinfg::String& name,const sinfg::String& local_name,Gtk::StockID stock_id_=Gtk::StockID(" "));
+
+	Dockable(const synfig::String& name,const synfig::String& local_name,Gtk::StockID stock_id_=Gtk::StockID(" "));
 	~Dockable();
 
 	sigc::signal<void>& signal_stock_id_changed() { return signal_stock_id_changed_; }
 
-	const sinfg::String& get_name()const { return name_; }
-	const sinfg::String& get_local_name()const { return local_name_; }
+	const synfig::String& get_name()const { return name_; }
+	const synfig::String& get_local_name()const { return local_name_; }
 
 	const Gtk::StockID& get_stock_id()const { return stock_id_; }
 	void set_stock_id(Gtk::StockID x) { stock_id_=x; signal_stock_id_changed()(); }
-	
-	void set_local_name(const sinfg::String&);
+
+	void set_local_name(const synfig::String&);
 
 	void clear();
-	
+
 	Gtk::Tooltips& get_tooltips() { return tooltips_; }
-	
+
 	//DialogSettings& settings() { return dialog_settings; }
 	//const DialogSettings& settings()const { return dialog_settings; }
-	
+
 	void add(Gtk::Widget& x);
-	
-	Gtk::ToolButton* add_button(const Gtk::StockID& stock_id, const sinfg::String& tooltip=sinfg::String());	
-	
+
+	Gtk::ToolButton* add_button(const Gtk::StockID& stock_id, const synfig::String& tooltip=synfig::String());
+
 	void detach();
 
 	void present();
-	
+
 	void attach_dnd_to(Gtk::Widget& widget);
 
 	bool clear_previous();
 	virtual Gtk::Widget* create_tab_label();
 
 private:
-	
+
 	void on_drag_data_get(const Glib::RefPtr<Gdk::DragContext>&, Gtk::SelectionData& selection_data, guint info, guint time);
 	void on_drag_end(const Glib::RefPtr<Gdk::DragContext>&context);
 	void on_drag_begin(const Glib::RefPtr<Gdk::DragContext>&context);