projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add code to output the new time format.
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
gtkmm
/
dock_children.cpp
diff --git
a/synfig-studio/trunk/src/gtkmm/dock_children.cpp
b/synfig-studio/trunk/src/gtkmm/dock_children.cpp
index
673349b
..
d997a0c
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/dock_children.cpp
+++ b/
synfig-studio/trunk/src/gtkmm/dock_children.cpp
@@
-2,10
+2,11
@@
/*! \file dock_children.cpp
** \brief Template File
**
/*! \file dock_children.cpp
** \brief Template File
**
-** $Id
: dock_children.cpp,v 1.1.1.1 2005/01/07 03:34:36 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
+** Copyright (c) 2007 Chris Moore
**
** This package is free software; you can redistribute it and/or
** modify it under the terms of the GNU General Public License as
**
** This package is free software; you can redistribute it and/or
** modify it under the terms of the GNU General Public License as
@@
-43,6
+44,8
@@
#include "childrentree.h"
#include "canvasview.h"
#include "childrentree.h"
#include "canvasview.h"
+#include "general.h"
+
#endif
/* === U S I N G =========================================================== */
#endif
/* === U S I N G =========================================================== */
@@
-63,7
+66,11
@@
using namespace studio;
Dock_Children::Dock_Children():
Dock_CanvasSpecific("children",_("Children"),Gtk::StockID("synfig-children"))
{
Dock_Children::Dock_Children():
Dock_CanvasSpecific("children",_("Children"),Gtk::StockID("synfig-children"))
{
- set_use_scrolled(false);
+ //! \todo the combination of set_use_scrolled(false) and
+ //! add(*tree_view) causes crashes when
+ //! Dockable::prev_widget_ is left referencing a
+ //! ChildrenTree that has already been destroyed.
+ // set_use_scrolled(false);
/*
add(*create_action_tree());
/*
add(*create_action_tree());
@@
-93,7
+100,7
@@
Dock_Children::init_canvas_view_vfunc(etl::loose_handle<CanvasView> canvas_view)
children_tree->set_model(children_tree_store);
children_tree->set_time_adjustment(canvas_view->time_adjustment());
children_tree->set_model(children_tree_store);
children_tree->set_time_adjustment(canvas_view->time_adjustment());
-
+
canvas_view->set_tree_model(get_name(),children_tree_store);
canvas_view->set_ext_widget(get_name(),children_tree);
}
canvas_view->set_tree_model(get_name(),children_tree_store);
canvas_view->set_ext_widget(get_name(),children_tree);
}
@@
-104,7
+111,7
@@
Dock_Children::changed_canvas_view_vfunc(etl::loose_handle<CanvasView> canvas_vi
if(canvas_view)
{
Gtk::Widget* tree_view(canvas_view->get_ext_widget(get_name()));
if(canvas_view)
{
Gtk::Widget* tree_view(canvas_view->get_ext_widget(get_name()));
-
+
add(*tree_view);
tree_view->show();
}
add(*tree_view);
tree_view->show();
}