projects
/
synfig.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use Color::is_straight(). Also, re-enable the optimization for straight blending...
[synfig.git]
/
synfig-studio
/
trunk
/
src
/
gtkmm
/
widget_distance.cpp
diff --git
a/synfig-studio/trunk/src/gtkmm/widget_distance.cpp
b/synfig-studio/trunk/src/gtkmm/widget_distance.cpp
index
f6cc100
..
a2afcd9
100644
(file)
--- a/
synfig-studio/trunk/src/gtkmm/widget_distance.cpp
+++ b/
synfig-studio/trunk/src/gtkmm/widget_distance.cpp
@@
-1,20
+1,21
@@
/* === S Y N F I G ========================================================= */
/* === S Y N F I G ========================================================= */
-/*! \file widget_
tim
e.cpp
+/*! \file widget_
distanc
e.cpp
** \brief Template File
**
** \brief Template File
**
-** $Id
: widget_distance.cpp,v 1.1.1.1 2005/01/07 03:34:37 darco Exp
$
+** $Id$
**
** \legal
**
** \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
*/
/* ========================================================================= */
** \endlegal
*/
/* ========================================================================= */
@@
-33,6
+34,8
@@
#include "widget_distance.h"
#include "app.h"
#include "widget_distance.h"
#include "app.h"
+#include "general.h"
+
#endif
/* === U S I N G =========================================================== */
#endif
/* === U S I N G =========================================================== */
@@
-44,10
+47,6
@@
using namespace studio;
/* === M A C R O S ========================================================= */
/* === 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 ================================================= */
/* === G L O B A L S ======================================================= */
/* === P R O C E D U R E S ================================================= */
@@
-56,6
+55,7
@@
using namespace studio;
Widget_Distance::Widget_Distance():
Gtk::SpinButton(0.05,5),
Widget_Distance::Widget_Distance():
Gtk::SpinButton(0.05,5),
+ distance_(1, Distance::SYSTEM_POINTS),
adjustment(0,-100000000,100000000,1,1,1)
// adjustment(0,-100000000,100000000,1,2,0)
{
adjustment(0,-100000000,100000000,1,1,1)
// adjustment(0,-100000000,100000000,1,2,0)
{