diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 2001-03-15 22:39:57 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 2001-03-15 22:39:57 +0000 |
| commit | 3a9d945d0701afbffa02e3331271103c6ce93f0a (patch) | |
| tree | 030a83c68010332b48f9e73f7587271d84cb91af /src | |
| parent | 1ede363769f972270603bee70bd7dd5fde3db5e7 (diff) | |
Use the Multithreaded DLL runtime model for all projects - I haven't found
a system yet that this doesn't work on, and you get smaller executables...
FLUID source needs Windows headers for GetTempPath and MAX_PATH definitions.
Visual C++ complained about the "char **/*argv*/" in CubeMain; added a space
so that */ is not seen.
Include <stdlib.h> to get argc/argv definitions rather than hardcoding
the declarations. This seems to work in all modes.
Add can_do_overlay() method for WIN32 (seems to work on my TNT card at least)
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.0@1416 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src')
| -rw-r--r-- | src/Fl_Gl_Overlay.cxx | 11 | ||||
| -rw-r--r-- | src/fl_call_main.c | 7 |
2 files changed, 12 insertions, 6 deletions
diff --git a/src/Fl_Gl_Overlay.cxx b/src/Fl_Gl_Overlay.cxx index 1272c11a2..fcbf5c7bf 100644 --- a/src/Fl_Gl_Overlay.cxx +++ b/src/Fl_Gl_Overlay.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_Gl_Overlay.cxx,v 1.5.2.15 2001/03/14 17:20:01 spitzak Exp $" +// "$Id: Fl_Gl_Overlay.cxx,v 1.5.2.16 2001/03/15 22:39:56 easysw Exp $" // // OpenGL overlay code for the Fast Light Tool Kit (FLTK). // @@ -126,6 +126,13 @@ void Fl_Gl_Window::make_overlay() { //static COLORREF *palette; extern int fl_overlay_depth; +int Fl_Gl_Window::can_do_overlay() { + HDC hdc = Fl_X::i(this)->private_dc; + LAYERPLANEDESCRIPTOR pfd; + + return (wglDescribeLayerPlane(hdc, g->pixelformat, 1, sizeof(pfd), &pfd)); +} + void Fl_Gl_Window::make_overlay() { if (overlay) return; @@ -206,5 +213,5 @@ void Fl_Gl_Window::hide_overlay() { #endif // -// End of "$Id: Fl_Gl_Overlay.cxx,v 1.5.2.15 2001/03/14 17:20:01 spitzak Exp $". +// End of "$Id: Fl_Gl_Overlay.cxx,v 1.5.2.16 2001/03/15 22:39:56 easysw Exp $". // diff --git a/src/fl_call_main.c b/src/fl_call_main.c index c11ad4515..647a8bfe9 100644 --- a/src/fl_call_main.c +++ b/src/fl_call_main.c @@ -1,5 +1,5 @@ /* - * "$Id: fl_call_main.c,v 1.1.2.8 2001/01/22 15:13:40 easysw Exp $" + * "$Id: fl_call_main.c,v 1.1.2.9 2001/03/15 22:39:56 easysw Exp $" * * Copyright 1998-2001 by Bill Spitzak and others. * @@ -48,14 +48,13 @@ #include <windows.h> #include <stdio.h> +#include <stdlib.h> extern int main(int, char *[]); #ifdef BORLAND5 #define __argc _argc #define __argv _argv #endif -extern int __argc; -extern char **__argv; int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow) { @@ -83,6 +82,6 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, #endif /* - * End of "$Id: fl_call_main.c,v 1.1.2.8 2001/01/22 15:13:40 easysw Exp $". + * End of "$Id: fl_call_main.c,v 1.1.2.9 2001/03/15 22:39:56 easysw Exp $". */ |