diff options
| author | Manolo Gouy <Manolo> | 2016-02-18 16:21:51 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2016-02-18 16:21:51 +0000 |
| commit | f33b45f1d30653fb5da4817089e38ff0a2413cfb (patch) | |
| tree | 9edc759690defa581b00b6ada80bb334f4ac5da8 /src/Fl.cxx | |
| parent | 6ce27012a9412c4964e0ae40c81ea92ff39a61d3 (diff) | |
Remove all uses of the fl_gc global variable. Towards a clean driver model.
fl_gc remains usable by the application as a hook into the system.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11189 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl.cxx')
| -rw-r--r-- | src/Fl.cxx | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/Fl.cxx b/src/Fl.cxx index 7f7e2076c..8556424ed 100644 --- a/src/Fl.cxx +++ b/src/Fl.cxx @@ -3,7 +3,7 @@ // // Main event handling code for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2015 by Bill Spitzak and others. +// Copyright 1998-2016 by Bill Spitzak and others. // // This library is free software. Distribution and use rights are outlined in // the file "COPYING" which should have been included with this file. If this @@ -60,6 +60,7 @@ #endif // DEBUG || DEBUG_WATCH #ifdef WIN32 +#include <FL/Fl_Graphics_Driver.H> // for fl_graphics_driver #elif defined(__APPLE__) // PORTME: Fl_Screen_Driver - window driver and main loop #elif defined(FL_PORTING) # pragma message "FL_PORTING: implement global variables for your platform here" @@ -1618,10 +1619,10 @@ void Fl_Window::hide() { // Send a message to myself so that I'll get out of the event loop... PostMessage(ip->xid, WM_APP, 0, 0); if (ip->private_dc) fl_release_dc(ip->xid, ip->private_dc); - if (ip->xid == fl_window && fl_gc) { - fl_release_dc(fl_window, fl_gc); + if (ip->xid == fl_window && fl_graphics_driver->get_gc()) { + fl_release_dc(fl_window, (HDC)fl_graphics_driver->get_gc()); fl_window = (HWND)-1; - fl_gc = 0; + fl_graphics_driver->set_gc(0); # ifdef FLTK_USE_CAIRO if (Fl::cairo_autolink_context()) Fl::cairo_make_current((Fl_Window*) 0); # endif |