From 3b437dae8ce735cded87e93021cb2026cc63cb30 Mon Sep 17 00:00:00 2001 From: Manolo Gouy Date: Tue, 9 Jan 2018 07:26:49 +0000 Subject: Put a default implementation of parse_color() in Fl_Screen_Driver and only Fl_X11_Screen_Driver reimplements it. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12628 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.H | 1 - src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.cxx | 25 ------------------------- 2 files changed, 26 deletions(-) (limited to 'src/drivers/WinAPI') diff --git a/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.H b/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.H index 628fc9511..e28fb791a 100644 --- a/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.H +++ b/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.H @@ -70,7 +70,6 @@ public: virtual int ready(); virtual void grab(Fl_Window* win); // --- global colors - virtual int parse_color(const char* p, uchar& r, uchar& g, uchar& b); virtual void get_system_colors(); virtual const char *get_system_scheme(); // --- global timers diff --git a/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.cxx b/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.cxx index d4fed5922..03aa93ecf 100644 --- a/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.cxx +++ b/src/drivers/WinAPI/Fl_WinAPI_Screen_Driver.cxx @@ -299,31 +299,6 @@ void Fl_WinAPI_Screen_Driver::grab(Fl_Window* win) } -// simulation of XParseColor: -int Fl_WinAPI_Screen_Driver::parse_color(const char* p, uchar& r, uchar& g, uchar& b) -{ - if (*p == '#') p++; - size_t n = strlen(p); - size_t m = n/3; - const char *pattern = 0; - switch(m) { - case 1: pattern = "%1x%1x%1x"; break; - case 2: pattern = "%2x%2x%2x"; break; - case 3: pattern = "%3x%3x%3x"; break; - case 4: pattern = "%4x%4x%4x"; break; - default: return 0; - } - int R,G,B; if (sscanf(p,pattern,&R,&G,&B) != 3) return 0; - switch(m) { - case 1: R *= 0x11; G *= 0x11; B *= 0x11; break; - case 3: R >>= 4; G >>= 4; B >>= 4; break; - case 4: R >>= 8; G >>= 8; B >>= 8; break; - } - r = (uchar)R; g = (uchar)G; b = (uchar)B; - return 1; -} - - static void set_selection_color(uchar r, uchar g, uchar b) { Fl::set_color(FL_SELECTION_COLOR,r,g,b); -- cgit v1.2.3