summaryrefslogtreecommitdiff
path: root/src/Fl_cocoa.mm
diff options
context:
space:
mode:
authorManolo Gouy <Manolo>2016-02-19 12:40:24 +0000
committerManolo Gouy <Manolo>2016-02-19 12:40:24 +0000
commit1b5e231c902ab198c577989db44946797ebd4893 (patch)
tree211751e0eceda308df4e51d94511362f5e0b55f6 /src/Fl_cocoa.mm
parent6d766cc6814a9e7a04c0b147c7a3cbdc0817dfd4 (diff)
Rename Fl_Graphics_Driver::set_gc(void*) to gc(void*) and Fl_Graphics_Driver::get_gc() to gc().
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11191 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/Fl_cocoa.mm')
-rw-r--r--src/Fl_cocoa.mm10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Fl_cocoa.mm b/src/Fl_cocoa.mm
index f4d6fd094..19542d9b3 100644
--- a/src/Fl_cocoa.mm
+++ b/src/Fl_cocoa.mm
@@ -3276,7 +3276,7 @@ void Fl_Window::make_current()
#endif
nsgc = through_Fl_X_flush ? [NSGraphicsContext currentContext] : [NSGraphicsContext graphicsContextWithWindow:fl_window];
i->gc = (CGContextRef)[nsgc graphicsPort];
- Fl_Display_Device::display_device()->driver()->set_gc(i->gc);
+ Fl_Display_Device::display_device()->driver()->gc(i->gc);
CGContextSaveGState(i->gc); // native context
// antialiasing must be deactivated because it applies to rectangles too
// and escapes even clipping!!!
@@ -3304,14 +3304,14 @@ void Fl_Window::make_current()
// Give the Quartz context back to the system
void Fl_X::q_release_context(Fl_X *x) {
- CGContextRef gc = (CGContextRef)Fl_Display_Device::display_device()->driver()->get_gc();
+ CGContextRef gc = (CGContextRef)Fl_Display_Device::display_device()->driver()->gc();
if (x && x->gc!=gc) return;
if (!gc) return;
CGContextRestoreGState(gc); // match the CGContextSaveGState's of make_current
CGContextRestoreGState(gc);
Fl_X::set_high_resolution(false);
CGContextFlush(gc);
- Fl_Display_Device::display_device()->driver()->set_gc(0);
+ Fl_Display_Device::display_device()->driver()->gc(0);
#if defined(FLTK_USE_CAIRO)
if (Fl::cairo_autolink_context()) Fl::cairo_make_current((Fl_Window*) 0); // capture gc changes automatically to update the cairo context adequately
#endif
@@ -4378,7 +4378,7 @@ void Fl_Paged_Device::print_window(Fl_Window *win, int x_offset, int y_offset)
CALayer *layer = get_titlebar_layer(win);
if (layer) { // if title bar uses a layer
if (to_quartz) { // to Quartz printer
- CGContextRef gc = (CGContextRef)driver()->get_gc();
+ CGContextRef gc = (CGContextRef)driver()->gc();
CGContextSaveGState(gc);
CGContextTranslateCTM(gc, x_offset - 0.5, y_offset + bt - 0.5);
CGContextScaleCTM(gc, 1, -1);
@@ -4424,7 +4424,7 @@ void Fl_Paged_Device::print_window(Fl_Window *win, int x_offset, int y_offset)
if (fl_mac_os_version >= 100400 && to_quartz) { // use Cocoa string drawing with exact title bar font
// the exact font is LucidaGrande 13 pts (and HelveticaNeueDeskInterface-Regular with 10.10)
NSGraphicsContext *current = [NSGraphicsContext currentContext];
- [NSGraphicsContext setCurrentContext:[NSGraphicsContext graphicsContextWithGraphicsPort:driver()->get_gc() flipped:YES]];//10.4
+ [NSGraphicsContext setCurrentContext:[NSGraphicsContext graphicsContextWithGraphicsPort:driver()->gc() flipped:YES]];//10.4
NSDictionary *attr = [NSDictionary dictionaryWithObject:[NSFont titleBarFontOfSize:0]
forKey:NSFontAttributeName];
NSString *title_s = [fl_xid(win) title];