Author: manolo
Date: 2011-09-19 12:03:22 -0700 (Mon, 19 Sep 2011)
New Revision: 9050
Log:
Mac OS: simplified use of CGRectMake() for rectangle drawing and clipping on display and printer.

Modified:
   branches/branch-1.3/src/Fl_cocoa.mm
   branches/branch-1.3/src/fl_rect.cxx

Modified: branches/branch-1.3/src/Fl_cocoa.mm
===================================================================
--- branches/branch-1.3/src/Fl_cocoa.mm	2011-09-18 20:31:08 UTC (rev 9049)
+++ branches/branch-1.3/src/Fl_cocoa.mm	2011-09-19 19:03:22 UTC (rev 9050)
@@ -3348,8 +3348,7 @@
 
 // so a CGRect matches exactly what is denoted x,y,w,h for clipping purposes
 CGRect fl_cgrectmake_cocoa(int x, int y, int w, int h) {
-  if (Fl_Surface_Device::surface()->class_name() == Fl_Printer::class_id) return CGRectMake(x-0.5, y-0.5, w, h); 
-  return CGRectMake(x, y, w > 0 ? w - 0.9 : 0, h > 0 ? h - 0.9 : 0);
+  return CGRectMake(x, y, w-1, h-1);
 }
 
 Window fl_xid(const Fl_Window* w)

Modified: branches/branch-1.3/src/fl_rect.cxx
===================================================================
--- branches/branch-1.3/src/fl_rect.cxx	2011-09-18 20:31:08 UTC (rev 9049)
+++ branches/branch-1.3/src/fl_rect.cxx	2011-09-19 19:03:22 UTC (rev 9050)
@@ -188,13 +188,7 @@
   rect.right = x + w; rect.bottom = y + h;
   FillRect(fl_gc, &rect, fl_brush());
 #elif defined(__APPLE_QUARTZ__)
-  CGFloat delta_size =  0.9;
-  CGFloat delta_ori = 0;
-  if (USINGQUARTZPRINTER) {
-    delta_size = 0;
-    delta_ori = 0.5;
-    }
-  CGRect  rect = CGRectMake(x - delta_ori, y - delta_ori, w - delta_size , h - delta_size);
+  CGRect  rect = CGRectMake(x, y, w - 1 , h - 1);
   CGContextFillRect(fl_gc, rect);
 #else
 # error unsupported platform