X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fwidget_compselect.cpp;h=51eb3db54c577c4dbad9f8369a213cb087193edd;hb=9459638ad6797b8139f1e9f0715c96076dbf0890;hp=492e5dd095f50c69b49da19c03595320545ce763;hpb=ce408de81ca266b1f334ee9bc6c8fb7ba1492ed4;p=synfig.git diff --git a/synfig-studio/trunk/src/gtkmm/widget_compselect.cpp b/synfig-studio/trunk/src/gtkmm/widget_compselect.cpp index 492e5dd..51eb3db 100644 --- a/synfig-studio/trunk/src/gtkmm/widget_compselect.cpp +++ b/synfig-studio/trunk/src/gtkmm/widget_compselect.cpp @@ -2,7 +2,7 @@ /*! \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-2005 Robert B. Quattlebaum Jr., Adrian Bentley @@ -35,6 +35,8 @@ #include #include "instance.h" +#include "general.h" + #endif /* === U S I N G =========================================================== */ @@ -96,7 +98,8 @@ Widget_CompSelect::set_selected_instance(etl::loose_handle 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); @@ -105,7 +108,7 @@ Widget_CompSelect::set_selected_instance(etl::loose_handle x) else set_history(0); - set_selected_instance_(x); + set_selected_instance_(x); } void @@ -113,11 +116,11 @@ Widget_CompSelect::new_instance(etl::handle instance) { if(studio::App::shutdown_in_progress) return; - + assert(instance); - + etl::loose_handle 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 >( @@ -132,13 +135,12 @@ Widget_CompSelect::new_instance(etl::handle instance) instance_list_menu.items().push_back(Gtk::Menu_Helpers::MenuElem(name, sigc::bind >(sigc::ptr_fun(&studio::App::set_selected_instance),loose_instance) )); } - + } void Widget_CompSelect::delete_instance(etl::handle instance) { - DEBUGPOINT(); refresh(); if(selected_instance==instance)