diff options
| author | Matthias Melcher <fltk@matthiasm.com> | 2016-04-17 15:01:20 +0000 |
|---|---|---|
| committer | Matthias Melcher <fltk@matthiasm.com> | 2016-04-17 15:01:20 +0000 |
| commit | c9d3eabf4e201384a930707fbe1b8a01771f5e3d (patch) | |
| tree | fc9c2a47341ad484ebe787a8cf6524ac8b62ceaf /src/drivers/Xlib | |
| parent | 9ae4a99081237f94d47a480d41313dc65737bd98 (diff) | |
virtualized Fl::set_color and free_color.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11642 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/drivers/Xlib')
| -rw-r--r-- | src/drivers/Xlib/Fl_Xlib_Graphics_Driver.H | 2 | ||||
| -rw-r--r-- | src/drivers/Xlib/Fl_Xlib_Graphics_Driver_color.cxx | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver.H b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver.H index d207ae16a..1e7bd43d8 100644 --- a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver.H +++ b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver.H @@ -125,6 +125,8 @@ protected: void line_style(int style, int width=0, char* dashes=0); // --- implementation is in src/fl_color.cxx which includes src/cfg_gfx/xxx_color.cxx void color(Fl_Color c); + void set_color(Fl_Color i, unsigned int c); + void free_color(Fl_Color i, int overlay); Fl_Color color() { return color_; } void color(uchar r, uchar g, uchar b); virtual float scale_font_for_PostScript(Fl_Font_Descriptor *desc, int s); diff --git a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_color.cxx b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_color.cxx index 5f241423b..4f8f7961f 100644 --- a/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_color.cxx +++ b/src/drivers/Xlib/Fl_Xlib_Graphics_Driver_color.cxx @@ -308,7 +308,7 @@ ulong fl_xpixel(Fl_Color i) { \param[in] i color index \param[in] overlay 0 for normal, 1 for overlay color */ -void Fl::free_color(Fl_Color i, int overlay) { +void Fl_Xlib_Graphics_Driver::free_color(Fl_Color i, int overlay) { # if HAVE_OVERLAY # else if (overlay) return; @@ -332,7 +332,7 @@ void Fl::free_color(Fl_Color i, int overlay) { \param[in] i color index \param[in] c color */ -void Fl::set_color(Fl_Color i, unsigned c) { +void Fl_Xlib_Graphics_Driver::set_color(Fl_Color i, unsigned c) { if (fl_cmap[i] != c) { free_color(i,0); # if HAVE_OVERLAY |