Remove .gitignore do nothing is ignored.

[synfig.git] / synfig-studio / trunk / src / gtkmm / widget_compselect.cpp

diff --git a/synfig-studio/trunk/src/gtkmm/widget_compselect.cpp b/synfig-studio/trunk/src/gtkmm/widget_compselect.cpp
index 31a12c1..51eb3db 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/widget_compselect.cpp
+++ b/synfig-studio/trunk/src/gtkmm/widget_compselect.cpp
@@ -2,19 +2,20 @@
 /*!    \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
 */
 /* ========================================================================= */
@@ -34,6 +35,8 @@
 #include <synfig/valuenode.h>
 #include "instance.h"
 
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -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,11 +116,11 @@ 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->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> >(
@@ -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)