Commit 4479f759 authored by Aaron M. Ucko's avatar Aaron M. Ucko

Load fltk-1.1.4 into branches/upstream/current.

parent ae97e678
This diff is collapsed.
CHANGES IN FLTK 1.1.4
- The fl_read_image() function was not implemented on
OSX (STR #161)
- VC++ 7.1 didn't like how the copy operators were
disabled for the Fl_Widget class; now include inline
code which will never be used but makes VC++ happy
(STR #156)
- Fixed an IRIX compile problem caused by a missing
#include (STR #157)
- FLUID didn't write color/selection_color() calls using
the symbolic names when possible, nor did it cast
integer colors to Fl_Color (STR #146)
- Fl_File_Chooser was very close for multiple file
selection in large directories (STR #140)
- Fl_Text_Display/Editor did not disable the current
selection when focus was shifted to another widget
(STR #131)
- Fl_Choice didn't use the normal focus box when the
plastic scheme was in use (STR #129)
- Fl_Text_Editor didn't use selection_color()
consistently (STR #130)
- The fltk_forms, fltk_gl, and fltk_images DSO's and
HP-UX shared libraries are now linked against the fltk
shared library to provide complete dependency
resolution (STR #118)
- The configure.in file did not work with autoconf 2.57.
- FLUID didn't redraw widgets when changing the X, Y, W,
or H values in the widget panel (STR #120)
- Fl_Window::show(argc, argv) wasn't calling
Fl::get_system_colors() as documented (STR #119)
- DSO (shared library) building wasn't quite right for
some platforms (STR #118)
- OSX: some changes to make ProjectBuilder compiles
possible.
- OSX: FLTK would not know where a window was positioned
by the OS. As a result, popup menus could open at
wrong positions.
CHANGES IN FLTK 1.1.4rc2
- Fl_Window::show(argc,argv) incorrectly opened the
......@@ -8,8 +48,8 @@ CHANGES IN FLTK 1.1.4rc2
called Fl::get_system_colors(). This prevented an
application from setting its own color preferences
(STR #115)
- The 'Enter' key event on OS X would not set Fl::e_text
(STR #???)
- The 'Enter' key event on OS X would not set
Fl::e_text.
- Changed behaviour of fluid to always paste into
a selected group (STR #88)
- Menuitem now changes font, even if fontsize
......
......@@ -47,6 +47,7 @@ OTHER CONTRIBUTORS
Albrecht Schlosser
Andrea Suatoni
Paul Sydney
Aaron Ucko
Emanuele Vicentini
Jim Wilson
Ken Yarnall
// generated by Fast Light User Interface Designer (fluid) version 1.0103
// generated by Fast Light User Interface Designer (fluid) version 1.0104
#ifndef Fl_File_Chooser_H
#define Fl_File_Chooser_H
#include <FL/Fl.H>
#include <FL/Fl_Window.H>
#include <FL/Fl_Double_Window.H>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
......@@ -43,9 +43,9 @@ private:
public:
Fl_File_Chooser(const char *d, const char *p, int t, const char *title);
private:
Fl_Window *window;
inline void cb_window_i(Fl_Window*, void*);
static void cb_window(Fl_Window*, void*);
Fl_Double_Window *window;
inline void cb_window_i(Fl_Double_Window*, void*);
static void cb_window(Fl_Double_Window*, void*);
Fl_Choice *showChoice;
inline void cb_showChoice_i(Fl_Choice*, void*);
static void cb_showChoice(Fl_Choice*, void*);
......@@ -76,7 +76,7 @@ private:
static void cb_okButton(Fl_Return_Button*, void*);
inline void cb_Cancel_i(Fl_Button*, void*);
static void cb_Cancel(Fl_Button*, void*);
Fl_Window *favWindow;
Fl_Double_Window *favWindow;
Fl_File_Browser *favList;
inline void cb_favList_i(Fl_File_Browser*, void*);
static void cb_favList(Fl_File_Browser*, void*);
......
//
// "$Id: Fl_Widget.H,v 1.6.2.4.2.20 2003/01/30 21:40:34 easysw Exp $"
// "$Id: Fl_Widget.H,v 1.6.2.4.2.21 2003/09/04 19:07:58 easysw Exp $"
//
// Widget header file for the Fast Light Tool Kit (FLTK).
//
......@@ -73,8 +73,8 @@ class FL_EXPORT Fl_Widget {
// "de-implement" the copy constructors, EXCEPT for when we are using the WIN32 DLL
// interface, in which case we can't hide them because Microsoft requires the copy
// constructors to implement subclassing...
Fl_Widget & operator=(const Fl_Widget &);
Fl_Widget(const Fl_Widget &);
Fl_Widget & operator=(const Fl_Widget &) { return *this; }
Fl_Widget(const Fl_Widget &) {}
# endif // WIN32 && !FL_DLL
protected:
......@@ -217,5 +217,5 @@ public:
#endif
//
// End of "$Id: Fl_Widget.H,v 1.6.2.4.2.20 2003/01/30 21:40:34 easysw Exp $".
// End of "$Id: Fl_Widget.H,v 1.6.2.4.2.21 2003/09/04 19:07:58 easysw Exp $".
//
/*
* "$Id: filename.H,v 1.11.2.4.2.12 2003/01/30 21:40:42 easysw Exp $"
* "$Id: filename.H,v 1.11.2.4.2.13 2003/08/02 05:54:43 matthiaswm Exp $"
*
* Filename header file for the Fast Light Tool Kit (FLTK).
*
......@@ -55,6 +55,16 @@ inline int fl_filename_relative(char *to, const char *from) { return fl_filename
struct dirent {char d_name[1];};
# elif defined(__APPLE__) && defined(__PROJECTBUILDER__)
// Apple's ProjectBuilder has the nasty habit of including recursively
// down the file tree. To avoid re-including <FL/dirent.h> we must
// directly include the systems math file. (Plus, I could not find a
// predefined macro for ProjectBuilder builds, so we have to define it
// in the project)
# include <sys/types.h>
# include "/usr/include/dirent.h"
# else
/*
* WARNING: on some systems (very few nowadays?) <dirent.h> may not exist.
......@@ -117,5 +127,5 @@ FL_EXPORT int fl_filename_list(const char *d, struct dirent ***l,
#endif /* FL_FILENAME_H */
/*
* End of "$Id: filename.H,v 1.11.2.4.2.12 2003/01/30 21:40:42 easysw Exp $".
* End of "$Id: filename.H,v 1.11.2.4.2.13 2003/08/02 05:54:43 matthiaswm Exp $".
*/
//
// "$Id: math.h,v 1.4.2.4.2.8 2003/01/30 21:40:55 easysw Exp $"
// "$Id: math.h,v 1.4.2.4.2.9 2003/08/02 05:54:43 matthiaswm Exp $"
//
// Math header file for the Fast Light Tool Kit (FLTK).
//
......@@ -26,7 +26,16 @@
#ifndef fl_math_h
# define fl_math_h
# include <math.h>
// Apple's ProjectBuilder has the nasty habit of including recursively
// down the file tree. To avoid re-including <FL/math.h> we must
// directly include the systems math file. (Plus, I could not find a
// predefined macro for ProjectBuilder builds, so we have to define it
// in the project)
# if defined(__APPLE__) && defined(__PROJECTBUILDER__)
# include "/usr/include/math.h"
# else
# include <math.h>
# endif
# ifndef M_PI
......@@ -57,5 +66,5 @@ inline double copysign(double a, double b) {return b<0 ? -a : a;}
//
// End of "$Id: math.h,v 1.4.2.4.2.8 2003/01/30 21:40:55 easysw Exp $".
// End of "$Id: math.h,v 1.4.2.4.2.9 2003/08/02 05:54:43 matthiaswm Exp $".
//
//
// "$Id: glut.h,v 1.4.4.2 2002/01/01 15:11:28 easysw Exp $"
// "$Id: glut.h,v 1.4.4.3 2003/08/02 21:17:30 easysw Exp $"
//
// GLUT compatibility header for the Fast Light Tool Kit (FLTK).
//
// Copyright 1998-2002 by Bill Spitzak and others.
// Copyright 1998-2003 by Bill Spitzak and others.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Library General Public
......@@ -26,5 +26,5 @@
#include <FL/glut.H>
//
// End of "$Id: glut.h,v 1.4.4.2 2002/01/01 15:11:28 easysw Exp $".
// End of "$Id: glut.h,v 1.4.4.3 2003/08/02 21:17:30 easysw Exp $".
//
README - Fast Light Tool Kit (FLTK) Version 1.1.3
README - Fast Light Tool Kit (FLTK) Version 1.1.4
-------------------------------------------------
WHAT IS FLTK?
......
/*
* "$Id: config.h,v 1.1.2.4 2002/07/08 14:58:49 easysw Exp $"
* "$Id: config.h,v 1.1.2.5 2003/08/02 21:17:30 easysw Exp $"
*
* Configuration file for the Fast Light Tool Kit (FLTK) for Borland C++.
*
* Copyright 1998-2002 by Bill Spitzak and others.
* Copyright 1998-2003 by Bill Spitzak and others.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
......@@ -218,5 +218,5 @@
/*
* End of "$Id: config.h,v 1.1.2.4 2002/07/08 14:58:49 easysw Exp $".
* End of "$Id: config.h,v 1.1.2.5 2003/08/02 21:17:30 easysw Exp $".
*/
......@@ -1211,7 +1211,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
FL_MAJOR_VERSION=1
FL_MINOR_VERSION=1
FL_PATCH_VERSION=4
FL_RELEASE_VERSION=rc2
FL_RELEASE_VERSION=
FL_API_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION}
......@@ -6270,9 +6270,8 @@ else
cat >conftest.$ac_ext <<_ACEOF
#line $LINENO "configure"
#include "confdefs.h"
/* System header to define __stub macros and hopefully few prototypes
else
which can conflict with char $ac_func (); below. */
/* System header to define __stub macros and hopefully few prototypes,
which can conflict with char $ac_func (); below. */
#include <assert.h>
/* Override any gcc2 internal prototype to avoid an error. */
#ifdef __cplusplus
......
dnl -*- sh -*-
dnl the "configure" script is made from this by running GNU "autoconf"
dnl
dnl "$Id: configure.in,v 1.33.2.31.2.102 2003/07/29 02:12:36 easysw Exp $"
dnl "$Id: configure.in,v 1.33.2.31.2.104 2003/08/05 22:40:45 easysw Exp $"
dnl
dnl Configuration script for the Fast Light Tool Kit (FLTK).
dnl
......@@ -35,7 +35,7 @@ dnl FLTK library versions...
FL_MAJOR_VERSION=1
FL_MINOR_VERSION=1
FL_PATCH_VERSION=4
FL_RELEASE_VERSION=rc2
FL_RELEASE_VERSION=
FL_API_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION}
AC_SUBST(FL_MAJOR_VERSION)
......@@ -377,10 +377,10 @@ AC_CHECK_HEADER(libpng/png.h, AC_DEFINE(HAVE_LIBPNG_PNG_H))
if test x$ac_cv_header_png_h = xyes -o x$ac_cv_header_libpng_png_h = xyes; then
AC_CHECK_LIB(png, png_read_rows,
AC_DEFINE(HAVE_LIBPNG)
[AC_DEFINE(HAVE_LIBPNG)
IMAGELIBS="-lpng $IMAGELIBS"
LIBS="-lpng $LIBS"
AC_CHECK_FUNCS(png_get_valid png_set_tRNS_to_alpha))
AC_CHECK_FUNCS(png_get_valid png_set_tRNS_to_alpha)])
fi
dnl Restore original LIBS settings...
......@@ -852,5 +852,5 @@ dnl Make sure the fltk-config script is executable...
chmod +x fltk-config
dnl
dnl End of "$Id: configure.in,v 1.33.2.31.2.102 2003/07/29 02:12:36 easysw Exp $".
dnl End of "$Id: configure.in,v 1.33.2.31.2.104 2003/08/05 22:40:45 easysw Exp $".
dnl
#
# "$Id: Makefile,v 1.9.2.10.2.20 2003/01/30 21:40:59 easysw Exp $"
# "$Id: Makefile,v 1.9.2.10.2.21 2003/09/08 17:11:44 easysw Exp $"
#
# Documentation makefile for the Fast Light Tool Kit (FLTK).
#
......@@ -262,18 +262,18 @@ fltk.d/index.html: $(HTMLFILES) $(IMAGEFILES)
echo "Generating HTML documentation..."
-$(RMDIR) fltk.d
-$(MKDIR) fltk.d
$(HTMLDOC) --verbose --batch fltk.book -d fltk.d -t html
-$(HTMLDOC) --verbose --batch fltk.book -d fltk.d -t html
fltk.ps: $(HTMLFILES) $(IMAGEFILES)
echo "Generating PostScript documentation..."
$(RM) fltk.ps
$(HTMLDOC) --verbose --batch fltk.book $(MEDIA) -f fltk.ps
-$(HTMLDOC) --verbose --batch fltk.book $(MEDIA) -f fltk.ps
fltk.pdf: $(HTMLFILES) $(IMAGEFILES)
echo "Generating PDF documentation..."
$(RM) fltk.pdf
$(HTMLDOC) --verbose --batch fltk.book $(MEDIA) -f fltk.pdf
-$(HTMLDOC) --verbose --batch fltk.book $(MEDIA) -f fltk.pdf
#
# End of "$Id: Makefile,v 1.9.2.10.2.20 2003/01/30 21:40:59 easysw Exp $".
# End of "$Id: Makefile,v 1.9.2.10.2.21 2003/09/08 17:11:44 easysw Exp $".
#
#
# "$Id: fltk.spec,v 1.1.2.9.2.24 2003/07/29 02:12:36 easysw Exp $"
# "$Id: fltk.spec,v 1.1.2.9.2.26 2003/08/02 21:17:30 easysw Exp $"
#
# RPM spec file for FLTK.
#
# Copyright 1998-2002 by Bill Spitzak and others.
# Copyright 1998-2003 by Bill Spitzak and others.
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Library General Public
......@@ -23,7 +23,7 @@
# Please report all bugs and problems to "fltk-bugs@fltk.org".
#
%define version 1.1.4rc2
%define version 1.1.4
%define release 0
%define prefix /usr
......@@ -96,5 +96,5 @@ rm -rf $RPM_BUILD_ROOT
%{prefix}/share/doc/fltk/*
#
# End of "$Id: fltk.spec,v 1.1.2.9.2.24 2003/07/29 02:12:36 easysw Exp $".
# End of "$Id: fltk.spec,v 1.1.2.9.2.26 2003/08/02 21:17:30 easysw Exp $".
#
//
// "$Id: Fl_Function_Type.cxx,v 1.15.2.16.2.12 2003/01/28 20:51:09 easysw Exp $"
// "$Id: Fl_Function_Type.cxx,v 1.15.2.16.2.13 2003/08/02 21:17:30 easysw Exp $"
//
// C function type code for the Fast Light Tool Kit (FLTK).
//
// Copyright 1998-2002 by Bill Spitzak and others.
// Copyright 1998-2003 by Bill Spitzak and others.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Library General Public
......@@ -740,5 +740,5 @@ void Fl_Class_Type::write_code2() {
}
//
// End of "$Id: Fl_Function_Type.cxx,v 1.15.2.16.2.12 2003/01/28 20:51:09 easysw Exp $".
// End of "$Id: Fl_Function_Type.cxx,v 1.15.2.16.2.13 2003/08/02 21:17:30 easysw Exp $".
//
//
// "$Id: Fl_Group_Type.cxx,v 1.4.2.7.2.2 2002/01/01 15:11:29 easysw Exp $"
// "$Id: Fl_Group_Type.cxx,v 1.4.2.7.2.3 2003/08/02 21:17:30 easysw Exp $"
//
// Fl_Group object code for the Fast Light Tool Kit (FLTK).
//
......@@ -7,7 +7,7 @@
// the Fl_Tabs widget, with special stuff to select tab items and
// insure that only one is visible.
//
// Copyright 1998-2002 by Bill Spitzak and others.
// Copyright 1998-2003 by Bill Spitzak and others.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Library General Public
......@@ -242,5 +242,5 @@ const char tile_type_name[] = "Fl_Tile";
Fl_Tile_Type Fl_Tile_type; // the "factory"
//
// End of "$Id: Fl_Group_Type.cxx,v 1.4.2.7.2.2 2002/01/01 15:11:29 easysw Exp $".
// End of "$Id: Fl_Group_Type.cxx,v 1.4.2.7.2.3 2003/08/02 21:17:30 easysw Exp $".
//
//
// "$Id: Fl_Menu_Type.cxx,v 1.16.2.12.2.6 2002/08/09 22:56:59 easysw Exp $"
// "$Id: Fl_Menu_Type.cxx,v 1.16.2.12.2.7 2003/08/02 21:17:30 easysw Exp $"
//
// Menu item code for the Fast Light Tool Kit (FLTK).
//
......@@ -9,7 +9,7 @@
// This file also contains code to make Fl_Menu_Button, Fl_Menu_Bar,
// etc widgets.
//
// Copyright 1998-2002 by Bill Spitzak and others.
// Copyright 1998-2003 by Bill Spitzak and others.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Library General Public
......@@ -465,5 +465,5 @@ void shortcut_in_cb(Shortcut_Button* i, void* v) {
}
//
// End of "$Id: Fl_Menu_Type.cxx,v 1.16.2.12.2.6 2002/08/09 22:56:59 easysw Exp $".
// End of "$Id: Fl_Menu_Type.cxx,v 1.16.2.12.2.7 2003/08/02 21:17:30 easysw Exp $".
//
//
// "$Id: Fl_Type.cxx,v 1.6.2.6.2.16 2003/07/18 17:43:30 matthiaswm Exp $"
// "$Id: Fl_Type.cxx,v 1.6.2.6.2.17 2003/08/02 21:17:30 easysw Exp $"
//
// Widget type code for the Fast Light Tool Kit (FLTK).
//
......@@ -15,7 +15,7 @@
// not in the linked list and are not written to files or
// copied or otherwise examined.
//
// Copyright 1998-2002 by Bill Spitzak and others.
// Copyright 1998-2003 by Bill Spitzak and others.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Library General Public
......@@ -791,5 +791,5 @@ void Fl_Type::read_property(const char *c) {
int Fl_Type::read_fdesign(const char*, const char*) {return 0;}
//
// End of "$Id: Fl_Type.cxx,v 1.6.2.6.2.16 2003/07/18 17:43:30 matthiaswm Exp $".
// End of "$Id: Fl_Type.cxx,v 1.6.2.6.2.17 2003/08/02 21:17:30 easysw Exp $".
//
//
// "$Id: Fl_Type.h,v 1.5.2.11.2.8 2003/01/28 20:51:11 easysw Exp $"
// "$Id: Fl_Type.h,v 1.5.2.11.2.10 2003/09/03 19:50:54 easysw Exp $"
//
// Widget type header file for the Fast Light Tool Kit (FLTK).
//
......@@ -11,7 +11,7 @@
// instance of this object. It could also have a "copy()" function,
// but it was easier to implement this by using the file read/write
// that is needed to save the setup anyways.
// Copyright 1998-2002 by Bill Spitzak and others.
// Copyright 1998-2003 by Bill Spitzak and others.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Library General Public
......@@ -260,6 +260,7 @@ protected:
void write_extra_code();
void write_block_close();
void write_code2();
void write_color(const char*, Fl_Color);
public:
......@@ -593,5 +594,5 @@ int storestring(const char *n, const char * & p, int nostrip=0);
extern int include_H_from_C;
//
// End of "$Id: Fl_Type.h,v 1.5.2.11.2.8 2003/01/28 20:51:11 easysw Exp $".
// End of "$Id: Fl_Type.h,v 1.5.2.11.2.10 2003/09/03 19:50:54 easysw Exp $".
//
//
// "$Id: Fl_Widget_Type.cxx,v 1.15.2.16.2.26 2003/07/12 04:20:48 easysw Exp $"
// "$Id: Fl_Widget_Type.cxx,v 1.15.2.16.2.28 2003/09/03 19:50:54 easysw Exp $"
//
// Widget type code for the Fast Light Tool Kit (FLTK).
//
// Copyright 1998-2002 by Bill Spitzak and others.
// Copyright 1998-2003 by Bill Spitzak and others.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Library General Public
......@@ -396,6 +396,7 @@ void x_cb(Fl_Value_Input *i, void *v) {
if (o->selected && o->is_widget()) {
Fl_Widget *w = ((Fl_Widget_Type *)o)->o;
w->resize((int)i->value(), w->y(), w->w(), w->h());
if (w->window()) w->window()->redraw();
}
}
}
......@@ -412,6 +413,7 @@ void y_cb(Fl_Value_Input *i, void *v) {
if (o->selected && o->is_widget()) {
Fl_Widget *w = ((Fl_Widget_Type *)o)->o;
w->resize(w->x(), (int)i->value(), w->w(), w->h());
if (w->window()) w->window()->redraw();
}
}
}
......@@ -428,6 +430,7 @@ void w_cb(Fl_Value_Input *i, void *v) {
if (o->selected && o->is_widget()) {
Fl_Widget *w = ((Fl_Widget_Type *)o)->o;
w->resize(w->x(), w->y(), (int)i->value(), w->h());
if (w->window()) w->window()->redraw();
}
}
}
......@@ -444,6 +447,7 @@ void h_cb(Fl_Value_Input *i, void *v) {
if (o->selected && o->is_widget()) {
Fl_Widget *w = ((Fl_Widget_Type *)o)->o;
w->resize(w->x(), w->y(), w->w(), (int)i->value());
if (w->window()) w->window()->redraw();
}
}
}
......@@ -1534,6 +1538,43 @@ void Fl_Widget_Type::write_code1() {
if (varused) write_widget_code();
}
void Fl_Widget_Type::write_color(const char* field, Fl_Color color) {
const char* color_name = 0;
switch (color) {
case FL_FOREGROUND_COLOR: color_name = "FL_FOREGROUND_COLOR"; break;
case FL_BACKGROUND2_COLOR: color_name = "FL_BACKGROUND2_COLOR"; break;
case FL_INACTIVE_COLOR: color_name = "FL_INACTIVE_COLOR"; break;
case FL_SELECTION_COLOR: color_name = "FL_SELECTION_COLOR"; break;
case FL_GRAY0: color_name = "FL_GRAY0"; break;
case FL_DARK3: color_name = "FL_DARK3"; break;
case FL_DARK2: color_name = "FL_DARK2"; break;
case FL_DARK1: color_name = "FL_DARK1"; break;
case FL_BACKGROUND_COLOR: color_name = "FL_BACKGROUND_COLOR"; break;
case FL_LIGHT1: color_name = "FL_LIGHT1"; break;
case FL_LIGHT2: color_name = "FL_LIGHT2"; break;
case FL_LIGHT3: color_name = "FL_LIGHT3"; break;
case FL_BLACK: color_name = "FL_BLACK"; break;
case FL_RED: color_name = "FL_RED"; break;
case FL_GREEN: color_name = "FL_GREEN"; break;
case FL_YELLOW: color_name = "FL_YELLOW"; break;
case FL_BLUE: color_name = "FL_BLUE"; break;
case FL_MAGENTA: color_name = "FL_MAGENTA"; break;
case FL_CYAN: color_name = "FL_CYAN"; break;
case FL_DARK_RED: color_name = "FL_DARK_RED"; break;
case FL_DARK_GREEN: color_name = "FL_DARK_GREEN"; break;
case FL_DARK_YELLOW: color_name = "FL_DARK_YELLOW"; break;
case FL_DARK_BLUE: color_name = "FL_DARK_BLUE"; break;
case FL_DARK_MAGENTA: color_name = "FL_DARK_MAGENTA"; break;
case FL_DARK_CYAN: color_name = "FL_DARK_CYAN"; break;
case FL_WHITE: color_name = "FL_WHITE"; break;
}
if (color_name) {
write_c("%so->%s(%s);\n", indent(), field, color_name);
} else {
write_c("%so->%s((Fl_Color)%d);\n", indent(), field, color);
}
}
// this is split from write_code1() for Fl_Window_Type:
void Fl_Widget_Type::write_widget_code() {
Fl_Widget* tplate = ((Fl_Widget_Type*)factory)->o;
......@@ -1576,9 +1617,9 @@ void Fl_Widget_Type::write_widget_code() {
boxname(b->down_box()));
}
if (o->color() != tplate->color() || subclass())
write_c("%so->color(%d);\n", indent(), o->color());
write_color("color", o->color());
if (o->selection_color() != tplate->selection_color() || subclass())
write_c("%so->selection_color(%d);\n", indent(), o->selection_color());
write_color("selection_color", o->selection_color());
if (image) image->write_code();
if (inactive) inactive->write_code(1);
if (o->labeltype() != tplate->labeltype() || subclass())
......@@ -1589,7 +1630,7 @@ void Fl_Widget_Type::write_widget_code() {
if (o->labelsize() != tplate->labelsize() || subclass())
write_c("%so->labelsize(%d);\n", indent(), o->labelsize());
if (o->labelcolor() != tplate->labelcolor() || subclass())
write_c("%so->labelcolor(%d);\n", indent(), o->labelcolor());
write_color("labelcolor", o->labelcolor());
if (is_valuator()) {
Fl_Valuator* v = (Fl_Valuator*)o;
Fl_Valuator* f = (Fl_Valuator*)(tplate);
......@@ -1978,5 +2019,5 @@ int Fl_Widget_Type::read_fdesign(const char* propname, const char* value) {
}
//
// End of "$Id: Fl_Widget_Type.cxx,v 1.15.2.16.2.26 2003/07/12 04:20:48 easysw Exp $".
// End of "$Id: Fl_Widget_Type.cxx,v 1.15.2.16.2.28 2003/09/03 19:50:54 easysw Exp $".
//
//
// "$Id: Fl_Widget_Type.h,v 1.4.2.4.2.1 2002/01/01 15:11:29 easysw Exp $"
// "$Id: Fl_Widget_Type.h,v 1.4.2.4.2.2 2003/08/02 21:17:30 easysw Exp $"
//
// Widget type header file for the Fast Light Tool Kit (FLTK).
//
......@@ -7,7 +7,7 @@
// This should have the widget pointer in it, but it is still in the
// Fl_Type base class.
//
// Copyright 1998-2002 by Bill Spitzak and others.
// Copyright 1998-2003 by Bill Spitzak and others.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Library General Public
......@@ -36,5 +36,5 @@ void* const LOAD = (void *)9831;
extern Fl_Widget_Type *current_widget; // one of the selected ones
//
// End of "$Id: Fl_Widget_Type.h,v 1.4.2.4.2.1 2002/01/01 15:11:29 easysw Exp $".
// End of "$Id: Fl_Widget_Type.h,v 1.4.2.4.2.2 2003/08/02 21:17:30 easysw Exp $".
//
//
// "$Id: Fl_Window_Type.cxx,v 1.13.2.10.2.6 2002/08/09 22:57:00 easysw Exp $"
// "$Id: Fl_Window_Type.cxx,v 1.13.2.10.2.7 2003/08/02 21:17:30 easysw Exp $"
//
// Window type code for the Fast Light Tool Kit (FLTK).
//
......@@ -7,7 +7,7 @@
// for interacting with the overlay, which allows the user to
// select, move, and resize the children widgets.
//
// Copyright 1998-2002 by Bill Spitzak and others.
// Copyright 1998-2003 by Bill Spitzak and others.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Library General Public
......@@ -792,5 +792,5 @@ int Fl_Window_Type::read_fdesign(const char* propname, const char* value) {
}
//
// End of "$Id: Fl_Window_Type.cxx,v 1.13.2.10.2.6 2002/08/09 22:57:00 easysw Exp $".
// End of "$Id: Fl_Window_Type.cxx,v 1.13.2.10.2.7 2003/08/02 21:17:30 easysw Exp $".
//
//
// "$Id: Fluid_Image.cxx,v 1.7.2.9.2.13 2002/10/03 15:23:46 easysw Exp $"
// "$Id: Fluid_Image.cxx,v 1.7.2.9.2.14 2003/08/02 21:17:30 easysw Exp $"
//
// Pixmap label support for the Fast Light Tool Kit (FLTK).
//
// Copyright 1998-2002 by Bill Spitzak and others.
// Copyright 1998-2003 by Bill Spitzak and others.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Library General Public
......@@ -221,5 +221,5 @@ Fluid_Image *ui_find_image(const char *oldname) {
//
// End of "$Id: Fluid_Image.cxx,v 1.7.2.9.2.13 2002/10/03 15:23:46 easysw Exp $".
// End of "$Id: Fluid_Image.cxx,v 1.7.2.9.2.14 2003/08/02 21:17:30 easysw Exp $".
//
//
// "$Id: Fluid_Image.h,v 1.3.2.4.2.3 2002/01/01 15:11:29 easysw Exp $"
// "$Id: Fluid_Image.h,v 1.3.2.4.2.4 2003/08/02 21:17:30 easysw Exp $"
//
// Image header file for the Fast Light Tool Kit (FLTK).
//
......@@ -7,7 +7,7 @@
// not a class in FLTK itself, and will produce different types of
// code depending on what the image type is.
//
// Copyright 1998-2002 by Bill Spitzak and others.
// Copyright 1998-2003 by Bill Spitzak and others.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Library General Public
......@@ -60,5 +60,5 @@ extern const char *ui_find_image_name;
#endif
//
// End of "$Id: Fluid_Image.h,v 1.3.2.4.2.3 2002/01/01 15:11:29 easysw Exp $".
// End of "$Id: Fluid_Image.h,v 1.3.2.4.2.4 2003/08/02 21:17:30 easysw Exp $".
//
#
# "$Id: Makefile,v 1.10.2.6.2.23 2002/07/30 14:11:21 easysw Exp $"
# "$Id: Makefile,v 1.10.2.6.2.24 2003/08/02 21:17:30 easysw Exp $"
#
# FLUID makefile for the Fast Light Tool Kit (FLTK).
#
# Copyright 1998-2002 by Bill Spitzak and others.
# Copyright 1998-2003 by Bill Spitzak and others.
#
# This library is free software; you can redistribute it and/or
# modify it under the terms of the GNU Library General Public
......@@ -95,5 +95,5 @@ rebuild:
./fluid -c widget_panel.fl
#
# End of "$Id: Makefile,v 1.10.2.6.2.23 2002/07/30 14:11:21 easysw Exp $".
# End of "$Id: Makefile,v 1.10.2.6.2.24 2003/08/02 21:17:30 easysw Exp $".
#
//
// "$Id: Shortcut_Button.h,v 1.3.2.3.2.2 2002/08/09 22:57:00 easysw Exp $"
// "$Id: Shortcut_Button.h,v 1.3.2.3.2.3 2003/08/02 21:17:30 easysw Exp $"
//
// Shortcut header file for the Fast Light Tool Kit (FLTK).
//
// Copyright 1998-2002 by Bill Spitzak and others.
// Copyright 1998-2003 by Bill Spitzak and others.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Library General Public
......@@ -35,5 +35,5 @@ public:
};
//
// End of "$Id: Shortcut_Button.h,v 1.3.2.3.2.2 2002/08/09 22:57:00 easysw Exp $".
// End of "$Id: Shortcut_Button.h,v 1.3.2.3.2.3 2003/08/02 21:17:30 easysw Exp $".
//
//
// "$Id: align_widget.cxx,v 1.1.2.2 2003/01/10 19:29:08 easysw Exp $"
// "$Id: align_widget.cxx,v 1.1.2.3 2003/08/02 21:17:30 easysw Exp $"
//
// alignment code for the Fast Light Tool Kit (FLTK).
//
// Copyright 1998-2002 by Bill Spitzak and others.
// Copyright 1998-2003 by Bill Spitzak and others.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Library General Public
......@@ -326,6 +326,6 @@ void align_widget_cb(Fl_Widget*, long how)
//
// End of "$Id: align_widget.cxx,v 1.1.2.2 2003/01/10 19:29:08 easysw Exp $".
// End of "$Id: align_widget.cxx,v 1.1.2.3 2003/08/02 21:17:30 easysw Exp $".
//
//
// "$Id: code.cxx,v 1.9.2.9.2.5 2002/05/16 12:47:43 easysw Exp $"
// "$Id: code.cxx,v 1.9.2.9.2.6 2003/08/02 21:17:30 easysw Exp $"
//
// Code output routines for the Fast Light Tool Kit (FLTK).
//
// Copyright 1998-2002 by Bill Spitzak and others.
// Copyright 1998-2003 by Bill Spitzak and others.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Library General Public
......@@ -463,5 +463,5 @@ void Fl_Type::write_code1() {
void Fl_Type::write_code2() {}
//
// End of "$Id: code.cxx,v 1.9.2.9.2.5 2002/05/16 12:47:43 easysw Exp $".
// End of "$Id: code.cxx,v 1.9.2.9.2.6 2003/08/02 21:17:30 easysw Exp $".
//
//
// "$Id: factory.cxx,v 1.4.2.11.2.10 2002/10/30 22:30:30 matthiaswm Exp $"
// "$Id: factory.cxx,v 1.4.2.11.2.11 2003/08/02 21:17:30 easysw Exp $"
//
// Widget factory code for the Fast Light Tool Kit (FLTK).
//
......@@ -11,7 +11,7 @@
// to a factory instance for every class (both the ones defined
// here and ones in other files)
//
// Copyright 1998-2002 by Bill Spitzak and others.
// Copyright 1998-2003 by Bill Spitzak and others.
//
// This library is free software; you can redistribute it and/or
// modify it under the terms of the GNU Library General Public
......@@ -962,5 +962,5 @@ int lookup_symbol(const char *name, int &v, int numberok) {
}
//
// End of "$Id: factory.cxx,v 1.4.2.11.2.10 2002/10/30 22:30:30 matthiaswm Exp $".
// End of "$Id: factory.cxx,v 1.4.2.11.2.11 2003/08/02 21:17:30 easysw Exp $".
//
//
// "$Id: file.cxx,v 1.7.2.6.2.8 2003/01/28 20:51:13 easysw Exp $"
// "$Id: file.cxx,v 1.7.2.6.2.9 2003/08/02 21:17:30 easysw Exp $"
//
// Fluid file routines for the Fast Light Tool Kit (FLTK).
//
......@@ -8,7 +8,7 @@
// They are somewhat similar to tcl, using matching { and }