diff options
| author | Greg Ercolano <erco@seriss.com> | 2019-08-14 12:13:28 -0700 |
|---|---|---|
| committer | Greg Ercolano <erco@seriss.com> | 2019-08-14 12:13:28 -0700 |
| commit | 8070d645a906ef88b85a1939bea8af649bf8dbe8 (patch) | |
| tree | 77ef5cedfed36237e18c9ac1b372024776e403b7 /FL | |
| parent | e3042481ee0cd0eefab51a36f5875492fd58bc80 (diff) | |
| parent | 292739664fdcf03bf4dabd2f1680b0f7c4cb17a1 (diff) | |
Merge branch 'master' of github.com:fltk/fltk
Diffstat (limited to 'FL')
| -rw-r--r-- | FL/Fl_Color_Chooser.H | 8 | ||||
| -rw-r--r-- | FL/platform_types.h | 6 |
2 files changed, 12 insertions, 2 deletions
diff --git a/FL/Fl_Color_Chooser.H b/FL/Fl_Color_Chooser.H index e9a5c5775..db4fae37a 100644 --- a/FL/Fl_Color_Chooser.H +++ b/FL/Fl_Color_Chooser.H @@ -3,7 +3,7 @@ // // Color chooser header file for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2010 by Bill Spitzak and others. +// Copyright 1998-2019 by Bill Spitzak and others. // // This library is free software. Distribution and use rights are outlined in // the file "COPYING" which should have been included with this file. If this @@ -94,6 +94,10 @@ public: them. The pull-down menu lets the user set the input fields to show RGB, HSV, or 8-bit RGB (0 to 255). + The user can press CTRL-C to copy the currently selected color value as + text in RGB hex format with leading zeroes to the clipboard, for instance + \p FL_GREEN would be '00FF00' (since FLTK 1.4.0). + fl_color_chooser() returns non-zero if the user picks ok, and updates the RGB values. If the user picks cancel or closes the window this returns zero and leaves RGB unchanged. @@ -119,6 +123,8 @@ class FL_EXPORT Fl_Color_Chooser : public Fl_Group { static void mode_cb(Fl_Widget*, void*); public: + int handle(int e); + /** Returns which Fl_Color_Chooser variant is currently active \return color modes are rgb(0), byte(1), hex(2), or hsv(3) diff --git a/FL/platform_types.h b/FL/platform_types.h index 771f611a9..c13448614 100644 --- a/FL/platform_types.h +++ b/FL/platform_types.h @@ -116,7 +116,11 @@ typedef int FL_SOCKET; # endif typedef struct HGLRC__ *GLContext; #include <sys/stat.h> -struct dirent {char d_name[1];}; +#ifdef __MINGW32__ +# include <dirent.h> +#else + struct dirent {char d_name[1];}; +#endif #elif defined(__ANDROID__) |