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

FL/mac.H

@@ -165,7 +165,6 @@ public:
   int set_cursor(const Fl_RGB_Image*, int, int);
   static CGImageRef CGImage_from_window_rect(Fl_Window *win, int x, int y, int w, int h);
   static unsigned char *bitmap_from_window_rect(Fl_Window *win, int x, int y, int w, int h, int *bytesPerPixel);
-  static void screen_work_area(int &X, int &Y, int &W, int &H, int n); // compute work area of a given screen
   static void clip_to_rounded_corners(CGContextRef gc, int w, int h);
 private:
   CGRect* subRect_;           // makes sure subwindow remains inside its parent window

src/CMakeLists.txt

@@ -263,6 +263,7 @@ elseif (APPLE)
     drivers/Cocoa/Fl_Cocoa_Screen_Driver.H
     drivers/Cocoa/Fl_Cocoa_Window_Driver.H
     drivers/Quartz/Fl_Quartz_Graphics_Driver.H
+    drivers/Quartz/Fl_Quartz_Copy_Surface_Driver.H
     drivers/Quartz/Fl_Font.H
   )
 

src/Fl_cocoa.mm

@@ -1905,8 +1905,10 @@ int Fl_Cocoa_Screen_Driver::h() {
 }
 
 // computes the work area of the nth screen (screen #0 has the menubar)
-void Fl_X::screen_work_area(int &X, int &Y, int &W, int &H, int n)
+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_open_display();
   NSRect r = [[[NSScreen screens] objectAtIndex:n] visibleFrame];
   X   = int(r.origin.x);

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);

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();