Mirrors_UI_SDK/fltk
1
0
Fork 0
mirror of https://github.com/fltk/fltk.git synced 2026-09-28 15:55:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

More doco updates.

Browse Source 
Enable tooltips by default, and don't enable them when setting the
tooltip value, since that will negate any changes a program might
make when displaying the file chooser dialog, etc.


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1777 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet
2001-11-28 20:43:44 +00:00
parent 6cb1b5c7bd
commit c78dcd55ec
16 changed files with 1642 additions and 1694 deletions
Download Patch File Download Diff File Expand all files Collapse all files
FL/Enumerations.H
+2 -2
View File
@@ -1,5 +1,5 @@
//
// "$Id: Enumerations.H,v 1.18.2.14.2.7 2001/11/28 15:55:33 easysw Exp $"
// "$Id: Enumerations.H,v 1.18.2.14.2.8 2001/11/28 20:43:44 easysw Exp $"
//
// Enumerations for the Fast Light Tool Kit (FLTK).
//
@@ -364,5 +364,5 @@ enum Fl_Damage {
#endif
//
// End of "$Id: Enumerations.H,v 1.18.2.14.2.7 2001/11/28 15:55:33 easysw Exp $".
// End of "$Id: Enumerations.H,v 1.18.2.14.2.8 2001/11/28 20:43:44 easysw Exp $".
//
FL/Fl.H
+9 -9
View File
@@ -1,5 +1,5 @@
//
// "$Id: Fl.H,v 1.8.2.11.2.5 2001/11/28 18:00:16 easysw Exp $"
// "$Id: Fl.H,v 1.8.2.11.2.6 2001/11/28 20:43:44 easysw Exp $"
//
// Main header file for the Fast Light Tool Kit (FLTK).
//
@@ -24,12 +24,12 @@
//
#ifndef Fl_H
#define Fl_H
# define Fl_H
#include "Enumerations.H"
#ifndef Fl_Object
#define Fl_Object Fl_Widget
#endif
# include "Enumerations.H"
# ifndef Fl_Object
# define Fl_Object Fl_Widget
# endif
class Fl_Widget;
class Fl_Window;
@@ -70,7 +70,7 @@ public: // should be private!
public:
// API version number
static double version();
static FL_EXPORT double version();
// argument parsers:
static FL_EXPORT int arg(int, char**, int&);
@@ -222,8 +222,8 @@ public:
static int visible_focus() { return visible_focus_; }
};
#endif
#endif // !Fl_H
//
// End of "$Id: Fl.H,v 1.8.2.11.2.5 2001/11/28 18:00:16 easysw Exp $".
// End of "$Id: Fl.H,v 1.8.2.11.2.6 2001/11/28 20:43:44 easysw Exp $".
//
FL/Fl_Widget.H
+3 -3
View File
@@ -1,5 +1,5 @@
//
// "$Id: Fl_Widget.H,v 1.6.2.4.2.10 2001/11/03 05:11:34 easysw Exp $"
// "$Id: Fl_Widget.H,v 1.6.2.4.2.11 2001/11/28 20:43:44 easysw Exp $"
//
// Widget header file for the Fast Light Tool Kit (FLTK).
//
@@ -143,7 +143,7 @@ public:
void deimage(Fl_Image* a) {label_.deimage=a;}
void deimage(Fl_Image& a) {label_.deimage=&a;}
const char *tooltip() const {return tooltip_;}
void tooltip(const char *t);
void tooltip(const char *t) {tooltip_=t;}
Fl_Callback_p callback() const {return callback_;}
void callback(Fl_Callback* c, void* p) {callback_=c; user_data_=p;}
void callback(Fl_Callback* c) {callback_=c;}
@@ -207,5 +207,5 @@ public:
#endif
//
// End of "$Id: Fl_Widget.H,v 1.6.2.4.2.10 2001/11/03 05:11:34 easysw Exp $".
// End of "$Id: Fl_Widget.H,v 1.6.2.4.2.11 2001/11/28 20:43:44 easysw Exp $".
//
configure.in
+18 -8
View File
@@ -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.29 2001/11/27 22:03:29 easysw Exp $"
dnl "$Id: configure.in,v 1.33.2.31.2.30 2001/11/28 20:43:43 easysw Exp $"
dnl
dnl Configuration script for the Fast Light Tool Kit (FLTK).
dnl
@@ -99,6 +99,15 @@ AC_ARG_ENABLE(shared, [ --enable-shared turn on shared libraries [defau
if test x$enable_shared = xyes; then
PICFLAG=1
case $uname in
*BSD* | Darwin*)
DSONAME="libfltk.$FL_API_VERSION.dylib"
GLDSONAME="libfltk_gl.$FL_API_VERSION.dylib"
DSOCOMMAND="ld $DSOFLAGS -dylib /usr/lib/dylib1.o -lc"
if test "$libdir" != "/usr/lib"; then
DSOLINK="-Wl,-rpath,$libdir"
fi
;;
SunOS* | UNIX_S*)
DSONAME="libfltk.so.$FL_API_VERSION"
GLDSONAME="libfltk_gl.so.$FL_API_VERSION"
@@ -240,17 +249,19 @@ AC_CHECK_HEADER(png.h,
dnl Restore original LIBS settings...
LIBS="$SAVELIBS"
dnl See if we are compiling with CygWin or MingW32...
AC_CYGWIN
AC_EXEEXT
dnl Check for standard graphics API and OpenGL...
EXEEXT=
HLINKS=
case $uname in
CYGWIN*)
dnl Cygwin environment...
LIBS="$LIBS -lgdi32 -lwsock32"
CFLAGS="$CFLAGS -DWIN32"
CXXFLAGS="$CXXFLAGS -DWIN32"
EXEEXT=".exe"
LIBS="$LIBS -mwindows -lgdi32 -lwsock32"
CFLAGS="$CFLAGS -mwindows -DWIN32"
CXXFLAGS="$CXXFLAGS -mwindows -DWIN32"
HLINKS="#"
if test x$enable_gl != xno; then
AC_CHECK_HEADER(GL/gl.h,
@@ -349,7 +360,6 @@ case $uname in
fi)
esac
AC_SUBST(EXEEXT)
AC_SUBST(HLINKS)
AC_SUBST(GLDEMOS)
AC_SUBST(GLLIB)
@@ -568,5 +578,5 @@ AC_OUTPUT(makeinclude fltk.list fltk-config FL/Makefile FL/Enumerations.H)
chmod +x fltk-config
dnl
dnl End of "$Id: configure.in,v 1.33.2.31.2.29 2001/11/27 22:03:29 easysw Exp $".
dnl End of "$Id: configure.in,v 1.33.2.31.2.30 2001/11/28 20:43:43 easysw Exp $".
dnl
documentation/Fl.html
+1008 -18
View File
File diff suppressed because it is too large Load Diff
documentation/Fl_Text_Display.html
+148 -315
View File
File diff suppressed because it is too large Load Diff
documentation/Fl_Text_Editor.html
+155 -318
View File
File diff suppressed because it is too large Load Diff
documentation/Fl_Tooltip.html
+87
View File
@@ -0,0 +1,87 @@
<HTML>
<BODY>
<!-- NEW PAGE -->
<H2><A name="Fl_Tooltip">class Fl_Tooltip</A></H2>
<HR>
<H3>Class Hierarchy</H3>
<UL><PRE>
<B>Fl_Tooltip</B>
</PRE></UL>
<H3>Include Files</H3>
<UL><PRE>
#include &amp;lt;FL/Fl_Tooltip.H&amp;gt;
</PRE></UL>
<H3>Description</H3>
<P>The <TT>Fl_Tooltip</TT> class provides tooltip support for
all FLTK widgets.</P>
<H3>Methods</H3>
<UL>
<LI><A HREF="#Fl_Tooltip.color">color</A></LI>
<LI><A HREF="#Fl_Tooltip.delay">delay</A></LI>
<LI><A HREF="#Fl_Tooltip.disable">disable</A></LI>
<LI><A HREF="#Fl_Tooltip.enabled">enabled</A></LI>
<LI><A HREF="#Fl_Tooltip.enable">enable</A></LI>
<LI><A HREF="#Fl_Tooltip.enter">enter</A></LI>
<LI><A HREF="#Fl_Tooltip.exit">exit</A></LI>
<LI><A HREF="#Fl_Tooltip.font">font</A></LI>
<LI><A HREF="#Fl_Tooltip.size">size</A></LI>
</UL>
<H4><A NAME="Fl_Tooltip.color">void color(unsigned c);<BR>
Fl_Color color();</A></H4>
<P>Gets or sets the background color for tooltips. The label color is
set to white or black depending on the background color. The default
background color is a pale yellow.
<H4><A NAME="Fl_Tooltip.delay">void delay(float f);<BR>
float delay();</A></H4>
<P>Gets or sets the tooltip delay. The default delay is 0.5 seconds.
<H4><A NAME="Fl_Tooltip.disable">void disable();</A></H4>
<P>Disables tooltips on all widgets.
<H4><A NAME="Fl_Tooltip.enabled">int enabled();</A></H4>
<P>Returns non-zero if tooltips are enabled.
<H4><A NAME="Fl_Tooltip.enable">void enable(int b = 1);</A></H4>
<P>Enables tooltips on all widgets.
<H4><A NAME="Fl_Tooltip.enter">void enter(Fl_Widget *w);</A></H4>
<P>This method is called when the mouse pointer enters a
widget.
<H4><A NAME="Fl_Tooltip.exit">void exit(Fl_Widget *w);</A></H4>
<P>This method is called when the mouse pointer leaves a
widget.
<H4><A NAME="Fl_Tooltip.font">void font(int i);<BR>
int font();</A></H4>
<P>Gets or sets the typeface for the tooltip text.
<H4><A NAME="Fl_Tooltip.size">void size(int s);<BR>
int size();</A></H4>
<P>Gets or sets the size of the tooltip text.
</BODY>
</HTML>
documentation/Makefile
+4 -2
View File
@@ -1,5 +1,5 @@
#
# "$Id: Makefile,v 1.9.2.10.2.3 2001/11/27 02:09:45 easysw Exp $"
# "$Id: Makefile,v 1.9.2.10.2.4 2001/11/28 20:43:44 easysw Exp $"
#
# Documentation makefile for the Fast Light Tool Kit (FLTK).
#
@@ -48,6 +48,7 @@ HTMLFILES = \
editor.html \
enumerations.html \
events.html \
Fl.html \
Fl_Adjuster.html \
Fl_Bitmap.html \
Fl_Box.html \
@@ -115,6 +116,7 @@ HTMLFILES = \
Fl_Tiled_Image.html \
Fl_Tile.html \
Fl_Timer.html \
Fl_Tooltip.html \
fluid.html \
Fl_Valuator.html \
Fl_Value_Input.html \
@@ -199,5 +201,5 @@ fltk.pdf: $(HTMLFILES)
$(HTMLDOC) -f fltk.pdf --jpeg --compression=9 --duplex --verbose --toclevels 2 --titleimage FL.gif $(HTMLFILES)
#
# End of "$Id: Makefile,v 1.9.2.10.2.3 2001/11/27 02:09:45 easysw Exp $".
# End of "$Id: Makefile,v 1.9.2.10.2.4 2001/11/28 20:43:44 easysw Exp $".
#
documentation/fltk.book
+1
View File
@@ -77,6 +77,7 @@ Fl_Text_Editor.html
Fl_Tile.html
Fl_Tiled_Image.html
Fl_Timer.html
Fl_Tooltip.html
Fl_Valuator.html
Fl_Value_Input.html
Fl_Value_Output.html
documentation/functions.html
+5 -858
View File
File diff suppressed because it is too large Load Diff
documentation/widgets.html
+190 -144
View File
File diff suppressed because it is too large Load Diff
src/Fl.cxx
+3 -3
View File
@@ -1,5 +1,5 @@
//
// "$Id: Fl.cxx,v 1.24.2.41.2.9 2001/11/28 18:00:17 easysw Exp $"
// "$Id: Fl.cxx,v 1.24.2.41.2.10 2001/11/28 20:43:44 easysw Exp $"
//
// Main event handling code for the Fast Light Tool Kit (FLTK).
//
@@ -802,7 +802,7 @@ void Fl_Widget::damage(uchar flags, int X, int Y, int W, int H) {
// if we already have damage we must merge with existing region:
if (i->region) {
#ifdef WIN32
Region R = XRectangleRegion(X, Y, W, H);
Fl_Region R = XRectangleRegion(X, Y, W, H);
CombineRgn(i->region, i->region, R, RGN_OR);
XDestroyRegion(R);
#elif defined(__APPLE__)
@@ -834,5 +834,5 @@ void Fl_Window::flush() {
}
//
// End of "$Id: Fl.cxx,v 1.24.2.41.2.9 2001/11/28 18:00:17 easysw Exp $".
// End of "$Id: Fl.cxx,v 1.24.2.41.2.10 2001/11/28 20:43:44 easysw Exp $".
//
src/Fl_Tooltip.cxx
+4 -4
View File
@@ -1,5 +1,5 @@
//
// "$Id: Fl_Tooltip.cxx,v 1.38.2.7 2001/11/18 20:52:28 easysw Exp $"
// "$Id: Fl_Tooltip.cxx,v 1.38.2.8 2001/11/28 20:43:44 easysw Exp $"
//
// Tooltip source file for the Fast Light Tool Kit (FLTK).
//
@@ -35,8 +35,8 @@
// Fl_Tooltip global variables...
//
void (*Fl_Tooltip::tooltip_callback_)(void *) = 0;
void (*Fl_Tooltip::tooltip_exit_)(void *) = 0;
void (*Fl_Tooltip::tooltip_callback_)(void *) = Fl_Tooltip::tooltip_timeout;
void (*Fl_Tooltip::tooltip_exit_)(void *) = Fl_Tooltip::tooltip_exit;
float Fl_Tooltip::delay_ = 0.5;
Fl_TooltipBox *Fl_Tooltip::box = 0;
Fl_Menu_Window *Fl_Tooltip::window = 0;
@@ -189,5 +189,5 @@ Fl_Tooltip::tooltip_timeout(void *v) {
//
// End of "$Id: Fl_Tooltip.cxx,v 1.38.2.7 2001/11/18 20:52:28 easysw Exp $".
// End of "$Id: Fl_Tooltip.cxx,v 1.38.2.8 2001/11/28 20:43:44 easysw Exp $".
//
src/Fl_Widget.cxx
+2 -7
View File
@@ -1,5 +1,5 @@
//
// "$Id: Fl_Widget.cxx,v 1.5.2.4.2.7 2001/11/22 15:35:01 easysw Exp $"
// "$Id: Fl_Widget.cxx,v 1.5.2.4.2.8 2001/11/28 20:43:44 easysw Exp $"
//
// Base widget class for the Fast Light Tool Kit (FLTK).
//
@@ -99,11 +99,6 @@ Fl_Widget::Fl_Widget(int X, int Y, int W, int H, const char* L) {
if (Fl_Group::current()) Fl_Group::current()->add(this);
}
void Fl_Widget::tooltip(const char *t) {
Fl_Tooltip::enable();
tooltip_ = t;
}
void Fl_Widget::resize(int X, int Y, int W, int H) {
x_ = X; y_ = Y; w_ = W; h_ = H;
}
@@ -249,5 +244,5 @@ int Fl_Widget::contains(const Fl_Widget *o) const {
}
//
// End of "$Id: Fl_Widget.cxx,v 1.5.2.4.2.7 2001/11/22 15:35:01 easysw Exp $".
// End of "$Id: Fl_Widget.cxx,v 1.5.2.4.2.8 2001/11/28 20:43:44 easysw Exp $".
//
src/gl_start.cxx
+3 -3
View File
@@ -1,5 +1,5 @@
//
// "$Id: gl_start.cxx,v 1.6.2.5.2.2 2001/11/27 17:44:08 easysw Exp $"
// "$Id: gl_start.cxx,v 1.6.2.5.2.3 2001/11/28 20:43:44 easysw Exp $"
//
// OpenGL context routines for the Fast Light Tool Kit (FLTK).
//
@@ -54,7 +54,7 @@ static int pw, ph;
static Fl_Gl_Choice* gl_choice;
#endif
Region XRectangleRegion(int x, int y, int w, int h); // in fl_rect.cxx
Fl_Region XRectangleRegion(int x, int y, int w, int h); // in fl_rect.cxx
void gl_start() {
if (!context) {
@@ -117,5 +117,5 @@ int Fl::gl_visual(int mode, int *alist) {
#endif
//
// End of "$Id: gl_start.cxx,v 1.6.2.5.2.2 2001/11/27 17:44:08 easysw Exp $".
// End of "$Id: gl_start.cxx,v 1.6.2.5.2.3 2001/11/28 20:43:44 easysw Exp $".
//