diff options
| author | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2019-05-20 13:16:31 +0200 |
|---|---|---|
| committer | ManoloFLTK <41016272+ManoloFLTK@users.noreply.github.com> | 2019-05-20 13:16:31 +0200 |
| commit | 159572785df885ef33663040af920e02a7950749 (patch) | |
| tree | 3900d8f6b8891800b598afaba414afeeffec94e7 /src/drivers | |
| parent | 357dad1e519fdd39f3af2d07fff4d70415ceec8a (diff) | |
Remove small duplication of code
Diffstat (limited to 'src/drivers')
| -rw-r--r-- | src/drivers/Cocoa/Fl_Cocoa_Printer_Driver.mm | 6 | ||||
| -rw-r--r-- | src/drivers/Cocoa/Fl_Cocoa_Window_Driver.H | 4 |
2 files changed, 3 insertions, 7 deletions
diff --git a/src/drivers/Cocoa/Fl_Cocoa_Printer_Driver.mm b/src/drivers/Cocoa/Fl_Cocoa_Printer_Driver.mm index 8230d8bba..33d329ebc 100644 --- a/src/drivers/Cocoa/Fl_Cocoa_Printer_Driver.mm +++ b/src/drivers/Cocoa/Fl_Cocoa_Printer_Driver.mm @@ -374,11 +374,7 @@ void Fl_Cocoa_Printer_Driver::draw_decorated_window(Fl_Window *win, int x_offset } int bt = win->decorated_h() - win->h(); BOOL to_quartz = (this->driver()->has_feature(Fl_Graphics_Driver::NATIVE)); - CALayer *layer = nil; -#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_6 - if (fl_mac_os_version >= 101000) layer = [[[fl_xid(win) standardWindowButton:NSWindowCloseButton] superview] layer]; -#endif - + CALayer *layer = Fl_Cocoa_Window_Driver::driver(win)->get_titlebar_layer(); if (layer) { // if title bar uses a layer if (to_quartz) { // to Quartz printer CGContextRef gc = (CGContextRef)driver()->gc(); diff --git a/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.H b/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.H index 2e76fbe8f..6de52e5db 100644 --- a/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.H +++ b/src/drivers/Cocoa/Fl_Cocoa_Window_Driver.H @@ -136,10 +136,10 @@ public: virtual int set_cursor(const Fl_RGB_Image*, int, int); virtual void shape(const Fl_Image* img); - // that one is implemented in Fl_Cocoa.mm because it uses Objective-c + // next 4 are in Fl_cocoa.mm because they use Objective-c virtual void capture_titlebar_and_borders(Fl_RGB_Image*& top, Fl_RGB_Image*& left, Fl_RGB_Image*& bottom, Fl_RGB_Image*& right); - //this one is in Fl_cocoa.mm because it uses Objective-c virtual void wait_for_expose(); + CALayer *get_titlebar_layer(); static void draw_layer_to_context(CALayer *layer, CGContextRef gc, int w, int h); virtual int scroll(int src_x, int src_y, int src_w, int src_h, int dest_x, int dest_y, void (*draw_area)(void*, int,int,int,int), void* data); |