mirror of
https://github.com/fltk/fltk.git
synced 2026-05-11 06:47:23 +08:00
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
This commit is contained in:
@@ -2,6 +2,9 @@ CHANGES IN FLTK 1.1.7
|
||||
|
||||
- Documentation fixes (STR #648, STR #692, STR #730, STR
|
||||
#744, STR #745)
|
||||
- Added the standard rgb.txt file from X11 to the test
|
||||
directory, allowing all platforms to try the colbrowser
|
||||
demo (STR #843)
|
||||
- Resizing of OpenGL subwindows was broken on OSX (STR #804)
|
||||
- The fltk-config script now supports running from a
|
||||
source directory (STR #840)
|
||||
|
||||
+1
-18
@@ -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);
|
||||
|
||||
+753
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user