X-Git-Url: https://fleuret.org/cgi-bin/gitweb/gitweb.cgi?a=blobdiff_plain;f=polygon.h;h=e2d35f6bc9ce3d0ffdffc8aa627a8964014bdc4a;hb=6408d9fe6e1b82ad9aa71d6e1702ec100a8c3ca1;hp=46eda3e7534427073bf51ad494c7e08e5da8b4cf;hpb=fe0be986e63c5dabed472d68b0aa7c91ca0651db;p=universe.git

diff --git a/polygon.h b/polygon.h
index 46eda3e..e2d35f6 100644
--- a/polygon.h
+++ b/polygon.h
@@ -6,11 +6,14 @@
 #define POLYGON_H
 
 #include "misc.h"
-#include "simple_window.h"
+#include "canvas.h"
+
+#ifdef XFIG_SUPPORT
 #include "xfig_tracer.h"
+#endif
 
-#ifdef CAIRO_SUPPORT
-#include <cairo.h>
+#ifdef X11_SUPPORT
+#include "simple_window.h"
 #endif
 
 class Polygon {
@@ -70,17 +73,19 @@ 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);
-
-#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);
   void set_speed(scalar_t dcenter_x, scalar_t dcenter_y, scalar_t dtheta);