diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2004-11-23 19:51:03 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2004-11-23 19:51:03 +0000 |
| commit | 7acedd91ff187be5a6b1382cc31c20a1fee1f464 (patch) | |
| tree | b45c1c250cb3f281a447da6c111ff9f7e9018af7 | |
| parent | a42ded75e297cedfcb448537e77d13350df0fe92 (diff) | |
Fix compiler errors...
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3918 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
| -rw-r--r-- | src/Fl.cxx | 6 | ||||
| -rw-r--r-- | src/Fl_Widget.cxx | 12 |
2 files changed, 10 insertions, 8 deletions
diff --git a/src/Fl.cxx b/src/Fl.cxx index a25009101..42f0a94b5 100644 --- a/src/Fl.cxx +++ b/src/Fl.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl.cxx,v 1.24.2.41.2.70 2004/11/23 19:47:51 easysw Exp $" +// "$Id: Fl.cxx,v 1.24.2.41.2.71 2004/11/23 19:50:58 easysw Exp $" // // Main event handling code for the Fast Light Tool Kit (FLTK). // @@ -236,7 +236,7 @@ extern int fl_wait(double time); // in Fl_<platform>.cxx static char in_idle; double Fl::wait(double time_to_wait) { - do_widget_deletions(); + do_widget_deletion(); if (first_timeout) { elapse_timeouts(); @@ -1096,5 +1096,5 @@ Fl::do_widget_deletion() { // -// End of "$Id: Fl.cxx,v 1.24.2.41.2.70 2004/11/23 19:47:51 easysw Exp $". +// End of "$Id: Fl.cxx,v 1.24.2.41.2.71 2004/11/23 19:50:58 easysw Exp $". // diff --git a/src/Fl_Widget.cxx b/src/Fl_Widget.cxx index ecf9fce33..689220dc5 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.25 2004/11/23 19:47:52 easysw Exp $" +// "$Id: Fl_Widget.cxx,v 1.5.2.4.2.26 2004/11/23 19:51:03 easysw Exp $" // // Base widget class for the Fast Light Tool Kit (FLTK). // @@ -28,6 +28,8 @@ #include <FL/Fl_Group.H> #include <FL/Fl_Tooltip.H> #include <FL/fl_draw.H> +#include <stdlib.h> +#include "flstring.h" //////////////////////////////////////////////////////////////// @@ -129,7 +131,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); + if (flags() & COPIED_LABEL) free((void *)(label_.value)); parent_ = 0; // Don't throw focus to a parent widget. fl_throw_focus(this); } @@ -249,7 +251,7 @@ int Fl_Widget::contains(const Fl_Widget *o) const { void Fl_Widget::label(const char *a) { if (flags() & COPIED_LABEL) { - free(label_.value); + free((void *)(label_.value)); clear_flag(COPIED_LABEL); } label_.value=a; @@ -259,7 +261,7 @@ Fl_Widget::label(const char *a) { void Fl_Widget::copy_label(const char *a) { - if (flags() & COPIED_LABEL) free(label_.value); + if (flags() & COPIED_LABEL) free((void *)(label_.value)); set_flag(COPIED_LABEL); label_.value=strdup(a); redraw_label(); @@ -267,5 +269,5 @@ Fl_Widget::copy_label(const char *a) { // -// End of "$Id: Fl_Widget.cxx,v 1.5.2.4.2.25 2004/11/23 19:47:52 easysw Exp $". +// End of "$Id: Fl_Widget.cxx,v 1.5.2.4.2.26 2004/11/23 19:51:03 easysw Exp $". // |