gre-ilya/fltk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix to compile on GCC 2.95.

Browse Source 
Carl


git-svn-id: file:///fltk/svn/fltk/branches/branch-1.0@1037 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
This commit is contained in:
Carl E. Thompson 2000-03-08 16:02:25 +00:00
parent d4d22e857c
commit af5190b95f
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
FL/Fl.H
View File

@ -1,5 +1,5 @@
//
// "$Id: Fl.H,v 1.8.2.2 2000/02/21 10:45:58 bill Exp $"
// "$Id: Fl.H,v 1.8.2.3 2000/03/08 16:02:24 carl Exp $"
//
// Main header file for the Fast Light Tool Kit (FLTK).
//
@ -38,6 +38,8 @@ typedef void (Fl_Label_Draw_F)(const Fl_Label*, int,int,int,int, Fl_Align);
typedef void (Fl_Label_Measure_F)(const Fl_Label*, int&, int&);
typedef void (Fl_Box_Draw_F)(int,int,int,int, Fl_Color);
typedef void (*Fl_Timeout_Handler)(void*);
class Fl {
Fl() {}; // no constructor!
@ -88,8 +90,8 @@ public:
static FL_EXPORT int ready();
static FL_EXPORT int run();
static FL_EXPORT Fl_Widget* readqueue();
static FL_EXPORT void add_timeout(double t,void (*cb)(void*),void* v = 0);
static FL_EXPORT void remove_timeout(void (*cb)(void*), void* = 0);
static FL_EXPORT void add_timeout(double t, Fl_Timeout_Handler,void* = 0);
static FL_EXPORT void remove_timeout(Fl_Timeout_Handler, void* = 0);
static FL_EXPORT void add_fd(int fd, int when, void (*cb)(int,void*),void* =0);
static FL_EXPORT void add_fd(int fd, void (*cb)(int, void*), void* = 0);
static FL_EXPORT void remove_fd(int, int when);
@ -208,5 +210,5 @@ public:
#endif
//
// End of "$Id: Fl.H,v 1.8.2.2 2000/02/21 10:45:58 bill Exp $".
// End of "$Id: Fl.H,v 1.8.2.3 2000/03/08 16:02:24 carl Exp $".
//

8
src/Fl.cxx
View File

@ -1,6 +1,6 @@
#include <stdio.h>
//
// "$Id: Fl.cxx,v 1.24.2.16 2000/02/18 07:11:08 bill Exp $"
// "$Id: Fl.cxx,v 1.24.2.17 2000/03/08 16:02:25 carl Exp $"
//
// Main event handling code for the Fast Light Tool Kit (FLTK).
//
@ -79,7 +79,7 @@ static struct Timeout {
static int numtimeouts;
static int timeout_array_size;
void Fl::add_timeout(double t, void (*cb)(void *), void *v) {
void Fl::add_timeout(double t, Fl_Timeout_Handler cb, void *v) {
fl_elapsed();
@ -103,7 +103,7 @@ void Fl::add_timeout(double t, void (*cb)(void *), void *v) {
numtimeouts++;
}
void Fl::remove_timeout(void (*cb)(void *), void *v) {
void Fl::remove_timeout(Fl_Timeout_Handler cb, void *v) {
int i,j;
for (i=j=0; i<numtimeouts; i++) {
if (timeout[i].cb == cb && timeout[i].arg==v) ;
@ -706,5 +706,5 @@ int fl_old_shortcut(const char* s) {
}
//
// End of "$Id: Fl.cxx,v 1.24.2.16 2000/02/18 07:11:08 bill Exp $".
// End of "$Id: Fl.cxx,v 1.24.2.17 2000/03/08 16:02:25 carl Exp $".
//