[Emacs-diffs] Changes to emacs/src/Attic/macterm.c, v [EMACS_22_BASE]

[YAMAMOTO Mitsuharu]

CVSROOT:        /sources/emacs
Module name:    emacs
Branch:         EMACS_22_BASE
Changes by:     YAMAMOTO Mitsuharu <mituharu>   08/09/02 08:19:08

Index: macterm.c
===================================================================
RCS file: /sources/emacs/emacs/src/Attic/macterm.c,v
retrieving revision 1.214.2.30
retrieving revision 1.214.2.31
diff -u -b -r1.214.2.30 -r1.214.2.31
--- macterm.c   30 Aug 2008 08:38:14 -0000      1.214.2.30
+++ macterm.c   2 Sep 2008 08:19:06 -0000       1.214.2.31
@@ -476,16 +476,13 @@
      unsigned int width, height;
 {
 #if USE_CG_DRAWING
-    {
       CGContextRef context;
 
       context = mac_begin_cg_clip (f, gc);
       CG_SET_FILL_COLOR_WITH_GC_BACKGROUND (context, gc);
       CGContextFillRect (context, mac_rect_make (f, x, y, width, height));
       mac_end_cg_clip (f);
-    }
 #else
-    {
       Rect r;
 
       mac_begin_clip (f, gc);
@@ -494,7 +491,6 @@
       EraseRect (&r);
       RGBBackColor (GC_BACK_COLOR (FRAME_NORMAL_GC (f)));
       mac_end_clip (f, gc);
-    }
 #endif
 }
 
@@ -517,7 +513,6 @@
      struct frame *f;
 {
 #if USE_CG_DRAWING
-  {
     CGContextRef context;
     GC gc = FRAME_NORMAL_GC (f);
 
@@ -526,7 +521,6 @@
     CGContextFillRect (context, CGRectMake (0, 0, FRAME_PIXEL_WIDTH (f),
                                            FRAME_PIXEL_HEIGHT (f)));
     mac_end_cg_clip (f);
-  }
 #else  /* !USE_CG_DRAWING */
   mac_begin_clip (f, NULL);
   RGBBackColor (GC_BACK_COLOR (FRAME_NORMAL_GC (f)));
@@ -840,11 +834,12 @@
 {
 #if USE_CG_DRAWING
   CGContextRef context;
+  CGRect rect;
 
   context = mac_begin_cg_clip (f, gc);
   CG_SET_STROKE_COLOR_WITH_GC_FOREGROUND (context, gc);
-  CGContextStrokeRect (context,
-                      CGRectMake (x + 0.5f, y + 0.5f, width, height));
+  rect = mac_rect_make (f, x, y, width + 1, height + 1);
+  CGContextStrokeRect (context, CGRectInset (rect, 0.5f, 0.5f));
   mac_end_cg_clip (f);
 #else
   Rect r;