simplified scalable/drawable class - gsl-shell.git - gsl-shell

diff --git a/agg-plot/drawable.h b/agg-plot/drawable.h
index 37f4c980..4e4f1b6a 100644
--- a/agg-plot/drawable.h
+++ b/agg-plot/drawable.h

@@ -6,18 +6,15 @@

#include "agg_trans_affine.h"

#include "agg_conv_transform.h"

-// Interface

-struct window_object {

-public:

+struct drawable {

+

+ virtual void rewind(unsigned path_id) = 0;

+ virtual unsigned vertex(double* x, double* y) = 0;

+

virtual void apply_transform(const agg::trans_affine& m, double as) = 0;

virtual void bounding_box(double *x1, double *y1, double *x2, double *y2) = 0;

-

virtual bool dispose() = 0;

- virtual ~window_object() { };

-};

-

-struct drawable: public vertex_source, public window_object {

virtual ~drawable() { };

};

diff --git a/agg-plot/scalable.h b/agg-plot/scalable.h
index 2521426d..fcc7c4eb 100644
--- a/agg-plot/scalable.h
+++ b/agg-plot/scalable.h

@@ -23,21 +23,14 @@

#include "agg_trans_affine.h"

-struct vertex_source {

+struct scalable {

+

virtual void rewind(unsigned path_id) = 0;

virtual unsigned vertex(double* x, double* y) = 0;

- virtual ~vertex_source() { };

-};

-

-struct scalable_object {

virtual void apply_transform(const agg::trans_affine& m, double as) = 0;

virtual bool dispose() = 0;

- virtual ~scalable_object() { };

-};

-

-struct scalable : public vertex_source, public scalable_object {

virtual ~scalable() { };

};