diff --git a/CHANGES b/CHANGES index c59447e63..46426c611 100644 --- a/CHANGES +++ b/CHANGES @@ -16,6 +16,11 @@ CHANGES SINCE FLTK 1.0.10 - Eliminated all "string literal converted to char *" warnings. + - OS/2 updates from Alexander Mai. + + - Tidied up the HTML documentation to be more standards + compliant. + - Added support for AIX (static library only). - Added support for SunOS 4.x diff --git a/documentation/Fl_Adjuster.html b/documentation/Fl_Adjuster.html index e3336f8c5..4cc5c464b 100644 --- a/documentation/Fl_Adjuster.html +++ b/documentation/Fl_Adjuster.html @@ -19,7 +19,7 @@

Description

The Fl_Adjuster widget was stolen from Prisms, and has proven to be very useful for values that need a large dynamic range. -

+

Fl_Adjuster widget.

When you press a button and drag to the right the value increases. When you drag to the left it decreases. The largest button adjusts by 100 * step(), the next by 10 * step() and that diff --git a/documentation/Fl_Box.html b/documentation/Fl_Box.html index 4aa5cffeb..ccc593b17 100644 --- a/documentation/Fl_Box.html +++ b/documentation/Fl_Box.html @@ -31,7 +31,7 @@ const char * = 0) char *) The first constructor sets box() to FL_NO_BOX, which means it is invisible. However such widgets are useful as placeholders -or Fl_Group::resizable() +or Fl_Group::resizable() values. To change the box to something visible, use box(n).

The second form of the constructor sets the box to the specified box type.

diff --git a/documentation/Fl_Browser.html b/documentation/Fl_Browser.html index 6d34ea4c9..34516f1d9 100644 --- a/documentation/Fl_Browser.html +++ b/documentation/Fl_Browser.html @@ -48,7 +48,7 @@ browser is a lot of work or is inefficient, you may want to make a subclass of Fl_Browser_.

Methods

- +
  • Fl_Browser
    • diff --git a/documentation/Fl_Browser_.html b/documentation/Fl_Browser_.html index 4d4956a4d..f5cca44fb 100644 --- a/documentation/Fl_Browser_.html +++ b/documentation/Fl_Browser_.html @@ -34,7 +34,7 @@ accessing image data or doing stat() on a file or doing some other slow operation.

    Methods

    - +
    • Fl_Browser_
      • @@ -229,7 +229,7 @@ It allows the Fl_Browser_ to update its cache data as needed.

      virtual void Fl_Browser_::item_draw(void *p, int x, int y, int w, int h)

      This method must be provided by the subclass to draw the item -p in the area indicated by x, y, w, +p in the area indicated by x, y, w, and h. @@ -265,7 +265,7 @@ item p in pixels. Allow for two additional pixels for the list selection box. This method differs from item_height in that it is only called for selection and scrolling operations. The default implementation -calls item_height. +calls item_height.

      virtual void Fl_Browser_::item_select(void *p, int s=1)

      diff --git a/documentation/Fl_Button.html b/documentation/Fl_Button.html index 3c713852d..cd8c2db7a 100644 --- a/documentation/Fl_Button.html +++ b/documentation/Fl_Button.html @@ -33,7 +33,7 @@ Alt key so that the input field does not eat the event first as an FL_KEYBOARD event.

      Methods

      - +
      • Fl_Button
        • diff --git a/documentation/Fl_Chart.html b/documentation/Fl_Chart.html index 661bd521f..15420b6c6 100644 --- a/documentation/Fl_Chart.html +++ b/documentation/Fl_Chart.html @@ -18,10 +18,10 @@

      Description

      This widget displays simple charts and is provided for Forms compatibility. -
      +
      Fl_Chart widget

      Methods

      - +
      • Fl_Chart
        • diff --git a/documentation/Fl_Check_Button.html b/documentation/Fl_Check_Button.html index 475a8c9f6..1f60a548f 100644 --- a/documentation/Fl_Check_Button.html +++ b/documentation/Fl_Check_Button.html @@ -20,12 +20,12 @@ Buttons generate callbacks when they are clicked by the user. You control exactly when and how by changing the values for type() and when(). -

        +

        Fl_Check_Button widget

        The Fl_Check_Button subclass display the "on" state by turning on a light, rather than drawing pushed in. The shape of the "light" is initially set to FL_DIAMOND_DOWN_BOX. The color of the -light when on is controlled with selection_color(), which -defaults to FL_RED.

        +light when on is controlled with selection_color(), which +defaults to FL_RED.

        Methods

        • Fl_Check_Button
          • diff --git a/documentation/Fl_Double_Window.html b/documentation/Fl_Double_Window.html index ffe154f76..03ddfb08b 100644 --- a/documentation/Fl_Double_Window.html +++ b/documentation/Fl_Double_Window.html @@ -46,13 +46,8 @@ Fl_Double_Window::~Fl_Double_Window() The destructor also deletes all the children. This allows a whole tree to be deleted at once, without having to keep a pointer to all the children in the user code. -

          ulong Fl_Double_Window::pixmap() const

          Returns the off-screen pixmap or back buffer. This value is zero until the first time flush() is called. - - - -"> - \ No newline at end of file diff --git a/documentation/Fl_Gl_Window.html b/documentation/Fl_Gl_Window.html index 079fc5eec..a362252df 100644 --- a/documentation/Fl_Gl_Window.html +++ b/documentation/Fl_Gl_Window.html @@ -31,7 +31,7 @@ This works pretty well if your graphics are double buffered, but not very well for single-buffered.

          Methods

          - +
          • Fl_Gl_Window
            • diff --git a/documentation/Fl_Group.html b/documentation/Fl_Group.html index ee8930c85..7b7289e8c 100644 --- a/documentation/Fl_Group.html +++ b/documentation/Fl_Group.html @@ -27,7 +27,7 @@ groups can also be used to control radio buttons or to enforce resize behavior.

            Methods

            - +
            • Fl_Group
              • @@ -138,8 +138,8 @@ dimensions of the box are scaled to the new size. Widgets outside the box are moved.

              In these examples the gray area is the resizable:

              -

                

              +

              Resizeable groups   +Resizeable groups

              The resizable may be set to the group itself (this is the default value for an Fl_Group, although NULL is the default for an Fl_Window), in which case all the contents are resized. @@ -152,4 +152,4 @@ of child Fl_Group's.

              Fl_Group &Fl_Group::add_resizable(Fl_Widget &box)

              Adds a widget to the group and makes it the resizable widget. - + diff --git a/documentation/Fl_Input.html b/documentation/Fl_Input.html index 8e5a248d0..e0b27db16 100644 --- a/documentation/Fl_Input.html +++ b/documentation/Fl_Input.html @@ -20,16 +20,15 @@

            Description

            - This is the FLTK text input widget. It displays a single line of text +

            This is the FLTK text input widget. It displays a single line of text and lets the user edit it. Normally it is drawn with an inset box and a white background. The text may contain any characters (even 0), and will correctly display anything, using ^X notation for unprintable control characters and \nnn notation for unprintable characters with -the high bit set. It assummes the font can draw any characters in the +the high bit set. It assumes the font can draw any characters in the ISO-8859-1 character set. -

            -

            +
            Mouse button 1Moves the cursor to this point. Drag selects characters. Double click selects words. @@ -104,8 +103,8 @@ inserted.
            -
            - +
            Character Composition Table
            + @@ -230,7 +229,7 @@ inserted.

            Methods

            -
            Character Composition Table
            KeysChar KeysChar
            +
            • Fl_Input
              • diff --git a/documentation/Fl_Input_.html b/documentation/Fl_Input_.html index 42248d747..c5f814de7 100644 --- a/documentation/Fl_Input_.html +++ b/documentation/Fl_Input_.html @@ -37,7 +37,7 @@ type() to one of the following values:

            Methods

            - +
            • Fl_Input_
              • diff --git a/documentation/Fl_Light_Button.html b/documentation/Fl_Light_Button.html index fc8820c5f..bec16ae0d 100644 --- a/documentation/Fl_Light_Button.html +++ b/documentation/Fl_Light_Button.html @@ -20,12 +20,12 @@ Buttons generate callbacks when they are clicked by the user. You control exactly when and how by changing the values for type() and when(). -

              +

              Fl_Light_Button widget.

              The Fl_Light_Button subclass display the "on" state by turning on a light, rather than drawing pushed in. The shape of the "light" is initially set to FL_DOWN_BOX. The color of the light when -on is controlled with selection_color(), which defaults to -FL_YELLOW.

              +on is controlled with selection_color(), which defaults to +FL_YELLOW.

              Methods

              • Fl_Light_Button
                • diff --git a/documentation/Fl_Menu_.html b/documentation/Fl_Menu_.html index 92651f4ad..c3c080dc1 100644 --- a/documentation/Fl_Menu_.html +++ b/documentation/Fl_Menu_.html @@ -32,7 +32,7 @@ be "private": a dynamically allocated array managed by the Fl_Menu_.

                Methods

                - +
                • Fl_Menu_
                  • @@ -131,7 +131,7 @@ that the new entry was placed at.

                  The return value is the index into the array that the entry was put.

                  -

                  int Fl_Menu_::add(const char *)

                  +

                  int Fl_Menu_::add(const char *)

                  The passed string is split at any '|' characters and then add(s,0,0,0,0) is done with each section. This is often useful diff --git a/documentation/Fl_Menu_Bar.html b/documentation/Fl_Menu_Bar.html index 6c97bca31..a33db2fda 100644 --- a/documentation/Fl_Menu_Bar.html +++ b/documentation/Fl_Menu_Bar.html @@ -27,7 +27,7 @@ single Fl_Menu_Item top level menu defines the items in the menubar, while the submenus define the pull-down menus. Sub-sub menus and lower pop up to the right of the submenus.

                  -

                  +

                  Fl_Menu_Bar widget.

                  If there is an item in the top menu that is not a title of a submenu, then it acts like a "button" in the menubar. Clicking on it will pick it.

                  diff --git a/documentation/Fl_Menu_Button.html b/documentation/Fl_Menu_Button.html index b073b4dd3..35a112481 100644 --- a/documentation/Fl_Menu_Button.html +++ b/documentation/Fl_Menu_Button.html @@ -20,7 +20,7 @@ This is a button that when pushed pops up a menu (or hierarchy of menus) defined by an array of Fl_Menu_Item objects. -

                  +

                  Fl_Menu_Button widget.

                  Normally any mouse button will pop up a menu and it is lined up below the button as shown in the picture. However an Fl_Menu_Button may also control a pop-up menu. This is done by setting the type() diff --git a/documentation/Fl_Menu_Item.html b/documentation/Fl_Menu_Item.html index 68edf053d..ed470f926 100644 --- a/documentation/Fl_Menu_Item.html +++ b/documentation/Fl_Menu_Item.html @@ -69,7 +69,7 @@ Fl_Menu_Item popup[] = { {0}};

                produces: -

                +

                Fl_Menu_Item widgets.

                A submenu title is identified by the bit FL_SUBMENU in the flags field, and ends with a label() that is NULL. @@ -82,7 +82,7 @@ not access them directly to avoid compatibility problems with future releases of FLTK.

                Methods

                - +
                • label
                  • diff --git a/documentation/Fl_Output.html b/documentation/Fl_Output.html index 7e9c91679..9dd4ce7bd 100644 --- a/documentation/Fl_Output.html +++ b/documentation/Fl_Output.html @@ -24,7 +24,7 @@ which is useful for program-generated values. The user may select portions of the text using the mouse and paste the contents into other fields or programs. -
                  +
                  Fl_Output widget.

                  There is a single subclass, Fl_Multiline_Output, which allows you to display multiple lines of text.

                  diff --git a/documentation/Fl_Overlay_Window.html b/documentation/Fl_Overlay_Window.html index aff4ef694..8da57d313 100644 --- a/documentation/Fl_Overlay_Window.html +++ b/documentation/Fl_Overlay_Window.html @@ -41,14 +41,14 @@ position, size, and label (title) string.

                  virtual Fl_Overlay_Window::~Fl_Overlay_Window()

                  Destroys the window and all child widgets. -

                  virtual void +

                  virtual void Fl_Overlay_Window::draw_overlay() = 0

                  You must subclass Fl_Overlay_Window and provide this method. It is just like a draw() method, except it draws the overlay. The overlay will have already been "cleared" when this is called. You can use any of the routines described in <FL/fl_draw.H>. -

                  void Fl_Overlay_Window::redraw_overlay() +

                  void Fl_Overlay_Window::redraw_overlay()

                  Call this to indicate that the overlay data has changed and needs to be redrawn. The overlay will be clear until the first time this is diff --git a/documentation/Fl_Pack.html b/documentation/Fl_Pack.html index 5eb0a324e..fce869243 100644 --- a/documentation/Fl_Pack.html +++ b/documentation/Fl_Pack.html @@ -30,7 +30,7 @@ widgets.

                  Fl_Scroll.

                  Methods

                  - +
                  • Fl_Pack
                    • diff --git a/documentation/Fl_Positioner.html b/documentation/Fl_Positioner.html index 720b4b2e8..1268be536 100644 --- a/documentation/Fl_Positioner.html +++ b/documentation/Fl_Positioner.html @@ -21,10 +21,10 @@ It would be useful if this could be put atop another widget so that the crosshairs are on top, but this is not implemented. The color of the crosshairs is selection_color(). -

                    +

                    Fl_Positioner widget.

                    Methods

                    - +
                    • Fl_Positioner
                      • diff --git a/documentation/Fl_Return_Button.html b/documentation/Fl_Return_Button.html index 7d5653480..5a97ef7c5 100644 --- a/documentation/Fl_Return_Button.html +++ b/documentation/Fl_Return_Button.html @@ -17,7 +17,7 @@ The Fl_Return_Button is a subclass of Fl_Button that generates a callback when it is pressed or when the user presses the Enter key. A carriage-return symbol is drawn next to the button label. -

                      +

                      Fl_Return_Button widget.

                      Methods

                      • Fl_Return_Button
                        • diff --git a/documentation/Fl_Round_Button.html b/documentation/Fl_Round_Button.html index a103d9f7c..19a44c80a 100644 --- a/documentation/Fl_Round_Button.html +++ b/documentation/Fl_Round_Button.html @@ -20,12 +20,12 @@ Buttons generate callbacks when they are clicked by the user. You control exactly when and how by changing the values for type() and when(). -

                        +

                        Fl_Round_Button widget.

                        The Fl_Round_Button subclass display the "on" state by turning on a light, rather than drawing pushed in. The shape of the "light" is initially set to FL_ROUND_DOWN_BOX. The color of the light -when on is controlled with selection_color(), which defaults to -FL_RED.

                        +when on is controlled with selection_color(), which defaults to +FL_RED.

                        Methods

                        • Fl_Round_Button
                          • diff --git a/documentation/Fl_Scroll.html b/documentation/Fl_Scroll.html index cd5bef9b2..0d23d2cb6 100644 --- a/documentation/Fl_Scroll.html +++ b/documentation/Fl_Scroll.html @@ -21,7 +21,7 @@ larger than your window. If the child widgets are larger than the size of this object then scrollbars will appear so that you can scroll over to them: -

                          +

                          Fl_Scroll widget.

                          If all of the child widgets are packed together into a solid rectangle then you want to set box() to FL_NO_BOX or one of the _FRAME types. This will result in the best output. diff --git a/documentation/Fl_Tabs.html b/documentation/Fl_Tabs.html index d7c0addc9..5e5623ea1 100644 --- a/documentation/Fl_Tabs.html +++ b/documentation/Fl_Tabs.html @@ -20,11 +20,11 @@ The Fl_Tabs widget is the "file card tabs" interface that allows you to put lots and lots of buttons and switches in a panel, as popularized by many toolkits. -

                          +

                          Fl_Tabs widget.

                          Clicking the tab makes a child visible() (by calling show() on it) and all other children are invisible (by calling hide() on them). Usually the children are -Fl_Group widgets containing several widgets +Fl_Group widgets containing several widgets themselves.

                          Each child makes a card, and it's label() is printed on the card tab (including the label font and style). The color of that child diff --git a/documentation/Fl_Tile.html b/documentation/Fl_Tile.html index 8c281da97..a782e0bcd 100644 --- a/documentation/Fl_Tile.html +++ b/documentation/Fl_Tile.html @@ -19,7 +19,7 @@

                          Description

                          The Fl_Tile class lets you resize the children by dragging the border between them: -

                          +

                          Fl_Tile widget.

                          Fl_Tile allows objects to be resized to zero dimensions. To prevent this you can use the resizable() to limit where corners can be dragged to.

                          diff --git a/documentation/Fl_Valuator.html b/documentation/Fl_Valuator.html index fddf7ecc8..7355e4c89 100644 --- a/documentation/Fl_Valuator.html +++ b/documentation/Fl_Valuator.html @@ -24,7 +24,7 @@ and provides a consistent interface to set the value, range, and step, and insures that callbacks are done the same for every object.

                          There are probably more of these classes in FLTK than any others:

                          -

                          +

                          Fl_Valuator widgets.

                          In the above diagram each box surrounds an actual subclass. These are further differentiated by setting the type() of the widget to the symbolic value labeling the @@ -33,7 +33,7 @@ type(0). For consistency the symbol FL_VERTICAL is defined as zero.

                          Methods

                          - +
                          • Fl_Valuator
                            • diff --git a/documentation/Fl_Value_Slider.html b/documentation/Fl_Value_Slider.html index a2b8ce518..122deda59 100644 --- a/documentation/Fl_Value_Slider.html +++ b/documentation/Fl_Value_Slider.html @@ -19,7 +19,7 @@

                            Description

                            The Fl_Value_Slider widget is a Fl_Slider widget with a box displaying the current value. -

                            +

                            Fl_Value_Slider widget.

                            Methods

                            • Fl_Value_Slider
                              • diff --git a/documentation/Fl_Widget.html b/documentation/Fl_Widget.html index ea3faead3..3729f9872 100644 --- a/documentation/Fl_Widget.html +++ b/documentation/Fl_Widget.html @@ -31,7 +31,7 @@ even if they change the widget's appearance. It is up to the user code to call redraw() after these.

                              Methods

                              - +
                              • Fl_Widget
                                • diff --git a/documentation/Fl_Window.html b/documentation/Fl_Window.html index 87ac71072..291a48c8b 100644 --- a/documentation/Fl_Window.html +++ b/documentation/Fl_Window.html @@ -37,7 +37,7 @@ Fl::modal() is zero or equal to the window. Fl_Window exit(0) if this is the last top-level window.

                                Methods

                                - +
                                • Fl_Window
                                  • @@ -80,7 +80,7 @@ exit(0) if this is the last top-level window.

                                -

                                Fl_Window::Fl_Window(int w, int h, const char *title = 0)

                                +

                                Fl_Window::Fl_Window(int w, int h, const char *title = 0)

                                The first form of the constructor should be used for a "top-level" window (that is, one that is not inside another window). It correctly sets @@ -95,7 +95,7 @@ plan to completely fill the window with children widgets you should change this to FL_NO_BOX. If you turn the window border off you may want to change this to FL_UP_BOX.

                                -

                                Fl_Window::Fl_Window(int x, int y, int w, int h, const char *title = 0)

                                +

                                Fl_Window::Fl_Window(int x, int y, int w, int h, const char *title = 0)

                                The second form of the constructor is for creating child windows. It leaves visible() set to true. @@ -258,7 +258,7 @@ debug and maintain! Fl_Gl_Window classes.

                                static Fl_Window* Fl_Window::current()

                                Returns the last window that was made current. -

                                void Fl_Window::cursor(Fl_Cursor, Fl_Color = FL_WHITE, Fl_Color = FL_BLACK)

                                +

                                void Fl_Window::cursor(Fl_Cursor, Fl_Color = FL_WHITE, Fl_Color = FL_BLACK)

                                Change the cursor for this window. This always calls the system, if you are changing the cursor a lot you may want to keep track of how you set it in a static varaible and call this only if the new cursor diff --git a/documentation/basics.html b/documentation/basics.html index 9d48c5751..3b4c3a8f0 100644 --- a/documentation/basics.html +++ b/documentation/basics.html @@ -117,7 +117,7 @@ return Fl::run();
                              The resulting program will display the window below. You can quit the program by closing the window or pressing the ESCape key. -

                              +

                              Hello, World! Window

                              Creating the Widgets

                              The widgets are created using the C++ new operator. For most widgets the arguments to the constructor are: diff --git a/documentation/common.html b/documentation/common.html index 5677344e0..c2560980f 100644 --- a/documentation/common.html +++ b/documentation/common.html @@ -13,7 +13,7 @@ and covers how to query and set the standard attributes. Enter key.
                            • Fl_Round_Button - A button with a check circle.
                              • -

                              +

                              FLTK Buttons

                              For all of these buttons you just need to include the corresponding <FL/Fl_xyz_Button.H> header file. The constructor takes the bounding box of the button and optionally a label string: @@ -75,7 +75,7 @@ strings. FLTK provides the following valuators:

                            • Fl_Slider - A scrollbar with a knob.
                            • Fl_Value_Slider - A slider that shows the current value.
                              • -

                              +

                              FLTK Valuators

                              The value() method gets and sets the current value of the widget. The minimum() and @@ -143,7 +143,7 @@ button->labelcolor(FL_WHITE);

                              The type Fl_Boxtype stored and returned in Fl_Widget::box() is an enumeration defined in <Enumerations.H>: -

                              +

                              FLTK Box Types

                              FL_NO_BOX means nothing is drawn at all, so whatever is already on the screen remains. The FL_..._FRAME types only draw their edges, leaving the interior unchanged. In the above diagram @@ -280,14 +280,14 @@ type.

                              The Fl::set_labeltype method can also be used to overload an existing label type such as FL_NORMAL_LABEL.

                              Symbol Labels

                              -The FL_SYMBOL_LABEL label type uses the label() - string to look up a small drawing procedure in a hash table. For +

                              The FL_SYMBOL_LABEL label type uses the label() +string to look up a small drawing procedure in a hash table. For historical reasons the string always starts with '@'; if it starts with something else (or the symbol is not found) the label is drawn normally: -

                              - The @ sign may be followed by the following optional "formatting" -characters, in this order:

                              +
                              FLTK Symbols
                              +

                              The @ sign may be followed by the following optional "formatting" +characters, in this order:

                              • '#' forces square scaling, rather than distortion to the widget's shape.
                                • diff --git a/documentation/drawing.html b/documentation/drawing.html index e7baa1c0e..e97edb1b8 100644 --- a/documentation/drawing.html +++ b/documentation/drawing.html @@ -51,7 +51,7 @@ Restore the previous clip region. You must call fl_pop_clip() once for every time you call fl_clip(). If you return to FLTK with the clip stack not empty unpredictable results occur.

                                int fl_not_clipped(int x, int y, int w, int h)

                                - Returns true if any of the rectangle intersects the current clip +Returns true if any of the rectangle intersects the current clip region. If this returns false you don't have to draw the object. Under X this returns 2 if the rectangle is partially clipped, and 1 if it is entirely inside the clip region. @@ -230,7 +230,7 @@ holes should be drawn in the opposite direction of the outside.

                                fl_gap() should only be called between fl_begin_complex_polygon() and fl_end_complex_polygon(). To outline the polygon, use fl_begin_loop() and replace each -fl_gap() with fl_end_loop();fl_begin_loop().

                                +fl_gap()                                 with fl_end_loop();fl_begin_loop().

                                void fl_vertex(float x, float y)

                                Add a single vertex to the current path.

                                void fl_curve(float x, float y, float x1, float y1, float x2, float diff --git a/documentation/editor.html b/documentation/editor.html index 2d4f0b948..382f4bbf5 100644 --- a/documentation/editor.html +++ b/documentation/editor.html @@ -122,7 +122,7 @@ and "replace all", "replace next", and "cancel" bu are just Fl_Input widgets, the "replace all" and "cancel" buttons are Fl_Button widgets, and the "replace next " button is a Fl_Return_Button widget: -

                                +

                                The search and replace dialog.

                                   Fl_Window *replace_dlg = new Fl_Window(300, 105, "Replace");
@@ -553,5 +553,5 @@ library. Also, the CC command may also be called gcc
 
                                  Congratulations, you've just built your own text editor! 
                                  
 
                                  The Final Product
                                  
  The final editor window should look like the image on the next page.
-
                                  
+
                                  The completed editor window.
                                  
 
diff --git a/documentation/enumerations.html b/documentation/enumerations.html
index 6ffee5988..400a41797 100644
--- a/documentation/enumerations.html
+++ b/documentation/enumerations.html
@@ -42,7 +42,7 @@ understand) occurred (0).
 
                                • FL_SELECTIONCLEAR - The widget should clear any selections 
  made for the clipboard. 
                                  •
                                -

                                Callback "When" Conditions

                                +

                                Callback "When" Conditions

                                The following constants determine when a callback is performed:
                                • FL_WHEN_NEVER - Never call the callback (0).
                                  • @@ -125,7 +125,7 @@ FL_KEYBOARD and FL_SHORTCUT events:
                                • FL_BUTTON2 - Mouse button 2 is pushed.
                                • FL_BUTTON3 - Mouse button 3 is pushed.
                                -

                                Alignment Values

                                +

                                Alignment Values

                                The following constants define bits that can be used with Fl_Widget::align() to control the positioning of the label: @@ -149,7 +149,7 @@ label: label inside the widget.
                              -

                              Fonts

                              +

                              Fonts

                              The following constants define the standard FLTK fonts:
                              • FL_HELVETICA - Helvetica (or Arial) normal (0).
                                • @@ -171,7 +171,7 @@ bold-oblique.
                              • FL_ZAPF_DINGBATS - Zapf-dingbats font.
                              -

                              Colors

                              +

                              Colors

                              The following color constants can be used to access the colors in the FLTK standard color palette:
                                @@ -207,9 +207,9 @@ To get the closest color to a 8-bit set of R,G,B values use fl_color_cube(R*FL_NUM_RED/256, G*FL_NUM_GREEN/256, B*FL_NUM_BLUE/256); -

                                Cursors

                                +

                                Cursors

                                -The following constants define the mouse cursors that are available in +

                                The following constants define the mouse cursors that are available in FLTK. The double-headed arrows are bitmaps provided by FLTK on X, the others are provided by system-defined cursors.

                                @@ -237,7 +237,7 @@ cursors.

                              • FL_EXCEPT - Call the callback if an exception occurs on the file.
                              -

                              Damage Masks

                              +

                              Damage Masks

                              The following damage mask bits are used by the standard FLTK widgets:
                              • FL_DAMAGE_CHILD - A child needs to be redrawn.
                                • @@ -247,5 +247,4 @@ cursors.

                              • FL_DAMAGE_OVERLAY - The overlay planes need to be redrawn.
                              • FL_DAMAGE_ALL - Everything needs to be redrawn.
                              - diff --git a/documentation/fluid.html b/documentation/fluid.html index 45ceb9e60..f6ed41335 100644 --- a/documentation/fluid.html +++ b/documentation/fluid.html @@ -29,7 +29,7 @@ These .cxx files must #include the .h file or they ca #include the .cxx file so it still appears to be a single source file. -

                              +

                              FLUID organization.

                              Normally the FLUID file defines one or more functions or classes which output C++ code. Each function defines a one or more FLTK @@ -113,7 +113,7 @@ simple tasks with it. This tutorial will show you how to generate a complete user interface class with FLUID that is used for the CubeView program provided with FLTK. -

                              +

                              CubeView demo.

                              The window is of class CubeViewUI, and is completely generated by FLUID, including class member functions. The central display of the cube is a separate @@ -323,14 +323,14 @@ void CubeView::draw() {

                              The CubeViewUI Class

                              We will completely construct a window to display and control the CubeView defined in the previous section using FLUID. -

                              Defining the CubeViewUI Class

                              +

                              Defining the CubeViewUI Class

                              Once you have started FLUID, the first step in defining a class is to create a new class within FLUID using the New->Code->Class menu item. Name the class "CubeViewUI" and leave the subclass blank. We do not need any inheritance for this window. You should see the new class declaration in the FLUID browser window. -

                              +

                              FLUID file for CubeView.

                              Adding the Class Constructor

                              Click on the CubeViewUI class in the FLUID window and add a new method by selecting New->Code->Function/Method. The name of the @@ -352,7 +352,7 @@ None of these additions need be public. And they shouldn't be unless you plan to expose them as part of the interface for CubeViewUI.

                              When you are finished you should have something like this: -

                              +

                              FLUID window containing CubeView demo.

                              We will talk about the show() method that is highlighted shortly.

                              Adding the CubeView Widget

                              @@ -373,7 +373,7 @@ Code:" field enter #include "CubeView.h" CubeView as a member of CubeViewUI, so any public CubeView methods are now available to CubeViewUI. -

                              +

                              CubeView methods.

                              Defining the Callbacks

                              Each of the widgets we defined before adding CubeView can have @@ -401,7 +401,7 @@ appear on the screen. show(). We don't need a return value here, and since we will not be adding any widgets to this method FLUID will assign it a return type of void. -

                              +

                              CubeView constructor.

                              Once the new method has been added, highlight its name and select New->Code->Code. Enter the method's code in the code window. @@ -553,7 +553,7 @@ grid that all widgets snap to when you move and resize them, and for the "snap" which is how far a widget has to be dragged from its original position to actually change. -

                              +

                              FLUID Preferences Window

                              The output filenames control the extensions or names of the files the are generated by FLUID. If you check the "Include .h from .cxx" button the code @@ -617,7 +617,7 @@ to "visible" attributes (such as the color, label, box) are not undone by revert or cancel. Changes to code like the callbacks are undone, however. - +
                              - +

                              Widget Attributes

                              @@ -636,7 +636,7 @@ You pick the subtype off of this menu. The boxtype to draw as a background for the widget.                               		   The FLUID widget dialog.

                              Many widgets will work, and draw faster, with a "frame" instead of a @@ -918,7 +918,7 @@ to select the appropriate language and message file. "GNU gettext" from the "Use" chooser. Two new input fields will then appear to control the include file and function/macro name to use when retrieving the localized label strings. -

                              +

                              I18N using FLUID.

                              The "#include" field controls the header file to include for I18N; by default this is <libintl.h>, the standard I18N file for GNU gettext. @@ -934,7 +934,7 @@ need to call setlocale() to select the appropriate language. "POSIX catgets" from the "Use" chooser. Three new input fields will then appear to control the include file, catalog file, and set number for retrieving the localized label strings. -

                              +

                              I18N using FLUID

                              The "#include" field controls the header file to include for I18N; by default this is <nl_types.h>, the standard I18N file for POSIX catgets. diff --git a/documentation/forms.html b/documentation/forms.html index f08952a94..9b405416b 100644 --- a/documentation/forms.html +++ b/documentation/forms.html @@ -68,7 +68,6 @@ all occurances of "->fdui" and edit to use "->user_data()&q

                              The prototype for the functions passed to fl_add_timeout() and fl_set_idle_callback() callback are different.

                              All the following XForms calls are missing:

                              -

                              • FL_REVISION, fl_library_version()
                              • FL_RETURN_DBLCLICK (use Fl::event_clicks())
                                • @@ -166,7 +165,7 @@ have to rewrite things a lot.

                                You Cannot Use <device.h>

                                If you have written your own "free" widgets you will probably get a lot of errors about "getvaluator". You should substitute: -
                                +
                                diff --git a/documentation/functions.html b/documentation/functions.html index 591f4edba..98f965500 100644 --- a/documentation/functions.html +++ b/documentation/functions.html @@ -10,13 +10,13 @@ href=widgets.html#widgets> Appendix A.

                                int fl_color_chooser(const char *title, double &r, double &g, double &b) -
                                int fl_color_chooser(const char *title, uchar &r, uchar &g, uchar &b)

                                +
                                int fl_color_chooser(const char *title, uchar &r, uchar &g, uchar &b) The double version takes RGB values in the range 0.0 to 1.0. The uchar version takes RGB values in the range 0 to 255. The title argument specifies the label (title) for the window. -

                                +

                                The fl_color_chooser dialog.

                                fl_color_chooser() pops up a window to let the user pick an arbitrary RGB color. They can pick the hue and saturation in the "hue @@ -43,7 +43,7 @@ dithering. access with fl_color() and lets the user pick one of them. It returns the new color index, or the old one if the user types ESC or clicks outside the window. -

                                +

                                The fl_show_colormap dialog

                                void fl_message(const char *, ...)

                                @@ -51,12 +51,12 @@ Displays a printf-style message in a pop-up box with an "OK" button, waits for the user to hit the button. The message will wrap to fit the window, or may be many lines by putting \n characters into it. The enter key is a shortcut for the OK button. -

                                +

                                The fl_message window.

                                void fl_alert(const char *, ...)

                                Same as fl_message() except for the "!" symbol. -

                                +

                                The fl_alert window

                                int fl_ask(const char *, ...)

                                @@ -66,7 +66,7 @@ hit a button. The return value is 1 if the user hits Yes, 0 if they pick No. The enter key is a shortcut for Yes and ESC is a shortcut for No. -

                                +

                                The fl_ask window.

                                int fl_choice(const char *q, const char *b0, const char *b1, const char *b2, ...)

                                @@ -78,7 +78,7 @@ the enter key is a shortcut for button 1. Notice the buttons are positioned "backwards" You can hide buttons by passing NULL as their labels. -

                                +

                                The fl_choice window.

                                const char *fl_input(const char *label, const char *deflt = 0, ...)

                                @@ -89,7 +89,7 @@ returned pointer is only valid until the next time fl_input() is called. Due to back-compatability, the arguments to any printf commands in the label are after the default value. -

                                +

                                The fl_input window.

                                const char *fl_password(const char *label, const char *deflt = 0, ...)

                                @@ -97,7 +97,7 @@ const char *deflt = 0, ...) Same as fl_input() except an Fl_Secret_Input field is used. -

                                +

                                The fl_password window.

                                void fl_message_font(Fl_Font fontid, uchar size)

                                @@ -119,7 +119,7 @@ unique features, the major one being that the Tab key completes filenames like it does in Emacs or tcsh, and the list always shows all possible completions. -

                                +

                                The fl_file_chooser window. fl_file_chooser() pops up the file chooser, waits for the user to pick a file or Cancel, and then returns a pointer to that filename @@ -663,7 +663,7 @@ it is the most recent window to get an event. Returns the next top-level window in the list of shown() windows. You can use this call to iterate through all the windows that are shown(). -

                                static void Fl::first_window(Fl_Window*)

                                +

                                static void Fl::first_window(Fl_Window*)

                                Sets the window that is returned by first_window. The window is removed from wherever it is in the list and inserted at the top. This @@ -706,11 +706,11 @@ colormap. Returns the color index or RGB value for the given FLTK color index. -

                                static const char *Fl::get_font(int face)

                                +

                                static const char *Fl::get_font(int face)

                                Get the string for this face. This string is different for each face. Under X this value is passed to XListFonts to get all the sizes -of this face. +of this face.

                                static const char *Fl::get_font_name(int face, int *attributes = 0)

                                diff --git a/documentation/glut.html b/documentation/glut.html index 0fdb92417..c26ee7352 100644 --- a/documentation/glut.html +++ b/documentation/glut.html @@ -129,7 +129,7 @@ not work. If you do show() the window, call make_current()

                                Members

                                The Fl_Glut_Window class contains several public members that can be altered directly: -
                                FormsFLTK
                                MOUSE_XFl::event_x_root()
                                MOUSE_YFl::event_y_root()
                                +
                                diff --git a/documentation/index.html b/documentation/index.html index 4f2b870ae..d3d1b84e6 100644 --- a/documentation/index.html +++ b/documentation/index.html @@ -4,9 +4,9 @@ -
                                member description
                                +
                                - +
                                FL

                                FLTK 1.0.11 Programming Manual

                                Revision 17 by Michael Sweet, Craig P. Earls, and Bill Spitzak
                                @@ -21,7 +21,7 @@ Public License.
                                -
                                +
                                Preface diff --git a/documentation/license.html b/documentation/license.html index 330b26b24..019038a1d 100644 --- a/documentation/license.html +++ b/documentation/license.html @@ -146,8 +146,9 @@ purpose that is entirely well-defined independent of the application. function or table used by this function must be optional: if the application does not supply it, the square root function must still compute square roots.)

                                - These requirements apply to the modified work as a whole. - If identifiable sections of that work are not derived from the + +

                                These requirements apply to the modified work as a whole. +If identifiable sections of that work are not derived from the Library, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when @@ -246,14 +247,15 @@ access to copy from a designated place, offer equivalent access to copy the above specified materials from the same place.

                                d) Verify that the user has already received a copy of these materials or that you have already sent this user a copy.

                                - For an executable, the required form of the "work that + +

                                For an executable, the required form of the "work that uses the Library" must include any data and utility programs needed for reproducing the executable from it. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the -executable.

                                +executable.

                                It may happen that this requirement contradicts the license restrictions of other proprietary libraries that do not normally accompany the operating system. Such a contradiction means you cannot @@ -273,7 +275,8 @@ above. of the fact that part of it is a work based on the Library, and explaining where to find the accompanying uncombined form of the same work.

                                -8. You may not copy, modify, sublicense, + +

                                8. You may not copy, modify, sublicense, link with, or distribute the Library except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense, link with, or distribute the Library is void, and will automatically diff --git a/documentation/opengl.html b/documentation/opengl.html index 926419b24..9ccd30c42 100644 --- a/documentation/opengl.html +++ b/documentation/opengl.html @@ -305,9 +305,7 @@ public: }; -

                                 
-

                                The camera() Method

                                The camera() method sets the camera (projection and viewpoint) to use when drawing the scene. The scene is redrawn after diff --git a/documentation/subclassing.html b/documentation/subclassing.html index 5d061a1c1..15bf6179f 100644 --- a/documentation/subclassing.html +++ b/documentation/subclassing.html @@ -100,13 +100,13 @@ MyClass::handle(int event) { } MyClass::draw() { - if (damage() & FL_DAMAGE_ALL) { + if (damage() & FL_DAMAGE_ALL) { ... draw frame/box and other static stuff ... } - if (damage() & (FL_DAMAGE_ALL | 1)) draw_part1(); - if (damage() & (FL_DAMAGE_ALL | 2)) draw_part2(); - if (damage() & (FL_DAMAGE_ALL | 4)) draw_part3(); + if (damage() & (FL_DAMAGE_ALL | 1)) draw_part1(); + if (damage() & (FL_DAMAGE_ALL | 2)) draw_part2(); + if (damage() & (FL_DAMAGE_ALL | 4)) draw_part3(); }

                                void Fl_Widget::draw_box() const diff --git a/documentation/widgets.html b/documentation/widgets.html index bb8f825d4..bc8f76164 100644 --- a/documentation/widgets.html +++ b/documentation/widgets.html @@ -7,7 +7,7 @@ see Appendix B.

                                Alphabetical List of Classes

                                -
                                +
                                Fl_Adjuster