diff options
| author | Michael R Sweet <michael.r.sweet@gmail.com> | 1999-05-24 14:03:47 +0000 |
|---|---|---|
| committer | Michael R Sweet <michael.r.sweet@gmail.com> | 1999-05-24 14:03:47 +0000 |
| commit | 4b341bc95abca4f3827c249ade7fee1abba8b5d0 (patch) | |
| tree | abf3cb2e196cbe3fe6ba27b21846c74c2dca3f14 /src/Fl_win32.cxx | |
| parent | c95175061198908df8c54e2df3c3643d020fc40c (diff) | |
Added Rick's hack for initializing fl_display.
fl_call_main() and WinMain are now only compiled in for non-GNU compilers
under WIN32 (not needed for Cygwin and friends).
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.0@593 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_win32.cxx')
| -rw-r--r-- | src/Fl_win32.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Fl_win32.cxx b/src/Fl_win32.cxx index 1f098bdeb..678ab196b 100644 --- a/src/Fl_win32.cxx +++ b/src/Fl_win32.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_win32.cxx,v 1.33.2.10 1999/05/11 09:39:30 bill Exp $" +// "$Id: Fl_win32.cxx,v 1.33.2.11 1999/05/24 14:03:46 mike Exp $" // // WIN32-specific code for the Fast Light Tool Kit (FLTK). // @@ -772,7 +772,7 @@ Fl_X* Fl_X::make(Fl_Window* w) { //////////////////////////////////////////////////////////////// -HINSTANCE fl_display = 0; +HINSTANCE fl_display = GetModuleHandle(NULL); // // This WinMain() function can be overridden by an application and @@ -794,7 +794,7 @@ HINSTANCE fl_display = 0; // Microsoft(r) Windows(r) that allows for it. // -#ifndef FL_DLL +#if !defined(FL_DLL) && !defined(__GNUC__) extern "C" int fl_call_main(); @@ -822,7 +822,7 @@ int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, return fl_call_main(); } -#endif /* !FL_DLL */ +#endif /* !FL_DLL && !__GNUC__ */ //////////////////////////////////////////////////////////////// @@ -940,5 +940,5 @@ void Fl_Window::make_current() { } // -// End of "$Id: Fl_win32.cxx,v 1.33.2.10 1999/05/11 09:39:30 bill Exp $". +// End of "$Id: Fl_win32.cxx,v 1.33.2.11 1999/05/24 14:03:46 mike Exp $". // |