From 3f64e2b28d3556a1ea316fe6ae73eabf454f1fa8 Mon Sep 17 00:00:00 2001 From: Manolo Gouy Date: Fri, 15 Apr 2016 11:30:10 +0000 Subject: Continue removing from class Fl_X what is not window-related. git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3-porting@11613 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.H | 1 + src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.cxx | 8 -------- 2 files changed, 1 insertion(+), 8 deletions(-) (limited to 'src/drivers') diff --git a/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.H b/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.H index afcaad924..23e123e9c 100644 --- a/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.H +++ b/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.H @@ -64,6 +64,7 @@ public: virtual int h(); virtual void screen_xywh(int &X, int &Y, int &W, int &H, int n); virtual void screen_dpi(float &h, float &v, int n=0); + // implemented in Fl_cocoa.mm because uses Objective-c virtual void screen_work_area(int &X, int &Y, int &W, int &H, int n); // --- audible output virtual void beep(int type); diff --git a/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.cxx b/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.cxx index 6f0ebfa64..270660ea5 100644 --- a/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.cxx +++ b/src/drivers/Cocoa/Fl_Cocoa_Screen_Driver.cxx @@ -94,14 +94,6 @@ void Fl_Cocoa_Screen_Driver::init() } -void Fl_Cocoa_Screen_Driver::screen_work_area(int &X, int &Y, int &W, int &H, int n) -{ - if (num_screens < 0) init(); - if (n < 0 || n >= num_screens) n = 0; - Fl_X::screen_work_area(X, Y, W, H, n); -} - - void Fl_Cocoa_Screen_Driver::screen_xywh(int &X, int &Y, int &W, int &H, int n) { if (num_screens < 0) init(); -- cgit v1.2.3