diff options
| author | Bill Spitzak <spitzak@gmail.com> | 1999-03-18 20:04:13 +0000 |
|---|---|---|
| committer | Bill Spitzak <spitzak@gmail.com> | 1999-03-18 20:04:13 +0000 |
| commit | 2eafe965c949ccbc8c992e1f978298dff63113ae (patch) | |
| tree | e50185abf94e1dc6d90a1664c7fbd4618a61d6de /FL | |
| parent | 4163d5b5addeaa2cf68d2e0fc829ee80dac35a63 (diff) | |
Changes from Luis Ibanez to make it compile under Borland.
Includes a real bug that was in Fl_Gl_Window.c (#if WIN32)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.0@437 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'FL')
| -rw-r--r-- | FL/Fl_Menu_Item.H | 6 | ||||
| -rw-r--r-- | FL/Fl_Widget.H | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/FL/Fl_Menu_Item.H b/FL/Fl_Menu_Item.H index 1b27f5b57..dc440146c 100644 --- a/FL/Fl_Menu_Item.H +++ b/FL/Fl_Menu_Item.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Menu_Item.H,v 1.5 1999/02/16 21:59:40 mike Exp $" +// "$Id: Fl_Menu_Item.H,v 1.5.2.1 1999/03/18 20:04:11 bill Exp $" // // Menu item header file for the Fast Light Tool Kit (FLTK). // @@ -75,7 +75,7 @@ struct Fl_Menu_Item { void labelfont(uchar a) {labelfont_ = a;} uchar labelsize() const {return labelsize_;} void labelsize(uchar a) {labelsize_ = a;} - Fl_Callback* callback() const {return callback_;} + Fl_Callback_p callback() const {return callback_;} void callback(Fl_Callback* c, void* p) {callback_=c; user_data_=p;} void callback(Fl_Callback* c) {callback_=c;} void callback(Fl_Callback0*c) {callback_=(Fl_Callback*)c;} @@ -153,5 +153,5 @@ enum { // back-compatability enum: #endif // -// End of "$Id: Fl_Menu_Item.H,v 1.5 1999/02/16 21:59:40 mike Exp $". +// End of "$Id: Fl_Menu_Item.H,v 1.5.2.1 1999/03/18 20:04:11 bill Exp $". // diff --git a/FL/Fl_Widget.H b/FL/Fl_Widget.H index deebeb6f6..4e626dd4b 100644 --- a/FL/Fl_Widget.H +++ b/FL/Fl_Widget.H @@ -1,5 +1,5 @@ // -// "$Id: Fl_Widget.H,v 1.6 1999/02/16 21:59:46 mike Exp $" +// "$Id: Fl_Widget.H,v 1.6.2.1 1999/03/18 20:04:11 bill Exp $" // // Widget header file for the Fast Light Tool Kit (FLTK). // @@ -32,6 +32,7 @@ class Fl_Widget; class Fl_Window; typedef void (Fl_Callback )(Fl_Widget*, void*); +typedef Fl_Callback* Fl_Callback_p; // needed for BORLAND typedef void (Fl_Callback0)(Fl_Widget*); typedef void (Fl_Callback1)(Fl_Widget*, long); @@ -127,7 +128,7 @@ public: FL_EXPORT void labelfont(uchar a) {label_.font=a;} FL_EXPORT uchar labelsize() const {return label_.size;} FL_EXPORT void labelsize(uchar a) {label_.size=a;} - FL_EXPORT Fl_Callback* callback() const {return callback_;} + FL_EXPORT Fl_Callback_p callback() const {return callback_;} FL_EXPORT void callback(Fl_Callback* c, void* p) {callback_=c; user_data_=p;} FL_EXPORT void callback(Fl_Callback* c) {callback_=c;} FL_EXPORT void callback(Fl_Callback0*c) {callback_=(Fl_Callback*)c;} @@ -190,5 +191,5 @@ public: #endif // -// End of "$Id: Fl_Widget.H,v 1.6 1999/02/16 21:59:46 mike Exp $". +// End of "$Id: Fl_Widget.H,v 1.6.2.1 1999/03/18 20:04:11 bill Exp $". // |