X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Fwidget_waypoint.cpp;h=95f838e700d4fd8f591aa68beef19aefce8fb703;hb=933698eb69791193b53ce0142909502de42a6124;hp=c6ca0871d8af52fd30bc1480cbf035f92a9aebcf;hpb=837b63e9fb829d66d43f4f169861f8979f76820d;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/widget_waypoint.cpp b/synfig-studio/trunk/src/gtkmm/widget_waypoint.cpp
index c6ca087..95f838e 100644
--- a/synfig-studio/trunk/src/gtkmm/widget_waypoint.cpp
+++ b/synfig-studio/trunk/src/gtkmm/widget_waypoint.cpp
@@ -6,6 +6,7 @@
 **
 **	\legal
 **	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
+**	Copyright (c) 2008 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 <gtkmm/optionmenu.h>
 #include "widget_time.h"
 #include "widget_waypoint.h"
+#include "general.h"
+
 #endif
 
 using namespace synfig;
@@ -134,6 +137,7 @@ Widget_Waypoint::Widget_Waypoint(etl::handle<synfig::Canvas> canvas):
 	waypointValueLabel->set_mnemonic_widget(*value_widget);
 	waypointTable->attach(*waypointValueLabel, 0, 1, 0, 1, Gtk::SHRINK | Gtk::FILL, Gtk::EXPAND | Gtk::FILL, 0, 0);
 	waypointTable->attach(*value_widget, 1, 2, 0, 1, Gtk::EXPAND | Gtk::FILL, Gtk::EXPAND | Gtk::FILL, 0, 0);
+	waypointTable->attach(*value_node_label, 1, 2, 0, 1, Gtk::EXPAND | Gtk::FILL, Gtk::EXPAND | Gtk::FILL, 0, 0);
 
 	Gtk::Label *waypointTimeLabel = manage(new Gtk::Label(_("_Time"), true));
 	waypointTimeLabel->set_alignment(0, 0.5);
@@ -232,7 +236,7 @@ Widget_Waypoint::set_waypoint(synfig::Waypoint &x)
 
 	waypoint=x;
 
-#warning This really needs to be fixed to support value node waypoints!
+	//! \todo This really needs to be fixed to support value node waypoints!
 	if(waypoint.is_static())
 	{
 		value_widget->set_value(waypoint.get_value());
@@ -259,9 +263,10 @@ Widget_Waypoint::set_waypoint(synfig::Waypoint &x)
 const synfig::Waypoint &
 Widget_Waypoint::get_waypoint()const
 {
-#warning This too!
+	//! \todo This too!
 	waypoint.set_time(time_widget->get_value());
-	waypoint.set_value(value_widget->get_value());
+	if(waypoint.is_static())
+		waypoint.set_value(value_widget->get_value());
 	//int i;
 
 	waypoint.set_before((synfig::Waypoint::Interpolation)before->get_history());