mirrors/fltk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compiler errors...

Browse Source 
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.1@3918 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Michael R Sweet 2004-11-23 19:51:03 +00:00
parent a42ded75e2
commit 7acedd91ff
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Fl.cxx
View File

@ -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). // 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; static char in_idle;
double Fl::wait(double time_to_wait) { double Fl::wait(double time_to_wait) {
do_widget_deletions(); do_widget_deletion();
if (first_timeout) { if (first_timeout) {
elapse_timeouts(); 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 $".
// //

12
src/Fl_Widget.cxx
View File

@ -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). // Base widget class for the Fast Light Tool Kit (FLTK).
// //
@ -28,6 +28,8 @@
#include <FL/Fl_Group.H> #include <FL/Fl_Group.H>
#include <FL/Fl_Tooltip.H> #include <FL/Fl_Tooltip.H>
#include <FL/fl_draw.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, // However, it is only legal to destroy a "root" such as an Fl_Window,
// and automatic destructors may be called. // and automatic destructors may be called.
Fl_Widget::~Fl_Widget() { 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. parent_ = 0; // Don't throw focus to a parent widget.
fl_throw_focus(this); fl_throw_focus(this);
} }
@ -249,7 +251,7 @@ int Fl_Widget::contains(const Fl_Widget *o) const {
void void
Fl_Widget::label(const char *a) { Fl_Widget::label(const char *a) {
if (flags() & COPIED_LABEL) { if (flags() & COPIED_LABEL) {
free(label_.value); free((void *)(label_.value));
clear_flag(COPIED_LABEL); clear_flag(COPIED_LABEL);
} }
label_.value=a; label_.value=a;
@ -259,7 +261,7 @@ Fl_Widget::label(const char *a) {
void void
Fl_Widget::copy_label(const char *a) { 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); set_flag(COPIED_LABEL);
label_.value=strdup(a); label_.value=strdup(a);
redraw_label(); 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 $".
// //