From a31071deb496bdf1b9a932e4bfc15b11687c93fd Mon Sep 17 00:00:00 2001 From: Matthias Melcher Date: Mon, 19 Dec 2005 13:33:08 +0000 Subject: git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@4720 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- documentation/Fl.html | 19 +++++++++---------- documentation/Fl_Image.html | 6 +++--- documentation/Fl_Widget.html | 4 ++-- documentation/common.html | 16 ++++++++++++++-- documentation/migration.html | 12 ++++++++++++ documentation/subclassing.html | 6 +++--- 6 files changed, 43 insertions(+), 20 deletions(-) (limited to 'documentation') diff --git a/documentation/Fl.html b/documentation/Fl.html index 3b3f7e790..a66e3fe39 100644 --- a/documentation/Fl.html +++ b/documentation/Fl.html @@ -392,16 +392,17 @@ any pending redraws can be processed.

void background2(uchar, uchar, uchar);

-

Changes fl_color(FL_WHITE) and the same colors as -Fl::foreground(). This color is used as a background by -Fl_Input and other text widgets. +

Changes the alternative background color. This color is used as a +background by Fl_Input and other text widgets. +

This call may change fl_color(FL_FOREGROUND_COLOR) if it +does not provide sufficient contrast to FL_BACKGROUND2_COLOR.

void background(uchar, uchar, uchar);

-

Changes fl_color(FL_GRAY) to the given color, and changes the -gray ramp from 32 to 56 to black to white. These are the colors used -as backgrounds by almost all widgets and used to draw the edges of all -the boxtypes. +

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 +the colors used as backgrounds by almost all widgets and used to draw +the edges of all the boxtypes.

Fl_Widget* belowmouse();
void belowmouse(Fl_Widget*);

@@ -760,9 +761,7 @@ test if the widget wants the focus (by it returning non-zero from

void foreground(uchar, uchar, uchar);

-

Changes fl_color(FL_BLACK). Also changes -FL_INACTIVE_COLOR and FL_SELECTION_COLOR to be a ramp -between this and FL_WHITE. +

Changes fl_color(FL_FOREGROUND_COLOR).

void free_color(Fl_Color c, int overlay = 0);

diff --git a/documentation/Fl_Image.html b/documentation/Fl_Image.html index ebc596830..7aadbef4a 100644 --- a/documentation/Fl_Image.html +++ b/documentation/Fl_Image.html @@ -165,9 +165,9 @@ image height.

void inactive();

The inactive() method calls -color_average(FL_GRAY, 0.33f) to produce an image that -appears grayed out. This method does not alter the original -image data.

+color_average(FL_BACKGROUND_COLOR, 0.33f) to produce +an image that appears grayed out. This method does not +alter the original image data.

virtual void label(Fl_Widget *w); virtual void label(Fl_Menu_Item *m);

diff --git a/documentation/Fl_Widget.html b/documentation/Fl_Widget.html index 5936726e7..731a3b9c5 100644 --- a/documentation/Fl_Widget.html +++ b/documentation/Fl_Widget.html @@ -241,7 +241,7 @@ normally, all widgets participate in keyboard focus navigation. passed to the box routine. The color is either an index into an internal table of RGB colors or an RGB color value generated using fl_rgb_color(). The default for most widgets is -FL_GRAY. See the FL_BACKGROUND_COLOR. See the enumeration list for predefined colors. Use Fl::set_color() to @@ -347,7 +347,7 @@ automatically.

Fl_Color Fl_Widget::labelcolor() const
void Fl_Widget::labelcolor(Fl_Color)

-

Gets or sets the label color. The default color is FL_BLACK. +

Gets or sets the label color. The default color is FL_FOREGROUND_COLOR.

Fl_Font Fl_Widget::labelfont() const diff --git a/documentation/common.html b/documentation/common.html index d185f6e41..ef171b2d2 100644 --- a/documentation/common.html +++ b/documentation/common.html @@ -214,7 +214,7 @@ fixed contents.

There are symbols for naming some of the more common colors:

    -
  • FL_BLACK (this is the default label color)
    • +
  • FL_BLACK
  • FL_RED
    • @@ -229,8 +229,20 @@ fixed contents.

  • FL_CYAN
  • FL_WHITE
    • +
+ +

These symbols are the default colors for all FLTK widgets. They are +explained in more detail in the chapter +Enumerations

+ +

RGB colors can be set using the fl_rgb_color() diff --git a/documentation/migration.html b/documentation/migration.html index be0f283a1..48bc46f14 100644 --- a/documentation/migration.html +++ b/documentation/migration.html @@ -12,6 +12,18 @@ instead of the unsigned character in 1.0.x. This allows for the specification of 24-bit RGB values or 8-bit FLTK color indices. +

FL_BLACK and FL_WHITE now remain black and +white, even if the base color of the gray ramp is changed using +Fl::background(). +FL_DARK3 and FL_LIGHT3 can be used instead to +draw a very dark or a very bright background hue.

+ +

Widgets use the new color symbols FL_FORGROUND_COLOR, +FL_BACKGROUND_COLOR, FL_BACKGROUND2_COLOR, +FL_INACTIVE_COLOR, and FL_SELECTION_COLOR. +More details can be found in the chapter +Enumerations.

+

Cut and Paste Support

The FLTK clipboard is now broken into two parts - a local diff --git a/documentation/subclassing.html b/documentation/subclassing.html index 7e3cbf126..338ec3e58 100644 --- a/documentation/subclassing.html +++ b/documentation/subclassing.html @@ -43,12 +43,12 @@ and initializes the other instance variables to: