summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>2022-07-26 09:39:30 +0200
committerManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com>2022-07-26 09:39:30 +0200
commitacc9075a58e8c2a43ee4f43cace682845644e8be (patch)
treee6249eb9c61fe4a0354b9da0735a053ce57f8258
parentd026f29993dab21bcad0e2017145c8322f6483a0 (diff)
Remove redundant Fl_PostScript_Graphics_Driver::color() under Pango.
-rw-r--r--src/drivers/PostScript/Fl_PostScript.cxx15
-rw-r--r--src/drivers/PostScript/Fl_PostScript_Graphics_Driver.H3
2 files changed, 7 insertions, 11 deletions
diff --git a/src/drivers/PostScript/Fl_PostScript.cxx b/src/drivers/PostScript/Fl_PostScript.cxx
index 3d0b15f59..8b6dfea9b 100644
--- a/src/drivers/PostScript/Fl_PostScript.cxx
+++ b/src/drivers/PostScript/Fl_PostScript.cxx
@@ -215,14 +215,6 @@ void Fl_PostScript_Graphics_Driver::text_extents(const char *c, int n, int &dx,
Fl_Graphics_Driver::default_driver().text_extents(c, n, dx, dy, w, h);
}
-
-void Fl_PostScript_Graphics_Driver::color(Fl_Color c) {
- Fl::get_color(c, cr_, cg_, cb_);
- color(cr_, cg_, cb_);
-}
-
-Fl_Color Fl_PostScript_Graphics_Driver::color() { return Fl_Graphics_Driver::color(); }
-
void Fl_PostScript_Graphics_Driver::point(int x, int y){
rectf(x,y,1,1);
}
@@ -1062,6 +1054,13 @@ void Fl_PostScript_Graphics_Driver::line_style(int style, int width, char* dashe
fprintf(output, "] 0 setdash\n");
}
+void Fl_PostScript_Graphics_Driver::color(Fl_Color c) {
+ Fl::get_color(c, cr_, cg_, cb_);
+ color(cr_, cg_, cb_);
+}
+
+Fl_Color Fl_PostScript_Graphics_Driver::color() { return Fl_Graphics_Driver::color(); }
+
void Fl_PostScript_Graphics_Driver::color(unsigned char r, unsigned char g, unsigned char b) {
Fl_Graphics_Driver::color( fl_rgb_color(r, g, b) );
cr_ = r; cg_ = g; cb_ = b;
diff --git a/src/drivers/PostScript/Fl_PostScript_Graphics_Driver.H b/src/drivers/PostScript/Fl_PostScript_Graphics_Driver.H
index 7d8b54dca..dc6cc974e 100644
--- a/src/drivers/PostScript/Fl_PostScript_Graphics_Driver.H
+++ b/src/drivers/PostScript/Fl_PostScript_Graphics_Driver.H
@@ -76,9 +76,6 @@ public:
void draw(const char* s, int nBytes, float x, float y) {transformed_draw(s,nBytes,x,y); }
void draw(int angle, const char *str, int n, int x, int y) {Fl_Cairo_Graphics_Driver::draw(angle, str, n, x, y);}
- void color(Fl_Color c);
- void color(uchar r, uchar g, uchar b) {Fl_Cairo_Graphics_Driver::color(r,g,b);}
- Fl_Color color();
void point(int x, int y);
int not_clipped(int x, int y, int w, int h);
int clip_box(int x, int y, int w, int h, int &X, int &Y, int &W, int &H);