projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix a bug found by g++ 4.3, and add a few comments.
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
gtkmm
/
layerparamtreestore.cpp
diff --git
a/synfig-studio/trunk/src/gtkmm/layerparamtreestore.cpp
b/synfig-studio/trunk/src/gtkmm/layerparamtreestore.cpp
index
d583be8
..
f56de42
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/layerparamtreestore.cpp
+++ b/
synfig-studio/trunk/src/gtkmm/layerparamtreestore.cpp
@@
-39,6
+39,8
@@
#include "app.h"
#include <ETL/clock>
#include "app.h"
#include <ETL/clock>
+#include "general.h"
+
#endif
/* === U S I N G =========================================================== */
#endif
/* === U S I N G =========================================================== */
@@
-131,11
+133,7
@@
LayerParamTreeStore::get_value_vfunc (const Gtk::TreeModel::iterator& iter, int
Glib::Value<Glib::ustring> x;
g_value_init(x.gobj(),x.value_type());
Glib::Value<Glib::ustring> x;
g_value_init(x.gobj(),x.value_type());
-
- if(!layer->get_description().empty())
- x.set(layer->get_description());
- else
- x.set(layer->get_local_name());
+ x.set(layer->get_non_empty_description());
g_value_init(value.gobj(),x.value_type());
g_value_copy(x.gobj(),value.gobj());
g_value_init(value.gobj(),x.value_type());
g_value_copy(x.gobj(),value.gobj());
@@
-301,7
+299,7
@@
LayerParamTreeStore::set_value_impl(const Gtk::TreeModel::iterator& iter, int co
void
LayerParamTreeStore::rebuild()
{
void
LayerParamTreeStore::rebuild()
{
- Profiler profiler("LayerParamTreeStore::rebuild()");
+
//
Profiler profiler("LayerParamTreeStore::rebuild()");
if(queued)queued=false;
clear();
layer_list=layer_tree->get_selected_layers();
if(queued)queued=false;
clear();
layer_list=layer_tree->get_selected_layers();
@@
-520,13
+518,13
@@
LayerParamTreeStore::set_row(Gtk::TreeRow row,synfigapp::ValueDesc value_desc)
}
void
}
void
-LayerParamTreeStore::on_value_node_added(ValueNode::Handle /*value_node*/)
+LayerParamTreeStore::on_value_node_added(
synfig::
ValueNode::Handle /*value_node*/)
{
// queue_refresh();
}
void
{
// queue_refresh();
}
void
-LayerParamTreeStore::on_value_node_deleted(
etl::handle<ValueNode>
/*value_node*/)
+LayerParamTreeStore::on_value_node_deleted(
synfig::ValueNode::Handle
/*value_node*/)
{
// queue_refresh();
}
{
// queue_refresh();
}
@@
-544,7
+542,7
@@
LayerParamTreeStore::on_value_node_child_removed(synfig::ValueNode::Handle /*val
}
void
}
void
-LayerParamTreeStore::on_value_node_changed(
etl::handle<ValueNode>
/*value_node*/)
+LayerParamTreeStore::on_value_node_changed(
synfig::ValueNode::Handle
/*value_node*/)
{
queue_refresh();
}
{
queue_refresh();
}