diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2005-05-12 20:03:59 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2005-05-12 20:03:59 +0000 |
| commit | fa986f559dfa1374953925905dfd985ac1d3ebc7 (patch) | |
| tree | d4900d341685bdaaabcaf79b5b49d18f54a47e2e /test/colbrowser.cxx | |
| parent | b4a08278815a17dc6582d32c3f2409e8e47404fb (diff) | |
Added the standard rgb.txt file from X11 to the test directory,
allowing all platforms to try the colbrowser demo (STR #843)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4343 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'test/colbrowser.cxx')
| -rw-r--r-- | test/colbrowser.cxx | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/test/colbrowser.cxx b/test/colbrowser.cxx index b339f7793..af2f056b2 100644 --- a/test/colbrowser.cxx +++ b/test/colbrowser.cxx @@ -43,23 +43,6 @@ char dbname[FL_PATH_MAX]; static void create_form_cl(void); static int load_browser(char *); -/* the RGB data file does not have a standard location on unix. */ - -#ifdef __VMS - static const char *rgbfile = "SYS$MANAGER:DECW$RGB.DAT"; -#else -#ifdef __EMX__ /* OS2 */ -#include <X11/XlibInt.h> - static const char *rgbfile = "/XFree86/lib/X11/rgb.txt"; -#else -#ifdef __FreeBSD__ - static const char *rgbfile = "/usr/X11R6/lib/X11/rgb.txt"; -#else - static const char *rgbfile = "/usr/lib/X11/rgb.txt"; -#endif -#endif -#endif - typedef struct { int r, g, b; } RGBdb; static RGBdb rgbdb[MAX_RGB]; @@ -71,7 +54,7 @@ main(int argc, char *argv[]) fl_initialize(&argc, argv, "FormDemo", 0, 0); create_form_cl(); - strcpy(dbname, rgbfile); + strcpy(dbname, "rgb.txt"); if (load_browser(dbname)) fl_set_object_label(dbobj, dbname); |