-
+
- labelcolor
- labelfont
- labelsize
- labeltype @@ -258,6 +259,14 @@ method for more information. equal to this widget. Returns 0 if b is NULL. +
void Fl_Widget::copy_label(const char*)
+ +Sets the current label. Unlike label(), this method +allocates a copy of the label string instead of using the +original string pointer.
+ +uchar Fl_Widget::damage() const
void damage(uchar c);
void damage(uchar c, int X, int Y, int W, int H);
@@ -329,7 +338,10 @@ equal to a. Returns 0 if a is NULL.
somewhere on or next to the widget. The passed pointer is stored
unchanged in the widget (the string is not copied), so if
you need to set the label to a formatted value, make sure the
-buffer is static, global, or allocated.
+buffer is static, global, or allocated. The copy_label() method
+can be used to make a copy of the label string
+automatically.
Fl_Color Fl_Widget::labelcolor() const
diff --git a/documentation/common.html b/documentation/common.html
index 85d091138..a7f17fca5 100644
--- a/documentation/common.html
+++ b/documentation/common.html
@@ -532,7 +532,16 @@ button->when(FL_WHEN_CHANGED | FL_WHEN_NOT_CHANGED);
- Hint:
+ Note:
+
+ You cannot delete a widget inside a callback, as the
+ widget may still be accessed by FLTK after your callback
+ is completed. Instead, use the Fl::delete_widget()
+ method to mark your widget for deletion when it is safe
+ to do so.
+
+ Hint:
Many programmers new to FLTK or C++ try to use a
non-static class method instead of a static class method
diff --git a/documentation/index.html b/documentation/index.html
index 97bd3e884..2853526ba 100644
--- a/documentation/index.html
+++ b/documentation/index.html
@@ -1,7 +1,7 @@
- FLTK 1.1.5 Programming Manual
+ FLTK 1.1.6 Programming Manual
@@ -10,8 +10,8 @@
- FLTK 1.1.5 Programming Manual
- Revision 5 by Michael Sweet, Craig P. Earls, and Bill Spitzak
+
FLTK 1.1.6 Programming Manual
+ Revision 6 by Michael Sweet, Craig P. Earls, and Bill Spitzak
Copyright 1998-2004 by Bill Spitzak and others.
diff --git a/documentation/preface.html b/documentation/preface.html
index c773fa575..a53e8899d 100644
--- a/documentation/preface.html
+++ b/documentation/preface.html
@@ -2,15 +2,15 @@
-
- FLTK 1.1.5 Programming Manual
+
+ FLTK 1.1.6 Programming Manual
Preface
This manual describes the Fast Light Tool Kit ("FLTK")
-version 1.1.5, a C++ Graphical User Interface
+version 1.1.6, 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
diff --git a/src/Fl.cxx b/src/Fl.cxx
index f66f63c4b..a25009101 100644
--- a/src/Fl.cxx
+++ b/src/Fl.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: Fl.cxx,v 1.24.2.41.2.69 2004/11/23 19:09:55 easysw Exp $"
+// "$Id: Fl.cxx,v 1.24.2.41.2.70 2004/11/23 19:47:51 easysw Exp $"
//
// Main event handling code for the Fast Light Tool Kit (FLTK).
//
@@ -236,6 +236,8 @@ extern int fl_wait(double time); // in Fl_.cxx
static char in_idle;
double Fl::wait(double time_to_wait) {
+ do_widget_deletions();
+
if (first_timeout) {
elapse_timeouts();
Timeout *t;
@@ -1051,6 +1053,48 @@ void Fl_Window::flush() {
draw();
}
+
//
-// End of "$Id: Fl.cxx,v 1.24.2.41.2.69 2004/11/23 19:09:55 easysw Exp $".
+// The following methods allow callbacks to schedule the deletion of
+// widgets at "safe" times.
+//
+
+static int num_dwidgets = 0, alloc_dwidgets = 0;
+static Fl_Widget **dwidgets = 0;
+
+void
+Fl::delete_widget(Fl_Widget *w) {
+ if (!w) return;
+
+ if (num_dwidgets >= alloc_dwidgets) {
+ Fl_Widget **temp;
+
+ temp = new Fl_Widget *[alloc_dwidgets + 10];
+ if (alloc_dwidgets) {
+ memcpy(temp, dwidgets, alloc_dwidgets * sizeof(Fl_Widget *));
+ delete[] dwidgets;
+ }
+
+ dwidgets = temp;
+ alloc_dwidgets += 10;
+ }
+
+ dwidgets[num_dwidgets] = w;
+ num_dwidgets ++;
+}
+
+
+void
+Fl::do_widget_deletion() {
+ if (!num_dwidgets) return;
+
+ for (int i = 0; i < num_dwidgets; i ++)
+ delete dwidgets[i];
+
+ num_dwidgets = 0;
+}
+
+
+//
+// End of "$Id: Fl.cxx,v 1.24.2.41.2.70 2004/11/23 19:47:51 easysw Exp $".
//
diff --git a/src/Fl_Widget.cxx b/src/Fl_Widget.cxx
index 528ac5b81..ecf9fce33 100644
--- a/src/Fl_Widget.cxx
+++ b/src/Fl_Widget.cxx
@@ -1,5 +1,5 @@
//
-// "$Id: Fl_Widget.cxx,v 1.5.2.4.2.24 2004/08/25 00:20:25 matthiaswm Exp $"
+// "$Id: Fl_Widget.cxx,v 1.5.2.4.2.25 2004/11/23 19:47:52 easysw Exp $"
//
// Base widget class for the Fast Light Tool Kit (FLTK).
//
@@ -129,6 +129,7 @@ extern void fl_throw_focus(Fl_Widget*); // in Fl_x.cxx
// However, it is only legal to destroy a "root" such as an Fl_Window,
// and automatic destructors may be called.
Fl_Widget::~Fl_Widget() {
+ if (flags() & COPIED_LABEL) free(label_.value);
parent_ = 0; // Don't throw focus to a parent widget.
fl_throw_focus(this);
}
@@ -244,6 +245,27 @@ int Fl_Widget::contains(const Fl_Widget *o) const {
return 0;
}
+
+void
+Fl_Widget::label(const char *a) {
+ if (flags() & COPIED_LABEL) {
+ free(label_.value);
+ clear_flag(COPIED_LABEL);
+ }
+ label_.value=a;
+ redraw_label();
+}
+
+
+void
+Fl_Widget::copy_label(const char *a) {
+ if (flags() & COPIED_LABEL) free(label_.value);
+ set_flag(COPIED_LABEL);
+ label_.value=strdup(a);
+ redraw_label();
+}
+
+
//
-// End of "$Id: Fl_Widget.cxx,v 1.5.2.4.2.24 2004/08/25 00:20:25 matthiaswm Exp $".
+// End of "$Id: Fl_Widget.cxx,v 1.5.2.4.2.25 2004/11/23 19:47:52 easysw Exp $".
//
| Hint: + | Note:
+
+ You cannot delete a widget inside a callback, as the + widget may still be accessed by FLTK after your callback + is completed. Instead, use the Fl::delete_widget() + method to mark your widget for deletion when it is safe + to do so. + +Hint: Many programmers new to FLTK or C++ try to use a non-static class method instead of a static class method diff --git a/documentation/index.html b/documentation/index.html index 97bd3e884..2853526ba 100644 --- a/documentation/index.html +++ b/documentation/index.html @@ -1,7 +1,7 @@ - |
|
- FLTK 1.1.5 Programming Manual-Revision 5 by Michael Sweet, Craig P. Earls, and Bill Spitzak FLTK 1.1.6 Programming Manual+Revision 6 by Michael Sweet, Craig P. Earls, and Bill Spitzak |