diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-10-07 13:19:22 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2002-10-07 13:19:22 +0000 |
| commit | b40f5fb69e109257fb2ae5658d6e6e25e5880fb5 (patch) | |
| tree | 423bf759e4d8949a18c99b64e983081b5b454c56 | |
| parent | 5c8ccb8289297c67f45f6751c4403ae8979788ec (diff) | |
Documentation updates.
Bump version to 1.1.1.
Fix "no change" button in FLUID.
Set dirty flag when changing nodes in Fl_Preferences.
Add the extra include dir options when doing "fltk-config --compile foo.cxx".
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@2659 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | CHANGES | 9 | ||||
| -rw-r--r-- | CREDITS | 1 | ||||
| -rw-r--r-- | configure.in | 6 | ||||
| -rw-r--r-- | documentation/Fl_Check_Browser.html | 95 | ||||
| -rw-r--r-- | documentation/index.html | 11 | ||||
| -rw-r--r-- | documentation/preface.html | 10 | ||||
| -rw-r--r-- | documentation/widgets.html | 2 | ||||
| -rwxr-xr-x | fltk-config.in | 8 | ||||
| -rw-r--r-- | fltk.spec | 6 | ||||
| -rw-r--r-- | fluid/widget_panel.cxx | 1 | ||||
| -rw-r--r-- | fluid/widget_panel.fl | 2 | ||||
| -rw-r--r-- | src/Fl_Preferences.cxx | 7 |
12 files changed, 136 insertions, 22 deletions
@@ -1,5 +1,14 @@ CHANGES IN FLTK 1.1.1 + - The fltk-config script didn't add the required include + path, if any, when compiling a program. + - Added a license clarification that the FLTK manual is + covered by the same license as FLTK itself. + - Fl_Check_Browser wasn't documented. + - Fl_Preferences::Node::addChild(), deleteEntry(), and + remove() didn't set the "dirty" flag. + - The "no change" button didn't work in the FLUID widget + panel. - Vertical scrollbars did not draw the arrows inactive when the scrollbar was inactive. @@ -36,6 +36,7 @@ OTHER CONTRIBUTORS Greg Ercolano Yuri Fedorchenko George Garvey + Mikael Hultgren Stuart Levy Mike Lindner Alexander Mai diff --git a/configure.in b/configure.in index c6edd040f..f5fa0e265 100644 --- a/configure.in +++ b/configure.in @@ -1,7 +1,7 @@ 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.87 2002/09/26 20:27:16 easysw Exp $" +dnl "$Id: configure.in,v 1.33.2.31.2.88 2002/10/07 13:19:21 easysw Exp $" dnl dnl Configuration script for the Fast Light Tool Kit (FLTK). dnl @@ -34,7 +34,7 @@ AC_INIT(src/Fl.cxx) dnl FLTK library versions... FL_MAJOR_VERSION=1 FL_MINOR_VERSION=1 -FL_PATCH_VERSION=0 +FL_PATCH_VERSION=1 FL_RELEASE_VERSION= FL_API_VERSION=${FL_MAJOR_VERSION}.${FL_MINOR_VERSION} @@ -785,5 +785,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.87 2002/09/26 20:27:16 easysw Exp $". +dnl End of "$Id: configure.in,v 1.33.2.31.2.88 2002/10/07 13:19:21 easysw Exp $". dnl diff --git a/documentation/Fl_Check_Browser.html b/documentation/Fl_Check_Browser.html new file mode 100644 index 000000000..022600bbc --- /dev/null +++ b/documentation/Fl_Check_Browser.html @@ -0,0 +1,95 @@ +<HTML><BODY> +<!-- NEW PAGE --> +<H2><A name=Fl_Check_Browser>class Fl_Check_Browser</A></H2> +<HR> +<H3>Class Hierarchy</H3> +<UL> +<PRE> +<A href=Fl_Browser_.html#Fl_Browser_>Fl_Browser_</A> + | + +----<B>Fl_Check_Browser</B> +</PRE> +</UL> +<H3>Include Files</H3> +<UL> +<PRE> +#include <FL/Fl_Check_Browser.H> +</PRE> +</UL> +<H3>Description</H3> + +The <TT>Fl_Check_Browser</TT> widget displays a scrolling list of text +lines that may be selected and/or checked by the user. + +<H3>Methods</H3> +<CENTER> +<TABLE width=90% summary="Fl_Check_Browser methods"> +<TR><TD align=left valign=top> +<UL> +<LI><A href=#Fl_Check_Browser.Fl_Check_Browser>Fl_Check_Browser</A></LI> +<!-- <LI><A href=#Fl_Check_Browser.~Fl_Check_Browser>~Fl_Check_Browser</A></LI>--> +<LI><A href=#Fl_Check_Browser.add>add</A></LI> +<LI><A href=#Fl_Check_Browser.check_all>check_all</A></LI> +<LI><A href=#Fl_Check_Browser.check_none>check_none</A></LI> +</UL> +</TD><TD align=left valign=top> +<UL> +<LI><A href=#Fl_Check_Browser.checked>checked</A></LI> +<LI><A href=#Fl_Check_Browser.clear>clear</A></LI> +<LI><A href=#Fl_Check_Browser.nchecked>nchecked</A></LI> +<LI><A href=#Fl_Check_Browser.nitems>nitems</A></LI> +</UL> +</TD><TD align=left valign=top> +<UL> +<LI><A href=#Fl_Check_Browser.set_checked>set_checked</A></LI> +<LI><A href=#Fl_Check_Browser.text>text</A></LI> +<LI><A href=#Fl_Check_Browser.value>value</A></LI> +</UL> +</TD></TR> +</TABLE> +</CENTER> + +<H4><A name=Fl_Check_Browser.Fl_Check_Browser>Fl_Check_Browser::Fl_Check_Browser(int, int, int, int, const char * = 0)</A></H4> +The constructor makes an empty browser. +<!-- +<H4><A name=Fl_Check_Browser.~Fl_Check_Browser>Fl_Check_Browser::~Fl_Check_Browser(void)</A></H4> + The destructor deletes all list items and destroys the browser. +--> +<H4><A name=Fl_Check_Browser.add>int Fl_Check_Browser::add(const char *)<BR> +int Fl_Check_Browser::add(const char *, int)</A></H4> +Add a new unchecked line to the end of the browser. The text is copied +using the <TT>strdup()</TT> function. It may also be <TT>NULL</TT> to make +a blank line. The second form can set the item checked. + +<H4><A name=Fl_Check_Browser.check_all>void Fl_Check_Browser::check_all()</A></H4> +Sets all the items checked. + +<H4><A name=Fl_Check_Browser.check_none>void Fl_Check_Browser::check_none()</A></H4> +Sets all the items unchecked. + +<H4><A name=Fl_Check_Browser.checked>int Fl_Check_Browser::checked(int item) const<BR> +void Fl_Check_Browser::checked(int item, int b)</A></H4> +The first form gets the current status of item <TT>item</TT>. The second form +sets the check status of item <TT>item</TT> to <TT>b</TT>. + +<H4><A name=Fl_Check_Browser.clear>void Fl_Check_Browser::clear()</A></H4> +Remove every item from the browser. + +<H4><A name=Fl_Check_Browser.nchecked>int Fl_Check_Browser::nchecked() const</A></H4> +Returns how many items are currently checked. + +<H4><A name=Fl_Check_Browser.nitems>int Fl_Check_Browser::nitems() const</A></H4> +Returns how many lines are in the browser. The last line number is equal to +this. + +<H4><A name=Fl_Check_Browser.set_checked>void Fl_Check_Browser::set_checked(int item)</A></H4> +Equivalent to <TT>Fl_Check_Browser::checked(item, 1)</TT>. + +<H4><A name=Fl_Check_Browser.text>char *Fl_Check_Browser::text(int item) const</A></H4> +Return a pointer to an internal buffer holding item <TT>item</TT>'s text. + +<H4><A name=Fl_Check_Browser.value>int Fl_Check_Browser::value() const</A></H4> +Returns the index of the currently selected item. + +</BODY> +</HTML> diff --git a/documentation/index.html b/documentation/index.html index 7f4c1ab86..f02e0d710 100644 --- a/documentation/index.html +++ b/documentation/index.html @@ -1,7 +1,7 @@ <HTML> <HEAD> <META NAME="robots" CONTENT="noindex"> - <TITLE>FLTK 1.1.0 Programming Manual</TITLE> + <TITLE>FLTK 1.1.1 Programming Manual</TITLE> </HEAD> <BODY> @@ -10,8 +10,8 @@ <TD VALIGN="MIDDLE"> <IMG SRC="FL.gif" WIDTH="200" HEIGHT="100" ALIGN="ABSMIDDLE" ALT="FL"></TD> <TD ALIGN="CENTER" VALIGN="MIDDLE"> - <H1>FLTK 1.1.0 Programming Manual</H1> - <P>Revision 1 by Michael Sweet, Craig P. Earls, and Bill Spitzak<BR> + <H1>FLTK 1.1.1 Programming Manual</H1> + <P>Revision 2 by Michael Sweet, Craig P. Earls, and Bill Spitzak<BR> Copyright 1998-2002 by Bill Spitzak and others.</P> </TD> </TR> @@ -19,8 +19,9 @@ <TABLE BGCOLOR="#9f9f9f" CELLPADDING="8" CELLSPACING="0" SUMMARY="TITLE BAR" WIDTH="700"> <TR> - <TD ALIGN="CENTER">This software is provided under the terms of the GNU Library General - Public License.</TD> + <TD ALIGN="CENTER"><B>This software and manual are + provided under the terms of the GNU Library General + Public License.</B></TD> </TR> </TABLE> diff --git a/documentation/preface.html b/documentation/preface.html index ae28c4bf5..78f659daf 100644 --- a/documentation/preface.html +++ b/documentation/preface.html @@ -2,21 +2,25 @@ <HEAD> <META CONTENT="Written by Michael Sweet, Craig P. Earls, and Bill Spitzak" NAME="Author"> <META CONTENT="Copyright 1998-2002 by Bill Spitzak and Others." NAME="Copyright"> - <META CONTENT="Revision 1" NAME="DocNumber"> - <TITLE>FLTK 1.1.0 Programming Manual</TITLE> + <META CONTENT="Revision 2" NAME="DocNumber"> + <TITLE>FLTK 1.1.1 Programming Manual</TITLE> </HEAD> <BODY> <H1 ALIGN="RIGHT"><A NAME="preface">Preface</A></H1> <P>This manual describes the Fast Light Tool Kit ("FLTK") -version 1.1.0, a C++ Graphical User Interface +version 1.1.1, a C++ Graphical User Interface ("GUI") toolkit for UNIX, Microsoft Windows and MacOS. Each of the chapters in this manual is designed as a tutorial for using FLTK, while the appendices provide a convenient reference for all FLTK widgets, functions, and operating system interfaces.</P> +<P><B>This manual may be printed, modified, and/or used under +the terms of the FLTK license provided in <A +HREF="license.html">Appendix A</A>.</B> + <H2>Organization</H2> <P>This manual is organized into the following chapters and appendices:</P> diff --git a/documentation/widgets.html b/documentation/widgets.html index 8706febf5..07b4e4553 100644 --- a/documentation/widgets.html +++ b/documentation/widgets.html @@ -21,6 +21,7 @@ description of the <TT>fl_</TT> functions, see <A HREF="Fl_Browser.html">Fl_Browser</A><BR> <A HREF="Fl_Button.html">Fl_Button</A><BR> <A HREF="Fl_Chart.html">Fl_Chart</A><BR> +<A HREF="Fl_Check_Browser.html">Fl_Check_Browser</A><BR> <A HREF="Fl_Check_Button.html">Fl_Check_Button</A><BR> <A HREF="Fl_Choice.html">Fl_Choice</A><BR> <A HREF="Fl_Clock.html">Fl_Clock</A><BR> @@ -141,6 +142,7 @@ description of the <TT>fl_</TT> functions, see <LI><A HREF="Fl_Multi_Browser.html#Fl_Multi_Browser">Fl_Multi_Browser</A> <LI><A HREF="Fl_Select_Browser.html#Fl_Select_Browser">Fl_Select_Browser</A> </UL> + <LI><A HREF="Fl_Check_Browser.html">Fl_Check_Browser</A> </UL> <LI><A HREF="Fl_Button.html#Fl_Button">Fl_Button</A> <UL> diff --git a/fltk-config.in b/fltk-config.in index f36d2c6fc..45abf7151 100755 --- a/fltk-config.in +++ b/fltk-config.in @@ -1,6 +1,6 @@ #! /bin/sh # -# "$Id: fltk-config.in,v 1.12.2.14 2002/07/14 17:03:30 easysw Exp $" +# "$Id: fltk-config.in,v 1.12.2.15 2002/10/07 13:19:21 easysw Exp $" # # FLTK configuration utility. # @@ -242,8 +242,8 @@ if test -n "$compile"; then post=$prog - echo $CXX $CXXFLAGS $debug -o $prog $compile $LDSTATIC - $CXX $CXXFLAGS $debug -o $prog $compile $LDSTATIC + echo $CXX $includes $CXXFLAGS $debug -o $prog $compile $LDSTATIC + $CXX $includes $CXXFLAGS $debug -o $prog $compile $LDSTATIC fi if test -n "$post" -a "$POSTBUILD" != ":"; then @@ -292,5 +292,5 @@ if test "$echo_libs" = "yes"; then fi # -# End of "$Id: fltk-config.in,v 1.12.2.14 2002/07/14 17:03:30 easysw Exp $". +# End of "$Id: fltk-config.in,v 1.12.2.15 2002/10/07 13:19:21 easysw Exp $". # @@ -1,5 +1,5 @@ # -# "$Id: fltk.spec,v 1.1.2.9.2.18 2002/10/04 21:01:36 easysw Exp $" +# "$Id: fltk.spec,v 1.1.2.9.2.19 2002/10/07 13:19:22 easysw Exp $" # # RPM spec file for FLTK. # @@ -23,7 +23,7 @@ # Please report all bugs and problems to "fltk-bugs@fltk.org". # -%define version 1.1.0 +%define version 1.1.1 %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.18 2002/10/04 21:01:36 easysw Exp $". +# End of "$Id: fltk.spec,v 1.1.2.9.2.19 2002/10/07 13:19:22 easysw Exp $". # diff --git a/fluid/widget_panel.cxx b/fluid/widget_panel.cxx index f266d9e8e..8edac758f 100644 --- a/fluid/widget_panel.cxx +++ b/fluid/widget_panel.cxx @@ -391,7 +391,6 @@ Fl_Window* make_widget_panel() { o->selection_color(1); o->labelsize(10); o->callback((Fl_Callback*)when_button_cb); - o->when(FL_WHEN_NEVER); } o->end(); } diff --git a/fluid/widget_panel.fl b/fluid/widget_panel.fl index 5b5929fd6..f37ac9c37 100644 --- a/fluid/widget_panel.fl +++ b/fluid/widget_panel.fl @@ -357,7 +357,7 @@ image} Fl_Light_Button {} { label {No Change} callback when_button_cb - tooltip {Call the callback even if the value has not changed.} xywh {290 295 105 20} selection_color 1 labelsize 10 when 0 + tooltip {Call the callback even if the value has not changed.} xywh {290 295 105 20} selection_color 1 labelsize 10 } } } diff --git a/src/Fl_Preferences.cxx b/src/Fl_Preferences.cxx index 573ddf957..85392e48a 100644 --- a/src/Fl_Preferences.cxx +++ b/src/Fl_Preferences.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Preferences.cxx,v 1.1.2.21 2002/10/03 15:23:46 easysw Exp $" +// "$Id: Fl_Preferences.cxx,v 1.1.2.22 2002/10/07 13:19:22 easysw Exp $" // // Preferences methods for the Fast Light Tool Kit (FLTK). // @@ -882,6 +882,7 @@ Fl_Preferences::Node *Fl_Preferences::Node::addChild( const char *path ) char *name = strdup( nameBuffer ); Node *nd = find( nameBuffer ); free( name ); + dirty_ = 1; return nd; } @@ -979,6 +980,7 @@ char Fl_Preferences::Node::deleteEntry( const char *name ) if ( ix == -1 ) return 0; memmove( entry+ix, entry+ix+1, (nEntry-ix-1) * sizeof(Entry) ); nEntry--; + dirty_ = 1; return 1; } @@ -1108,10 +1110,11 @@ char Fl_Preferences::Node::remove() } } delete this; + dirty_ = 1; return ( nd != 0 ); } // -// End of "$Id: Fl_Preferences.cxx,v 1.1.2.21 2002/10/03 15:23:46 easysw Exp $". +// End of "$Id: Fl_Preferences.cxx,v 1.1.2.22 2002/10/07 13:19:22 easysw Exp $". // |