g++ 4.2 didn't like my last change.

[synfig.git] / synfig-studio / trunk / src / gtkmm / dock_timetrack.cpp

diff --git a/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp b/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp
index f444753..8b1e312 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp
+++ b/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp
@@ -6,6 +6,7 @@
 **
 **     \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
@@ -43,6 +44,8 @@
 #include "workarea.h"
 #include "widget_timeslider.h"
 #include "layerparamtreestore.h"
+#include "general.h"
+
 #endif
 
 /* === U S I N G =========================================================== */
@@ -176,11 +179,13 @@ public:
                                                {
                                                        synfigapp::ValueDesc value_desc(row[model.value_desc]);
                                                        Gtk::Menu* menu(manage(new Gtk::Menu()));
+                                                       menu->signal_hide().connect(sigc::bind(sigc::ptr_fun(&delete_widget), menu));
                                                        App::get_instance(param_tree_store_->canvas_interface()->get_canvas())->make_param_menu(menu,param_tree_store_->canvas_interface()->get_canvas(),value_desc,0.5f);
                                                        menu->popup(event->button.button,gtk_get_current_event_time());
                                                        return true;
                                                }
                                                Gtk::Menu* menu(manage(new Gtk::Menu()));
+                                               menu->signal_hide().connect(sigc::bind(sigc::ptr_fun(&delete_widget), menu));
                                                std::list<synfigapp::ValueDesc> value_desc_list;
                                                ParamDesc param_desc(row[model.param_desc]);
                                                for(;!layer_list.empty();layer_list.pop_back())
@@ -349,12 +354,18 @@ public:
                        if(adjustment.get_page_size()>get_height())
                                adjustment.set_page_size(get_height());
 
-                       cellrenderer_time_track->set_fixed_size(-1,18);
+                       int row_height = 0;
+                       if(getenv("SYNFIG_TIMETRACK_ROW_HEIGHT"))
+                               row_height = atoi(getenv("SYNFIG_TIMETRACK_ROW_HEIGHT"));
+                       if (row_height < 3)
+                               row_height = 18;
+                                                                         
+                       cellrenderer_time_track->set_fixed_size(-1,row_height);
                }
        }
 
        void
-       on_waypoint_clicked(const Glib::ustring &path_string, synfig::Waypoint waypoint,int button)
+       on_waypoint_clicked(const Glib::ustring &/*path_string*/, synfig::Waypoint waypoint,int button)
        {
 /*
                Gtk::TreePath path(path_string);
@@ -394,7 +405,14 @@ Dock_Timetrack::Dock_Timetrack():
 {
        table_=0;
        widget_timeslider_= new Widget_Timeslider();
-       widget_timeslider_->set_size_request(-1,22);
+
+       int header_height = 0;
+       if(getenv("SYNFIG_TIMETRACK_HEADER_HEIGHT"))
+               header_height = atoi(getenv("SYNFIG_TIMETRACK_HEADER_HEIGHT"));
+       if (header_height < 3)
+               header_height = 22;
+
+       widget_timeslider_->set_size_request(-1,header_height);
        hscrollbar_=new Gtk::HScrollbar();
        vscrollbar_=new Gtk::VScrollbar();
 }