Fix bugs in previous commit that caused FTBFS in synfig and ETL FTBFS with older...

[synfig.git] / synfig-core / tags / stable / src / synfig / layer_polygon.cpp

diff --git a/synfig-core/tags/stable/src/synfig/layer_polygon.cpp b/synfig-core/tags/stable/src/synfig/layer_polygon.cpp
index 5445355..46efffd 100644 (file)
--- a/synfig-core/tags/stable/src/synfig/layer_polygon.cpp
+++ b/synfig-core/tags/stable/src/synfig/layer_polygon.cpp
@@ -1,11 +1,12 @@
 /* === S Y N F I G ========================================================= */
 /*!    \file layer_polygon.cpp
-**     \brief Template Header
+**     \brief Implementation of the "Polygon" layer
 **
 **     $Id$
 **
 **     \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
@@ -56,8 +57,8 @@ using namespace etl;
 
 SYNFIG_LAYER_INIT(Layer_Polygon);
 SYNFIG_LAYER_SET_NAME(Layer_Polygon,"polygon");
-SYNFIG_LAYER_SET_LOCAL_NAME(Layer_Polygon,_("Polygon"));
-SYNFIG_LAYER_SET_CATEGORY(Layer_Polygon,_("Geometry"));
+SYNFIG_LAYER_SET_LOCAL_NAME(Layer_Polygon,N_("Polygon"));
+SYNFIG_LAYER_SET_CATEGORY(Layer_Polygon,N_("Geometry"));
 SYNFIG_LAYER_SET_VERSION(Layer_Polygon,"0.1");
 SYNFIG_LAYER_SET_CVS_ID(Layer_Polygon,"$Id$");
 
@@ -106,7 +107,7 @@ Layer_Polygon::sync()
 }
 
 void
-Layer_Polygon::add_polygon(const vector<Point> &point_list)
+Layer_Polygon::add_polygon(const std::vector<Point> &point_list)
 {
        int i,pointcount=point_list.size();
 
@@ -139,7 +140,7 @@ Layer_Polygon::clear()
 bool
 Layer_Polygon::set_param(const String & param, const ValueBase &value)
 {
-       if(     param=="vector_list" && value.same_as(vector_list))
+       if(     param=="vector_list" && value.same_type_as(vector_list))
        {
                vector_list=value;
                Layer_Shape::clear();
@@ -169,7 +170,7 @@ Layer_Polygon::get_param_vocab()const
 
        ret.push_back(ParamDesc("vector_list")
                .set_local_name(_("Vector List"))
-               .set_origin("offset")
+               .set_origin("origin")
        );
 
        return ret;