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

Changes from Luis Ibanez to make it compile under Borland.

Browse Source 
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
This commit is contained in:
Bill Spitzak 1999-03-18 20:04:13 +00:00
parent 4163d5b5ad
commit 2eafe965c9
5 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
FL/Fl_Menu_Item.H
View File

@ -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 $".
//

7
FL/Fl_Widget.H
View File

@ -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 $".
//

6
src/Fl_Gl_Window.cxx
View File

@ -1,5 +1,5 @@
//
// "$Id: Fl_Gl_Window.cxx,v 1.12 1999/01/07 19:17:20 mike Exp $"
// "$Id: Fl_Gl_Window.cxx,v 1.12.2.1 1999/03/18 20:04:12 bill Exp $"
//
// OpenGL window code for the Fast Light Tool Kit (FLTK).
//
@ -174,7 +174,7 @@ void Fl_Gl_Window::swap_buffers() {
}
#if HAVE_GL_OVERLAY
#if WIN32
#ifdef WIN32
uchar fl_overlay; // changes how fl_color() works
#endif
#endif
@ -328,5 +328,5 @@ void Fl_Gl_Window::draw_overlay() {}
#endif
//
// End of "$Id: Fl_Gl_Window.cxx,v 1.12 1999/01/07 19:17:20 mike Exp $".
// End of "$Id: Fl_Gl_Window.cxx,v 1.12.2.1 1999/03/18 20:04:12 bill Exp $".
//

20
src/Fl_win32.cxx
View File

@ -1,5 +1,5 @@
//
// "$Id: Fl_win32.cxx,v 1.33 1999/03/04 21:20:55 mike Exp $"
// "$Id: Fl_win32.cxx,v 1.33.2.1 1999/03/18 20:04:13 bill Exp $"
//
// WIN32-specific code for the Fast Light Tool Kit (FLTK).
//
@ -760,10 +760,17 @@ HINSTANCE fl_display = 0;
//
#ifndef FL_DLL
extern "C" {
#ifdef BORLAND
extern int _argc;
extern char **_argv;
extern FL_EXPORT int OwlMain(int, char *[]);
#else
extern int __argc;
extern char **__argv;
extern FL_EXPORT int main(int argc, char *argv[]);
extern FL_EXPORT int main(int, char *[]);
#endif
};
int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
@ -787,11 +794,14 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
#endif // _DEBUG
// Run the standard main entry point function...
#ifdef BORLAND
return OwlMain(_argc, _argv);
#else
return main(__argc, __argv);
#endif
}
#endif /* !FL_DLL */
#endif /* !FL_DLL */
////////////////////////////////////////////////////////////////
@ -907,5 +917,5 @@ void Fl_Window::make_current() {
}
//
// End of "$Id: Fl_win32.cxx,v 1.33 1999/03/04 21:20:55 mike Exp $".
// End of "$Id: Fl_win32.cxx,v 1.33.2.1 1999/03/18 20:04:13 bill Exp $".
//

6
src/glut_compatability.cxx
View File

@ -1,5 +1,5 @@
//
// "$Id: glut_compatability.cxx,v 1.4 1999/01/07 19:17:46 mike Exp $"
// "$Id: glut_compatability.cxx,v 1.4.2.1 1999/03/18 20:04:13 bill Exp $"
//
// GLUT emulation routines for the Fast Light Tool Kit (FLTK).
//
@ -92,7 +92,7 @@ int Fl_Glut_Window::handle(int event) {
break;
case FL_RELEASE:
for (button = 0; button < 3; button++) if (mouse_down & 1<<button) {
for (button = 0; button < 3; button++) if (mouse_down & (1<<button)) {
if (mouse) mouse(button,GLUT_UP,ex,ey);
}
mouse_down = 0;
@ -399,5 +399,5 @@ int glutLayerGet(GLenum type) {
#endif
//
// End of "$Id: glut_compatability.cxx,v 1.4 1999/01/07 19:17:46 mike Exp $".
// End of "$Id: glut_compatability.cxx,v 1.4.2.1 1999/03/18 20:04:13 bill Exp $".
//