diff options
Diffstat (limited to 'src/Fl_win32.cxx')
| -rw-r--r-- | src/Fl_win32.cxx | 60 |
1 files changed, 4 insertions, 56 deletions
diff --git a/src/Fl_win32.cxx b/src/Fl_win32.cxx index 0f857f63c..c8dc8f555 100644 --- a/src/Fl_win32.cxx +++ b/src/Fl_win32.cxx @@ -1,5 +1,5 @@ // -// "$Id: Fl_win32.cxx,v 1.33.2.14 1999/09/16 05:34:26 bill Exp $" +// "$Id: Fl_win32.cxx,v 1.33.2.15 1999/10/14 04:56:08 bill Exp $" // // WIN32-specific code for the Fast Light Tool Kit (FLTK). // @@ -663,8 +663,8 @@ int fl_disable_transient_for; // secret method of removing TRANSIENT_FOR Fl_X* Fl_X::make(Fl_Window* w) { Fl_Group::current(0); // get rid of very common user bug: forgot end() - const char* class_name = w->xclass(); - if (!class_name) class_name = "FLTK"; // create a "FLTK" WNDCLASS + const char* class_name = /*w->xclass(); + if (!class_name) class_name =*/ "FLTK"; // create a "FLTK" WNDCLASS WNDCLASSEX wc; // Documentation states a device context consumes about 800 bytes @@ -783,58 +783,6 @@ Fl_X* Fl_X::make(Fl_Window* w) { HINSTANCE fl_display = GetModuleHandle(NULL); -// -// This WinMain() function can be overridden by an application and -// is provided for compatibility with programs written for other -// operating systems that conform to the ANSI standard entry point -// "main()". This will allow you to build a WIN32 Application -// without any special settings. -// -// Because of problems with the Microsoft Visual C++ header files -// and/or compiler, you cannot have a WinMain function in a DLL. -// I don't know why. Thus, this nifty feature is only available -// if you link to the static library. -// -// Currently the debug version of this library will create a -// console window for your application so you can put printf() -// statements for debugging or informational purposes. Ultimately -// we want to update this to always use the parent's console, -// but at present we have not identified a function or API in -// Microsoft(r) Windows(r) that allows for it. -// - -#if !defined(FL_DLL) && !defined(__GNUC__) - -extern "C" int fl_call_main(); - -int WINAPI WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, - LPSTR lpCmdLine, int nCmdShow) { - // Save the current instance in the fl_display variable... - fl_display = hInstance; - -#ifdef _DEBUG - // If we are using compiling in debug mode, open a console window so - // we can see any printf's, etc... - // - // While we can detect if the program was run from the command-line - - // look at the CMDLINE environment variable, it will be "WIN" for - // programs started from the GUI - the shell seems to run all WIN32 - // applications in the background anyways... - - AllocConsole(); - freopen("conin$", "r", stdin); - freopen("conout$", "w", stdout); - freopen("conout$", "w", stderr); -#endif // _DEBUG - - // Run the standard main entry point function... - return fl_call_main(); -} - -#endif /* !FL_DLL && !__GNUC__ */ - -//////////////////////////////////////////////////////////////// - void Fl_Window::size_range_() { size_range_set = 1; } @@ -949,5 +897,5 @@ void Fl_Window::make_current() { } // -// End of "$Id: Fl_win32.cxx,v 1.33.2.14 1999/09/16 05:34:26 bill Exp $". +// End of "$Id: Fl_win32.cxx,v 1.33.2.15 1999/10/14 04:56:08 bill Exp $". // |