X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fdockdialog.h;h=551ecba629f5cadde3fa9f63be68fe9766bf56f8;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=52abc5526da65df373f1b2704afad0fbc21dd6cd;hpb=3a3c4bca3a17137bec5d7960560934b91ef4146e;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/dockdialog.h b/synfig-studio/trunk/src/gtkmm/dockdialog.h
index 52abc55..551ecba 100644
--- a/synfig-studio/trunk/src/gtkmm/dockdialog.h
+++ b/synfig-studio/trunk/src/gtkmm/dockdialog.h
@@ -1,35 +1,36 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!	\file dockdialog.h
 **	\brief Template Header
 **
-**	$Id: dockdialog.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_DOCK_DIALOG_H
-#define __SINFG_STUDIO_DOCK_DIALOG_H
+#ifndef __SYNFIG_STUDIO_DOCK_DIALOG_H
+#define __SYNFIG_STUDIO_DOCK_DIALOG_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/dialog.h>
 #include <gtkmm/tooltips.h>
 #include <gtkmm/label.h>
@@ -46,30 +47,30 @@
 
 namespace Gtk { class Box; class Paned;  };
 namespace studio {
-	
+
 class DockManager;
 class DockBook;
 class Dockable;
 class Widget_CompSelect;
 class CanvasView;
-	
+
 class DockDialog : public Gtk::Window
 {
 	friend class DockManager;
 	friend class DockBook;
 	friend class Dockable;
-	SigC::Connection empty_sig;
+	sigc::connection empty_sig;
 
 	bool composition_selector_;
-	
+
 	bool is_deleting;
-	
+
 	bool is_horizontal;
-	
+
 private:
 	std::list<DockBook*> dock_book_list;
 
-	std::vector<Gtk::Paned*>	pannels_;
+	std::vector<Gtk::Paned*>	panels_;
 	std::vector<int>			dock_book_sizes_;
 
 
@@ -92,32 +93,32 @@ private:
 
 	void drop_on_append(const Glib::RefPtr<Gdk::DragContext>& context, int, int, const Gtk::SelectionData& selection_data, guint, guint time);
 	void drop_on_prepend(const Glib::RefPtr<Gdk::DragContext>& context, int, int, const Gtk::SelectionData& selection_data, guint, guint time);
-	
+
 public:
 
 	const std::vector<int>&	get_dock_book_sizes()const { return dock_book_sizes_;}
 	void set_dock_book_sizes(const std::vector<int>&);
 	void rebuild_sizes();
-	
+
 	bool close();
-	
+
 	int get_id()const { return id_; }
-	
+
 	DockBook* append_dock_book();
 	DockBook* prepend_dock_book();
 	void erase_dock_book(DockBook*);
-	
+
 	void set_composition_selector(bool x);
 	bool get_composition_selector()const { return composition_selector_; }
-	
+
 	DockDialog();
 	~DockDialog();
 
 	DockBook& get_dock_book();
 	const DockBook& get_dock_book()const;
 
-	sinfg::String get_contents()const;
-	void set_contents(const sinfg::String& x);
+	synfig::String get_contents()const;
+	void set_contents(const synfig::String& x);
 }; // END of studio::DockDialog
 
 }; // END of namespace studio