diff --git a/src/db/db/dbPolygonTools.cc b/src/db/db/dbPolygonTools.cc index 7d49fa7e4..a28cb05e1 100644 --- a/src/db/db/dbPolygonTools.cc +++ b/src/db/db/dbPolygonTools.cc @@ -911,6 +911,7 @@ class ErrorCatchingEdgeSink // TODO: we should not use exceptions to indicate a condition, but right now, there is no good alternative // and this is considered an error anyway. virtual void put (const db::Edge &) { throw OddPolygonException (); } + virtual void put (const db::Edge &, int) { } virtual void crossing_edge (const db::Edge &) { throw OddPolygonException (); } }; diff --git a/src/edt/edt/edtPropertiesPages.h b/src/edt/edt/edtPropertiesPages.h index 834da0fb2..0e933c804 100644 --- a/src/edt/edt/edtPropertiesPages.h +++ b/src/edt/edt/edtPropertiesPages.h @@ -52,8 +52,9 @@ public: virtual size_t count () const; virtual void select_entries (const std::vector &entries); virtual std::string description (size_t entry) const; - virtual QIcon icon (size_t entry, int w, int h) const; virtual std::string description () const; + virtual QIcon icon (size_t entry, int w, int h) const; + virtual QIcon icon (int w, int h) const { return lay::PropertiesPage::icon (w, h); } virtual void leave (); protected: @@ -105,6 +106,7 @@ public: PolygonPropertiesPage (edt::Service *service, db::Manager *manager, QWidget *parent); virtual std::string description (size_t entry) const; + virtual std::string description () const { return ShapePropertiesPage::description (); } virtual void do_update (const db::Shape &shape, double dbu, const std::string &lname); virtual ChangeApplicator *create_applicator (db::Shapes &shapes, const db::Shape &shape, double dbu); @@ -129,6 +131,7 @@ public: BoxPropertiesPage (edt::Service *service, db::Manager *manager, QWidget *parent); virtual std::string description (size_t entry) const; + virtual std::string description () const { return ShapePropertiesPage::description (); } virtual void do_update (const db::Shape &shape, double dbu, const std::string &lname); virtual ChangeApplicator *create_applicator (db::Shapes &shapes, const db::Shape &shape, double dbu); @@ -159,6 +162,7 @@ public: TextPropertiesPage (edt::Service *service, db::Manager *manager, QWidget *parent); virtual std::string description (size_t entry) const; + virtual std::string description () const { return ShapePropertiesPage::description (); } virtual void do_update (const db::Shape &shape, double dbu, const std::string &lname); virtual ChangeApplicator *create_applicator (db::Shapes &shapes, const db::Shape &shape, double dbu); @@ -177,6 +181,7 @@ public: PathPropertiesPage (edt::Service *service, db::Manager *manager, QWidget *parent); virtual std::string description (size_t entry) const; + virtual std::string description () const { return ShapePropertiesPage::description (); } virtual void do_update (const db::Shape &shape, double dbu, const std::string &lname); virtual ChangeApplicator *create_applicator (db::Shapes &shapes, const db::Shape &shape, double dbu); @@ -198,6 +203,7 @@ public: EditablePathPropertiesPage (edt::Service *service, db::Manager *manager, QWidget *parent); virtual std::string description (size_t entry) const; + virtual std::string description () const { return ShapePropertiesPage::description (); } virtual void do_update (const db::Shape &shape, double dbu, const std::string &lname); virtual ChangeApplicator *create_applicator (db::Shapes &shapes, const db::Shape &shape, double dbu);