diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl_get_system_colors.cxx | 10 | ||||
| -rw-r--r-- | src/drivers/WinAPI/Fl_WinAPI_System_Driver.H | 1 |
2 files changed, 3 insertions, 8 deletions
diff --git a/src/Fl_get_system_colors.cxx b/src/Fl_get_system_colors.cxx index 55ba01d5b..59eb95422 100644 --- a/src/Fl_get_system_colors.cxx +++ b/src/Fl_get_system_colors.cxx @@ -18,6 +18,7 @@ #include <FL/Fl.H> #include <FL/Fl_Screen_Driver.H> +#include <FL/Fl_System_Driver.H> #include <FL/fl_draw.H> #include <FL/x.H> #include <FL/math.h> @@ -29,13 +30,6 @@ #include <FL/Fl_Tiled_Image.H> #include "tile.xpm" -#if defined(WIN32) && !defined(__CYGWIN__) && !defined(__WATCOMC__) -// Visual C++ 2005 incorrectly displays a warning about the use of POSIX APIs -// on Windows, which is supposed to be POSIX compliant... -# define putenv _putenv -#endif // WIN32 && !__CYGWIN__ - - /** Changes fl_color(FL_BACKGROUND_COLOR) to the given color, and changes the gray ramp from 32 to 56 to black to white. These are @@ -184,7 +178,7 @@ int Fl::scheme(const char *s) { static char e[1024]; strcpy(e,"FLTK_SCHEME="); if (s) strlcat(e,s,sizeof(e)); - putenv(e); + Fl::system_driver()->putenv(e); // Load the scheme... return reload_scheme(); diff --git a/src/drivers/WinAPI/Fl_WinAPI_System_Driver.H b/src/drivers/WinAPI/Fl_WinAPI_System_Driver.H index 5ffe037a2..49fb1da63 100644 --- a/src/drivers/WinAPI/Fl_WinAPI_System_Driver.H +++ b/src/drivers/WinAPI/Fl_WinAPI_System_Driver.H @@ -47,6 +47,7 @@ public: virtual void fatal(const char *format, va_list args); virtual char *utf2mbcs(const char *s); virtual char *getenv(const char* v); + virtual int putenv(char* v) {return _putenv(v);} virtual int open(const char* f, int oflags, int pmode); virtual FILE *fopen(const char* f, const char *mode); virtual int system(const char* cmd); |