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 /src | |
| 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 'src')
| -rw-r--r-- | src/Fl_Gl_Window.cxx | 6 | ||||
| -rw-r--r-- | src/Fl_win32.cxx | 20 | ||||
| -rwxr-xr-x | src/glut_compatability.cxx | 6 |
3 files changed, 21 insertions, 11 deletions
diff --git a/src/Fl_Gl_Window.cxx b/src/Fl_Gl_Window.cxx index 888282bed..ef21b9107 100644 --- a/src/Fl_Gl_Window.cxx +++ b/src/Fl_Gl_Window.cxx @@ -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 $". // diff --git a/src/Fl_win32.cxx b/src/Fl_win32.cxx index 8d755bd04..f989a4233 100644 --- a/src/Fl_win32.cxx +++ b/src/Fl_win32.cxx @@ -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 $". // diff --git a/src/glut_compatability.cxx b/src/glut_compatability.cxx index c6eece2ce..33e7144e3 100755 --- a/src/glut_compatability.cxx +++ b/src/glut_compatability.cxx @@ -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 $". // |