X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftags%2Fstable%2Fsrc%2Fgtkmm%2Fwidget_distance.cpp;h=050b411263c399134bd3c53f9a706513c26e6afa;hb=47fce282611fbba1044921d22ca887f9b53ad91a;hp=0e81829e7b5823b536eeeb02e62b102b2d2347cc;hpb=7c6d5426922cb3cda793f688dcd4d534b02765c8;p=synfig.git

diff --git a/synfig-studio/tags/stable/src/gtkmm/widget_distance.cpp b/synfig-studio/tags/stable/src/gtkmm/widget_distance.cpp
index 0e81829..050b411 100644
--- a/synfig-studio/tags/stable/src/gtkmm/widget_distance.cpp
+++ b/synfig-studio/tags/stable/src/gtkmm/widget_distance.cpp
@@ -1,20 +1,21 @@
-/* === S I N F G =========================================================== */
-/*!	\file widget_time.cpp
+/* === S Y N F I G ========================================================= */
+/*!	\file widget_distance.cpp
 **	\brief Template File
 **
-**	$Id: widget_distance.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp $
+**	$Id$
 **
 **	\legal
-**	Copyright (c) 2002 Robert B. Quattlebaum Jr.
+**	Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley
 **
-**	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
 */
 /* ========================================================================= */
@@ -33,21 +34,19 @@
 #include "widget_distance.h"
 #include "app.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 ========================================================= */
 
-#if ! defined(_)
-#define _(x)	(x)
-#endif
-
 /* === G L O B A L S ======================================================= */
 
 /* === P R O C E D U R E S ================================================= */
@@ -56,8 +55,8 @@ using namespace studio;
 
 Widget_Distance::Widget_Distance():
 	Gtk::SpinButton(0.05,5),
-	adjustment(0,-100000000,100000000,1,1,1)
-//	adjustment(0,-100000000,100000000,1,2,0)
+	distance_(1, Distance::SYSTEM_POINTS),
+	adjustment(0,-100000000,100000000,1,1,0)
 {
 	set_adjustment(adjustment);
 	set_numeric(false);
@@ -70,7 +69,7 @@ Widget_Distance::~Widget_Distance()
 int
 Widget_Distance::on_input(double* new_value)
 {
-	distance_=sinfg::String(get_text());
+	distance_=synfig::String(get_text());
 	*new_value=distance_.get();
 	return 1;
 }
@@ -81,18 +80,18 @@ Widget_Distance::on_output()
 	try{
 	distance_=get_adjustment()->get_value();
 	set_text(distance_.get_string(get_digits()));
-	} catch (...) { /* sinfg::error("Widget_Distance::on_output(): Caught something..."); */ }
+	} catch (...) { /* synfig::error("Widget_Distance::on_output(): Caught something..."); */ }
 	return true;
 }
 
 void
-Widget_Distance::set_value(const sinfg::Distance &data)
+Widget_Distance::set_value(const synfig::Distance &data)
 {
 	distance_=data;
 	get_adjustment()->set_value(distance_.get());
 }
 
-sinfg::Distance
+synfig::Distance
 Widget_Distance::get_value() const
 {
 	distance_=get_adjustment()->get_value();