Skip to content

Commit

Permalink
Use the Multithreaded DLL runtime model for all projects - I haven't …
Browse files Browse the repository at this point in the history
…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
  • Loading branch information
michaelrsweet committed Mar 15, 2001
1 parent 1ede363 commit 3a9d945
Show file tree
Hide file tree
Showing 63 changed files with 171 additions and 129 deletions.
35 changes: 35 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -1,8 +1,41 @@
CHANGES SINCE FLTK 1.0.10

- CHANGED THE DEFAULT RUN-TIME LINKING TO "MULTITHREADED
DLL". You'll need to change your project settings to
use this as well or you'll get errors.

- Check for OpenGL headers before checking to see if
OpenGL is supported. This should eliminate compile
errors due to missing non-FLTK header files...

- Add -D_INCLUDE_POSIX_SOURCE option when compiling with
the HP compilers.


- Replaced remaining _WIN32 symbols with WIN32

- Removed reference to unused GL/glu.h header file, which is missing on
some Linux systems.

- Fl_Gl_Window has a new method to allow you to get and set the context:

void Fl_Gl_Window::context(void*, int destroy = 0)
void* Fl_Gl_Window::context() const;

Return or set a pointer to the GLContext that this window is
using. This is a system-dependent structure, but it is portable to
copy the context from one window to another. You can also set it to
NULL, which will force FLTK to recreate the context the next time
make_current() is called, this is useful for getting around bugs in
OpenGL implementations.

If destroy_flag is true the context will be destroyed by fltk when
the window is destroyed, or when the mode() is changed, or the next
time context(x) is called.

- Some cleanup of Fl_Gl_Choice to move most of the system dependent
#ifdefs into Fl_Gl_Choice.cxx.

- Fl_Gl_Window does not set drawbuffer(BACKBUFFER) for
single-buffered windows.

Expand Down Expand Up @@ -39,6 +72,8 @@ CHANGES SINCE FLTK 1.0.10

- Added simple FLTK and FLUID manual pages.

- Fl_Gl_Window leaked memory under WIN32.


CHANGES SINCE FLTK 1.0.9

Expand Down
9 changes: 5 additions & 4 deletions fluid/fluid.cxx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//
// "$Id: fluid.cxx,v 1.15.2.12 2001/02/01 17:30:28 easysw Exp $"
// "$Id: fluid.cxx,v 1.15.2.13 2001/03/15 22:39:56 easysw Exp $"
//
// FLUID main entry for the Fast Light Tool Kit (FLTK).
//
Expand Down Expand Up @@ -63,9 +63,10 @@ const char *copyright =
#include <errno.h>

#if defined(WIN32) && !defined(__CYGWIN__)
# include <direct.h>
# include <direct.h>
# include <windows.h>
#else
# include <unistd.h>
# include <unistd.h>
#endif

#include "about_panel.h"
Expand Down Expand Up @@ -473,5 +474,5 @@ int main(int argc,char **argv) {
}

//
// End of "$Id: fluid.cxx,v 1.15.2.12 2001/02/01 17:30:28 easysw Exp $".
// End of "$Id: fluid.cxx,v 1.15.2.13 2001/03/15 22:39:56 easysw Exp $".
//
11 changes: 9 additions & 2 deletions src/Fl_Gl_Overlay.cxx
Original file line number Diff line number Diff line change
@@ -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).
//
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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 $".
//
7 changes: 3 additions & 4 deletions src/fl_call_main.c
Original file line number Diff line number Diff line change
@@ -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.
*
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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 $".
*/

6 changes: 3 additions & 3 deletions test/CubeMain.cxx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
//
// "$Id: CubeMain.cxx,v 1.2.2.4 2001/01/22 15:13:41 easysw Exp $"
// "$Id: CubeMain.cxx,v 1.2.2.5 2001/03/15 22:39:56 easysw Exp $"
//
// CubeView class definitions for the Fast Light Tool Kit (FLTK).
//
Expand Down Expand Up @@ -28,7 +28,7 @@
#include "CubeViewUI.h"

int
main(int /*argc*/, char **/*argv*/) {
main(int /*argc*/, char ** /*argv*/) {

CubeViewUI *cvui=new CubeViewUI;

Expand All @@ -43,5 +43,5 @@ main(int /*argc*/, char **/*argv*/) {


//
// End of "$Id: CubeMain.cxx,v 1.2.2.4 2001/01/22 15:13:41 easysw Exp $".
// End of "$Id: CubeMain.cxx,v 1.2.2.5 2001/03/15 22:39:56 easysw Exp $".
//
4 changes: 2 additions & 2 deletions visualc/CubeView.dsp

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions visualc/adjuster.dsp

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions visualc/arc.dsp

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions visualc/ask.dsp

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions visualc/bitmap.dsp

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions visualc/boxtype.dsp

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions visualc/browser.dsp

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions visualc/button.dsp

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions visualc/buttons.dsp

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions visualc/checkers.dsp

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions visualc/clock.dsp

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 3a9d945

Please sign in to comment.