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_overlay.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_overlay.cxx')
| -rw-r--r-- | src/fl_overlay.cxx | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/fl_overlay.cxx b/src/fl_overlay.cxx index 41ac3b4a5..2f4547607 100644 --- a/src/fl_overlay.cxx +++ b/src/fl_overlay.cxx @@ -3,7 +3,7 @@ // // Overlay support for the Fast Light Tool Kit (FLTK). // -// Copyright 1998-2010 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 @@ -40,14 +40,15 @@ static int bgx, bgy, bgw, bgh; static void draw_current_rect() { #ifdef USE_XOR # if defined(USE_X11) - XSetFunction(fl_display, fl_gc, GXxor); - XSetForeground(fl_display, fl_gc, 0xffffffff); - XDrawRectangle(fl_display, fl_window, fl_gc, px, py, pw, ph); - XSetFunction(fl_display, fl_gc, GXcopy); + GC gc = (GC)fl_graphics_driver->get_gc(); + XSetFunction(fl_display, gc, GXxor); + XSetForeground(fl_display, gc, 0xffffffff); + XDrawRectangle(fl_display, fl_window, gc, px, py, pw, ph); + XSetFunction(fl_display, gc, GXcopy); # elif defined(WIN32) - int old = SetROP2(fl_gc, R2_NOT); + int old = SetROP2(fl_graphics_driver->get_gc(), R2_NOT); fl_rect(px, py, pw, ph); - SetROP2(fl_gc, old); + SetROP2(fl_graphics_driver->get_gc(), old); # elif defined(__APPLE_QUARTZ__) // PORTME: Fl_Window_Driver - platform overlay // warning: Quartz does not support xor drawing // Use the Fl_Overlay_Window instead. |