projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
CXXFLAGS is for users, use AM_CXXFLAGS instead
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
gtkmm
/
widget_canvaschooser.cpp
diff --git
a/synfig-studio/trunk/src/gtkmm/widget_canvaschooser.cpp
b/synfig-studio/trunk/src/gtkmm/widget_canvaschooser.cpp
index
1d94418
..
c6f97cd
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/widget_canvaschooser.cpp
+++ b/
synfig-studio/trunk/src/gtkmm/widget_canvaschooser.cpp
@@
-2,7
+2,7
@@
/*! \file widget_canvaschooser.cpp
** \brief Template File
**
/*! \file widget_canvaschooser.cpp
** \brief Template File
**
-** $Id
: widget_canvaschooser.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
**
** \legal
** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
@@
-83,13
+83,13
@@
Widget_CanvasChooser::set_value(etl::handle<synfig::Canvas> data)
synfig::Canvas::Children::iterator iter;
synfig::Canvas::Children &children(parent_canvas->children());
String label;
synfig::Canvas::Children::iterator iter;
synfig::Canvas::Children &children(parent_canvas->children());
String label;
-
+
if(canvas)
{
label=canvas->get_name().empty()?canvas->get_id():canvas->get_name();
canvas_menu->items().push_back(Gtk::Menu_Helpers::MenuElem(label));
}
if(canvas)
{
label=canvas->get_name().empty()?canvas->get_id():canvas->get_name();
canvas_menu->items().push_back(Gtk::Menu_Helpers::MenuElem(label));
}
-
+
for(iter=children.begin();iter!=children.end();iter++)
if(*iter!=canvas)
{
for(iter=children.begin();iter!=children.end();iter++)
if(*iter!=canvas)
{
@@
-139,7
+139,7
@@
Widget_CanvasChooser::chooser_menu()
catch(std::runtime_error x)
{
App::dialog_error_blocking(_("Error:Exception Thrown"),x.what());
catch(std::runtime_error x)
{
App::dialog_error_blocking(_("Error:Exception Thrown"),x.what());
- set_value_(canvas);
+ set_value_(canvas);
}
catch(...)
{
}
catch(...)
{