X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fwidget_compselect.cpp;h=51eb3db54c577c4dbad9f8369a213cb087193edd;hb=933698eb69791193b53ce0142909502de42a6124;hp=9b342f507a1c8f1d480434b63554e7aa977f3c18;hpb=3a3c4bca3a17137bec5d7960560934b91ef4146e;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/widget_compselect.cpp b/synfig-studio/trunk/src/gtkmm/widget_compselect.cpp
index 9b342f5..51eb3db 100644
--- a/synfig-studio/trunk/src/gtkmm/widget_compselect.cpp
+++ b/synfig-studio/trunk/src/gtkmm/widget_compselect.cpp
@@ -1,20 +1,21 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!	\file widget_compselect.cpp
 **	\brief Template File
 **
-**	$Id: widget_compselect.cpp,v 1.1.1.1 2005/01/07 03:34:37 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
 */
 /* ========================================================================= */
@@ -31,16 +32,18 @@
 #include <gtkmm/menu.h>
 #include "widget_compselect.h"
 #include <ETL/stringf>
-#include <sinfg/valuenode.h>
+#include <synfig/valuenode.h>
 #include "instance.h"
 
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
 
 using namespace std;
 using namespace etl;
-using namespace sinfg;
+using namespace synfig;
 using namespace studio;
 
 /* === M A C R O S ========================================================= */
@@ -95,7 +98,8 @@ Widget_CompSelect::set_selected_instance(etl::loose_handle<studio::Instance> x)
 	if(x)
 	{
 		int i;
-		for(i=0,iter=studio::App::instance_list.begin();iter!=studio::App::instance_list.end() && ((*iter)!=x);iter++,i++);
+		for(i=0,iter=studio::App::instance_list.begin();iter!=studio::App::instance_list.end() && ((*iter)!=x);iter++,i++)
+			;
 
 		assert(*iter==x);
 
@@ -104,7 +108,7 @@ Widget_CompSelect::set_selected_instance(etl::loose_handle<studio::Instance> x)
 	else
 		set_history(0);
 
-	set_selected_instance_(x);	
+	set_selected_instance_(x);
 }
 
 void
@@ -112,13 +116,13 @@ Widget_CompSelect::new_instance(etl::handle<studio::Instance> instance)
 {
 	if(studio::App::shutdown_in_progress)
 		return;
-	
+
 	assert(instance);
-	
+
 	etl::loose_handle<studio::Instance> loose_instance(instance);
-	
-	instance->sinfgapp::Instance::signal_filename_changed().connect(sigc::mem_fun(*this,&Widget_CompSelect::refresh));
-	instance->sinfgapp::Instance::signal_filename_changed().connect(
+
+	instance->synfigapp::Instance::signal_filename_changed().connect(sigc::mem_fun(*this,&Widget_CompSelect::refresh));
+	instance->synfigapp::Instance::signal_filename_changed().connect(
 		sigc::bind<etl::loose_handle<studio::Instance> >(
 			sigc::mem_fun(*this,&Widget_CompSelect::set_selected_instance),
 			loose_instance
@@ -131,13 +135,12 @@ Widget_CompSelect::new_instance(etl::handle<studio::Instance> instance)
 		instance_list_menu.items().push_back(Gtk::Menu_Helpers::MenuElem(name,
 			sigc::bind<etl::loose_handle<studio::Instance> >(sigc::ptr_fun(&studio::App::set_selected_instance),loose_instance)	));
 	}
-	
+
 }
 
 void
 Widget_CompSelect::delete_instance(etl::handle<studio::Instance> instance)
 {
-	DEBUGPOINT();
 	refresh();
 
 	if(selected_instance==instance)