diff options
| author | Manolo Gouy <Manolo> | 2011-02-06 12:32:23 +0000 |
|---|---|---|
| committer | Manolo Gouy <Manolo> | 2011-02-06 12:32:23 +0000 |
| commit | 6a5feafe23e6e37009312aa40b63d19ad9cff886 (patch) | |
| tree | a5d1d7b429cec1ae3f21647e9777a5bc66c0b8c3 /src/Fl_cocoa.mm | |
| parent | 5e7232e776d3325ecc1a336453a3f846a1872ff1 (diff) | |
Replaced global variable fl_color_ by a private member of the Fl_Graphics_Driver class,
and a public getter to it: Fl_Graphics_Driver::color().
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@8384 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_cocoa.mm')
| -rw-r--r-- | src/Fl_cocoa.mm | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm index ae328930a..2783f7673 100644 --- a/src/Fl_cocoa.mm +++ b/src/Fl_cocoa.mm @@ -2238,7 +2238,6 @@ void Fl_Window::make_current() } // helper function to manage the current CGContext fl_gc -extern Fl_Color fl_color_; extern class Fl_Font_Descriptor *fl_fontsize; extern void fl_font(class Fl_Font_Descriptor*); extern void fl_quartz_restore_line_style_(); @@ -2253,7 +2252,7 @@ void Fl_X::q_fill_context() { CGContextScaleCTM(fl_gc, 1.0f, -1.0f); // now 0,0 is top-left point of the context } fl_font(fl_fontsize); - fl_color(fl_color_); + fl_color(fl_graphics_driver->color()); fl_quartz_restore_line_style_(); } |