From 2a5a3d4e8b3784ef8e6e24a7bb33ec606a6177e0 Mon Sep 17 00:00:00 2001 From: Manolo Gouy Date: Tue, 28 Dec 2010 15:33:36 +0000 Subject: Use device abstraction for colors. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8129 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/fl_color.cxx | 4 ++-- src/fl_color_mac.cxx | 4 ++-- src/fl_color_win32.cxx | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/fl_color.cxx b/src/fl_color.cxx index e897ac8c0..bac31d189 100644 --- a/src/fl_color.cxx +++ b/src/fl_color.cxx @@ -127,7 +127,7 @@ Fl_XColor fl_xmap[1][256]; /** Current color for drawing operations */ Fl_Color fl_color_; -void Fl_Graphics_Driver::color(Fl_Color i) { +void Fl_Xlib_Graphics_Driver::color(Fl_Color i) { if (i & 0xffffff00) { unsigned rgb = (unsigned)i; fl_color((uchar)(rgb >> 24), (uchar)(rgb >> 16), (uchar)(rgb >> 8)); @@ -138,7 +138,7 @@ void Fl_Graphics_Driver::color(Fl_Color i) { } } -void Fl_Graphics_Driver::color(uchar r,uchar g,uchar b) { +void Fl_Xlib_Graphics_Driver::color(uchar r,uchar g,uchar b) { fl_color_ = fl_rgb_color(r, g, b); if(!fl_gc) return; // don't get a default gc if current window is not yet created/valid XSetForeground(fl_display, fl_gc, fl_xpixel(r,g,b)); diff --git a/src/fl_color_mac.cxx b/src/fl_color_mac.cxx index 881d6a03b..77d7daabe 100644 --- a/src/fl_color_mac.cxx +++ b/src/fl_color_mac.cxx @@ -49,7 +49,7 @@ Fl_XMap* fl_current_xmap; Fl_Color fl_color_; -void Fl_Graphics_Driver::color(Fl_Color i) { +void Fl_Quartz_Graphics_Driver::color(Fl_Color i) { fl_color_ = i; int index; uchar r, g, b; @@ -74,7 +74,7 @@ void Fl_Graphics_Driver::color(Fl_Color i) { CGContextSetRGBStrokeColor(fl_gc, fr, fg, fb, 1.0f); } -void Fl_Graphics_Driver::color(uchar r, uchar g, uchar b) { +void Fl_Quartz_Graphics_Driver::color(uchar r, uchar g, uchar b) { fl_color_ = fl_rgb_color(r, g, b); float fr = r/255.0f; float fg = g/255.0f; diff --git a/src/fl_color_win32.cxx b/src/fl_color_win32.cxx index 656649ecb..945466ce7 100644 --- a/src/fl_color_win32.cxx +++ b/src/fl_color_win32.cxx @@ -94,7 +94,7 @@ static void set_xmap(Fl_XMap& xmap, COLORREF c) { Fl_Color fl_color_; -void Fl_Graphics_Driver::color(Fl_Color i) { +void Fl_GDI_Graphics_Driver::color(Fl_Color i) { if (i & 0xffffff00) { unsigned rgb = (unsigned)i; fl_color((uchar)(rgb >> 24), (uchar)(rgb >> 16), (uchar)(rgb >> 8)); @@ -118,7 +118,7 @@ void Fl_Graphics_Driver::color(Fl_Color i) { } } -void Fl_Graphics_Driver::color(uchar r, uchar g, uchar b) { +void Fl_GDI_Graphics_Driver::color(uchar r, uchar g, uchar b) { static Fl_XMap xmap; COLORREF c = RGB(r,g,b); fl_color_ = fl_rgb_color(r, g, b); -- cgit v1.2.3