From e3753a385b776c4713b93fa8426dc8c5af291c8a Mon Sep 17 00:00:00 2001 From: dooglus Date: Thu, 13 Mar 2008 23:46:19 +0000 Subject: [PATCH] Don't offer 'Manual' as an interpolation type. It's not clear what it is supposed to do, and looks like the code to implement it was never written. Attempting to use it causes uninitialised memory to be read. git-svn-id: http://svn.voria.com/code@1914 1f10aa63-cdf2-0310-b900-c93c546f37ac --- synfig-studio/trunk/src/gtkmm/widget_waypoint.cpp | 4 ++-- synfig-studio/trunk/src/gtkmm/widget_waypointmodel.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/synfig-studio/trunk/src/gtkmm/widget_waypoint.cpp b/synfig-studio/trunk/src/gtkmm/widget_waypoint.cpp index 95f838e..13c739c 100644 --- a/synfig-studio/trunk/src/gtkmm/widget_waypoint.cpp +++ b/synfig-studio/trunk/src/gtkmm/widget_waypoint.cpp @@ -87,14 +87,14 @@ Widget_Waypoint::Widget_Waypoint(etl::handle canvas): before_options->items().push_back(Gtk::Menu_Helpers::MenuElem("Constant")); before_options->items().push_back(Gtk::Menu_Helpers::MenuElem("Linear")); before_options->items().push_back(Gtk::Menu_Helpers::MenuElem("Ease In")); - before_options->items().push_back(Gtk::Menu_Helpers::MenuElem("Manual")); + // before_options->items().push_back(Gtk::Menu_Helpers::MenuElem("Manual")); after_options=manage(new class Gtk::Menu()); after_options->items().push_back(Gtk::Menu_Helpers::MenuElem("TCB Smooth")); after_options->items().push_back(Gtk::Menu_Helpers::MenuElem("Constant")); after_options->items().push_back(Gtk::Menu_Helpers::MenuElem("Linear")); after_options->items().push_back(Gtk::Menu_Helpers::MenuElem("Ease Out")); - after_options->items().push_back(Gtk::Menu_Helpers::MenuElem("Manual")); + // after_options->items().push_back(Gtk::Menu_Helpers::MenuElem("Manual")); before=manage(new class Gtk::OptionMenu()); before->show(); diff --git a/synfig-studio/trunk/src/gtkmm/widget_waypointmodel.cpp b/synfig-studio/trunk/src/gtkmm/widget_waypointmodel.cpp index 60a7c8d..ac34a92 100644 --- a/synfig-studio/trunk/src/gtkmm/widget_waypointmodel.cpp +++ b/synfig-studio/trunk/src/gtkmm/widget_waypointmodel.cpp @@ -73,14 +73,14 @@ Widget_WaypointModel::Widget_WaypointModel(): before_options->items().push_back(Gtk::Menu_Helpers::MenuElem("Constant")); before_options->items().push_back(Gtk::Menu_Helpers::MenuElem("Linear")); before_options->items().push_back(Gtk::Menu_Helpers::MenuElem("Ease In")); - before_options->items().push_back(Gtk::Menu_Helpers::MenuElem("Manual")); + // before_options->items().push_back(Gtk::Menu_Helpers::MenuElem("Manual")); after_options=manage(new class Gtk::Menu()); after_options->items().push_back(Gtk::Menu_Helpers::MenuElem("TCB Smooth")); after_options->items().push_back(Gtk::Menu_Helpers::MenuElem("Constant")); after_options->items().push_back(Gtk::Menu_Helpers::MenuElem("Linear")); after_options->items().push_back(Gtk::Menu_Helpers::MenuElem("Ease Out")); - after_options->items().push_back(Gtk::Menu_Helpers::MenuElem("Manual")); + // after_options->items().push_back(Gtk::Menu_Helpers::MenuElem("Manual")); before=manage(new class Gtk::OptionMenu()); before->show(); -- 2.7.4