Update.

[universe.git] / polygon.h

diff --git a/polygon.h b/polygon.h
index 48e6d3b..e2d35f6 100644 (file)
--- a/polygon.h
+++ b/polygon.h
@@ -6,16 +6,16 @@
 #define POLYGON_H
 
 #include "misc.h"
+#include "canvas.h"
+
+#ifdef XFIG_SUPPORT
 #include "xfig_tracer.h"
+#endif
 
 #ifdef X11_SUPPORT
 #include "simple_window.h"
 #endif
 
-#ifdef CAIRO_SUPPORT
-#include <cairo.h>
-#endif
-
 class Polygon {
   struct Triangle {
     int a, b, c;
@@ -73,18 +73,18 @@ public:
 
   Polygon *clone();
 
+#ifdef XFIG_SUPPORT
   void color_xfig(XFigTracer *tracer);
   void print_xfig(XFigTracer *tracer);
+#endif
 
 #ifdef X11_SUPPORT
   void draw(SimpleWindow *window);
   void draw_contours(SimpleWindow *window);
 #endif
 
-#ifdef CAIRO_SUPPORT
-  void draw(cairo_t* context_resource);
-  void draw_contours(cairo_t* context_resource);
-#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);