Fix bugs in previous commit that caused FTBFS in synfig and ETL FTBFS with older...

[synfig.git] / synfig-studio / tags / stable / src / gtkmm / dock_children.cpp

diff --git a/synfig-studio/tags/stable/src/gtkmm/dock_children.cpp b/synfig-studio/tags/stable/src/gtkmm/dock_children.cpp
index 2f1fc1c..d997a0c 100644 (file)
--- a/synfig-studio/tags/stable/src/gtkmm/dock_children.cpp
+++ b/synfig-studio/tags/stable/src/gtkmm/dock_children.cpp
@@ -1,20 +1,22 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!    \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 Robert B. Quattlebaum Jr.
+**     Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**     Copyright (c) 2007 Chris Moore
 **
-**     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
 */
 /* ========================================================================= */
@@ -42,13 +44,15 @@
 #include "childrentree.h"
 #include "canvasview.h"
 
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
 
 using namespace std;
 using namespace etl;
-using namespace sinfg;
+using namespace synfig;
 using namespace studio;
 
 /* === M A C R O S ========================================================= */
@@ -60,14 +64,18 @@ using namespace studio;
 /* === M E T H O D S ======================================================= */
 
 Dock_Children::Dock_Children():
-       Dock_CanvasSpecific("children",_("Children"),Gtk::StockID("sinfg-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_button(
-               Gtk::StockID("sinfg-clear_redo"),
+               Gtk::StockID("synfig-clear_redo"),
                _("Clear the REDO Stack")
        )->signal_clicked().connect(
                sigc::mem_fun(
@@ -92,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());
 
-       
+
        canvas_view->set_tree_model(get_name(),children_tree_store);
        canvas_view->set_ext_widget(get_name(),children_tree);
 }
@@ -103,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()));
-       
+
                add(*tree_view);
                tree_view->show();
        }