Removed generate.

[universe.git] / polygon.h

diff --git a/polygon.h b/polygon.h
index add154b..e2d35f6 100644 (file)
--- a/polygon.h
+++ b/polygon.h
@@ -6,8 +6,15 @@
 #define POLYGON_H
 
 #include "misc.h"
 #define POLYGON_H
 
 #include "misc.h"

-#include "simple_window.h"
+#include "canvas.h"
+
+#ifdef XFIG_SUPPORT

 #include "xfig_tracer.h"
 #include "xfig_tracer.h"

+#endif
+
+#ifdef X11_SUPPORT
+#include "simple_window.h"
+#endif

 
 class Polygon {
   struct Triangle {
 
 class Polygon {
   struct Triangle {


@@ -66,11 +73,19 @@ public:
 
   Polygon *clone();
 
 
   Polygon *clone();
 

+#ifdef XFIG_SUPPORT

   void color_xfig(XFigTracer *tracer);
   void print_xfig(XFigTracer *tracer);
   void color_xfig(XFigTracer *tracer);
   void print_xfig(XFigTracer *tracer);

+#endif

 
 

+#ifdef X11_SUPPORT

   void draw(SimpleWindow *window);
   void draw_contours(SimpleWindow *window);
   void draw(SimpleWindow *window);
   void draw_contours(SimpleWindow *window);

+#endif
+
+  void draw(Canvas *canvas);
+  void draw_contours(Canvas *canvas);
+

   void set_vertex(int k, scalar_t x, scalar_t y);
   void set_position(scalar_t center_x, scalar_t center_y, scalar_t theta);
   void set_speed(scalar_t dcenter_x, scalar_t dcenter_y, scalar_t dtheta);
   void set_vertex(int k, scalar_t x, scalar_t y);
   void set_position(scalar_t center_x, scalar_t center_y, scalar_t theta);
   void set_speed(scalar_t dcenter_x, scalar_t dcenter_y, scalar_t dtheta);