diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2001-12-19 18:15:34 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2001-12-19 18:15:34 +0000 |
| commit | 329b4127f6801d04ca0cdfadaf60f1265e8268c6 (patch) | |
| tree | f7bcaf1fc7d2a37782c66b5e0d87e910e53ca156 /FL | |
| parent | 9f601ccb7356adc26bf375de9744e39cdf531b25 (diff) | |
Multiple bug fixes from Sebastien:
- Fl_GIF_Image and Fl_PNG_Image didn't close the file before
calling Fl::error().
- Fl_Help_View didn't clear the line array in Fl_Help_Block,
and Fl_Help_Block::font and ::size were not used.
- Fl_Shared_Image::get() didn't return NULL if the image
could not be loaded.
- Switched to more efficient code for
Fl_Tiled_Image::color_average() and ::desaturate().
- Don't delete children in Fl_Text_Display since the group
will do it.
- Fixes to filename_isdir(), filename_absolute(), and
filename_relative().
- Was using numbers instead of define constants for some
OpenGL stuff under WIN32.
- Wasn't exporting threading functions under WIN32.
- The Fl_Widget destructor now removes from the parent to
avoid a Purify error since the old widget would be
referenced by the parent when it was destroyed; this has
no apparent performance impact since Fl_Group::clear()
sets children_ to 0, making Fl_Group::remove() very
fast...
- WIN32 font enumeration datatype fixes...
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@1878 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL')
| -rw-r--r-- | FL/Fl.H | 12 | ||||
| -rw-r--r-- | FL/Fl_Help_View.H | 8 | ||||
| -rw-r--r-- | FL/Fl_Widget.H | 6 |
3 files changed, 12 insertions, 14 deletions
@@ -1,5 +1,5 @@ // -// "$Id: Fl.H,v 1.8.2.11.2.9 2001/12/14 16:48:13 easysw Exp $" +// "$Id: Fl.H,v 1.8.2.11.2.10 2001/12/19 18:15:33 easysw Exp $" // // Main header file for the Fast Light Tool Kit (FLTK). // @@ -225,14 +225,14 @@ public: static int visible_focus() { return visible_focus_; } // Multithreading support: - static void lock(); - static void unlock(); - static void awake(void* message = 0); - static void* thread_message(); + static FL_EXPORT void lock(); + static FL_EXPORT void unlock(); + static FL_EXPORT void awake(void* message = 0); + static FL_EXPORT void* thread_message(); }; #endif // !Fl_H // -// End of "$Id: Fl.H,v 1.8.2.11.2.9 2001/12/14 16:48:13 easysw Exp $". +// End of "$Id: Fl.H,v 1.8.2.11.2.10 2001/12/19 18:15:33 easysw Exp $". // diff --git a/FL/Fl_Help_View.H b/FL/Fl_Help_View.H index 30c241998..dad6eafa0 100644 --- a/FL/Fl_Help_View.H +++ b/FL/Fl_Help_View.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Help_View.H,v 1.1.2.5 2001/11/24 04:12:56 easysw Exp $" +// "$Id: Fl_Help_View.H,v 1.1.2.6 2001/12/19 18:15:33 easysw Exp $" // // Help Viewer widget definitions. // @@ -55,9 +55,7 @@ struct Fl_Help_Block { const char *start, // Start of text *end; // End of text - uchar font, // Text font - size, // Text size - border; // Draw border? + uchar border; // Draw border? int x, // Indentation/starting X coordinate y, // Starting Y coordinate w, // Width @@ -189,5 +187,5 @@ class Fl_Help_View : public Fl_Group //// Help viewer widget #endif // !Fl_Help_View_H // -// End of "$Id: Fl_Help_View.H,v 1.1.2.5 2001/11/24 04:12:56 easysw Exp $". +// End of "$Id: Fl_Help_View.H,v 1.1.2.6 2001/12/19 18:15:33 easysw Exp $". // diff --git a/FL/Fl_Widget.H b/FL/Fl_Widget.H index 352948488..7fa377e47 100644 --- a/FL/Fl_Widget.H +++ b/FL/Fl_Widget.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Widget.H,v 1.6.2.4.2.11 2001/11/28 20:43:44 easysw Exp $" +// "$Id: Fl_Widget.H,v 1.6.2.4.2.12 2001/12/19 18:15:33 easysw Exp $" // // Widget header file for the Fast Light Tool Kit (FLTK). // @@ -102,7 +102,7 @@ public: FL_EXPORT virtual void draw() = 0; FL_EXPORT virtual int handle(int); Fl_Group* parent() const {return parent_;} - void parent(Fl_Group* w) {parent_ = w;} // for hacks only + void parent(Fl_Group* w) {parent_ = w;} // for hacks only, Fl_Group::add() uchar type() const {return type_;} void type(uchar t) {type_ = t;} @@ -207,5 +207,5 @@ public: #endif // -// End of "$Id: Fl_Widget.H,v 1.6.2.4.2.11 2001/11/28 20:43:44 easysw Exp $". +// End of "$Id: Fl_Widget.H,v 1.6.2.4.2.12 2001/12/19 18:15:33 easysw Exp $". // |