diff options
| -rw-r--r-- | FL/Fl_Device.H | 20 | ||||
| -rw-r--r-- | src/cfg_gfx/gdi_vertex.cxx | 6 | ||||
| -rw-r--r-- | src/cfg_gfx/opengl.H | 10 | ||||
| -rw-r--r-- | src/cfg_gfx/quartz.H | 1 | ||||
| -rw-r--r-- | src/cfg_gfx/quartz_vertex.cxx | 4 | ||||
| -rw-r--r-- | src/cfg_gfx/xlib.H | 1 | ||||
| -rw-r--r-- | src/fl_vertex.cxx | 4 |
7 files changed, 25 insertions, 21 deletions
diff --git a/FL/Fl_Device.H b/FL/Fl_Device.H index d5b5a3067..ad2d9d233 100644 --- a/FL/Fl_Device.H +++ b/FL/Fl_Device.H @@ -368,7 +368,7 @@ protected: friend void fl_begin_polygon(); virtual void begin_polygon(); friend void fl_begin_complex_polygon(); - virtual void begin_complex_polygon(); + virtual void begin_complex_polygon() = 0; friend double fl_transform_x(double x, double y); virtual double transform_x(double x, double y); friend double fl_transform_y(double x, double y); @@ -378,23 +378,23 @@ protected: friend double fl_transform_dy(double x, double y); virtual double transform_dy(double x, double y); friend void fl_transformed_vertex(double xf, double yf); - virtual void transformed_vertex(double xf, double yf); + virtual void transformed_vertex(double xf, double yf) = 0; friend void fl_vertex(double x, double y); - virtual void vertex(double x, double y); + virtual void vertex(double x, double y) = 0; friend void fl_end_points(); - virtual void end_points(); + virtual void end_points() = 0; friend void fl_end_line(); - virtual void end_line(); + virtual void end_line() = 0; friend void fl_end_loop(); - virtual void end_loop(); + virtual void end_loop() = 0; friend void fl_end_polygon(); - virtual void end_polygon(); + virtual void end_polygon() = 0; friend void fl_end_complex_polygon(); - virtual void end_complex_polygon(); + virtual void end_complex_polygon() = 0; friend void fl_gap(); - virtual void gap(); + virtual void gap() = 0; friend void fl_circle(double x, double y, double r); - virtual void circle(double x, double y, double r); + virtual void circle(double x, double y, double r) = 0; }; diff --git a/src/cfg_gfx/gdi_vertex.cxx b/src/cfg_gfx/gdi_vertex.cxx index 50f47f6b4..81267f1e0 100644 --- a/src/cfg_gfx/gdi_vertex.cxx +++ b/src/cfg_gfx/gdi_vertex.cxx @@ -52,10 +52,6 @@ void Fl_GDI_Graphics_Driver::end_line() { if (n>1) Polyline(fl_gc, p, n); } -void Fl_GDI_Graphics_Driver::fixloop() { // remove equal points from closed path - while (n>2 && p[n-1].x == p[0].x && p[n-1].y == p[0].y) n--; -} - void Fl_GDI_Graphics_Driver::end_loop() { fixloop(); if (n>2) transformed_vertex((COORD_T)p[0].x, (COORD_T)p[0].y); @@ -124,7 +120,7 @@ void Fl_GDI_Graphics_Driver::circle(double x, double y,double r) { Arc(fl_gc, llx, lly, llx+w, lly+h, 0,0, 0,0); } -#endif FL_CFG_GFX_GDI_VERTEX_CXX +#endif // FL_CFG_GFX_GDI_VERTEX_CXX // // End of "$Id$". diff --git a/src/cfg_gfx/opengl.H b/src/cfg_gfx/opengl.H index 4ad56770a..86abea41a 100644 --- a/src/cfg_gfx/opengl.H +++ b/src/cfg_gfx/opengl.H @@ -86,6 +86,16 @@ public: // void end_complex_polygon(); // void gap(); // void circle(double x, double y, double r); + void begin_complex_polygon() { } + void transformed_vertex(double xf, double yf) { } + void vertex(double x, double y) { } + void end_points() { } + void end_line() { } + void end_loop() { } + void end_polygon() { } + void end_complex_polygon() { } + void gap() { } + void circle(double x, double y, double r) { } }; diff --git a/src/cfg_gfx/quartz.H b/src/cfg_gfx/quartz.H index 66cee48d2..604e04f97 100644 --- a/src/cfg_gfx/quartz.H +++ b/src/cfg_gfx/quartz.H @@ -94,7 +94,6 @@ protected: void pop_clip(); void restore_clip(); // --- implementation is in src/fl_vertex.cxx which includes src/cfg_gfx/xxx_rect.cxx - void fixloop(); void begin_complex_polygon(); void transformed_vertex(double xf, double yf); void vertex(double x, double y); diff --git a/src/cfg_gfx/quartz_vertex.cxx b/src/cfg_gfx/quartz_vertex.cxx index 5ae2832eb..6c63a245a 100644 --- a/src/cfg_gfx/quartz_vertex.cxx +++ b/src/cfg_gfx/quartz_vertex.cxx @@ -64,10 +64,6 @@ void Fl_Quartz_Graphics_Driver::end_line() { CGContextSetShouldAntialias(fl_gc, false); } -void Fl_Quartz_Graphics_Driver::fixloop() { // remove equal points from closed path - while (n>2 && p[n-1].x == p[0].x && p[n-1].y == p[0].y) n--; -} - void Fl_Quartz_Graphics_Driver::end_loop() { fixloop(); if (n>2) transformed_vertex((COORD_T)p[0].x, (COORD_T)p[0].y); diff --git a/src/cfg_gfx/xlib.H b/src/cfg_gfx/xlib.H index 9b0fbad97..e83fedb26 100644 --- a/src/cfg_gfx/xlib.H +++ b/src/cfg_gfx/xlib.H @@ -83,7 +83,6 @@ protected: void pop_clip(); void restore_clip(); // --- implementation is in src/fl_vertex.cxx which includes src/cfg_gfx/xxx_rect.cxx - void fixloop(); void begin_complex_polygon(); void transformed_vertex(double xf, double yf); void vertex(double x, double y); diff --git a/src/fl_vertex.cxx b/src/fl_vertex.cxx index b4cf94492..ae65fa5d4 100644 --- a/src/fl_vertex.cxx +++ b/src/fl_vertex.cxx @@ -107,6 +107,10 @@ void Fl_Graphics_Driver::transformed_vertex0(COORD_T x, COORD_T y) { } } +void Fl_Graphics_Driver::fixloop() { // remove equal points from closed path + while (n>2 && p[n-1].x == p[0].x && p[n-1].y == p[0].y) n--; +} + // ----------------------------------------------------------------------------- |