[Emacs-diffs] ns-drawing ef1abd9 3/4: Cleanup ns_update_begin

[Alan Third]

branch: ns-drawing
commit ef1abd99fafc9177058438cdf84776441ce62fc5
Author: Alan Third <address@hidden>
Commit: Alan Third <address@hidden>

    Cleanup ns_update_begin
    
    * src/nsterm.m (ns_update_begin): This function no longer does
    anything under GNUstep, so unify all the #ifdefs.
---
 src/nsterm.m | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/nsterm.m b/src/nsterm.m
index ec58ecc..43766e2 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -279,9 +279,6 @@ long context_menu_value = 0;
 
 /* display update */
 static int ns_window_num = 0;
-#ifdef NS_IMPL_GNUSTEP
-static NSRect uRect;            // TODO: This is dead, remove it?
-#endif
 static BOOL gsaved = NO;
 static BOOL ns_fake_keydown = NO;
 #ifdef NS_IMPL_COCOA
@@ -1091,12 +1088,13 @@ ns_update_begin (struct frame *f)
    external (RIF) call; whole frame, called before update_window_begin
    -------------------------------------------------------------------------- 
*/
 {
+#ifdef NS_IMPL_COCOA
   EmacsView *view = FRAME_NS_VIEW (f);
+
   NSTRACE_WHEN (NSTRACE_GROUP_UPDATES, "ns_update_begin");
 
   ns_update_auto_hide_menu_bar ();
 
-#ifdef NS_IMPL_COCOA
   if ([view isFullscreen] && [view fsIsNative])
   {
     // Fix reappearing tool bar in fullscreen for Mac OS X 10.7
@@ -1105,14 +1103,12 @@ ns_update_begin (struct frame *f)
     if (! tbar_visible != ! [toolbar isVisible])
       [toolbar setVisible: tbar_visible];
   }
-#endif
 
   /* drawRect may have been called for say the minibuffer, and then clip path
      is for the minibuffer.  But the display engine may draw more because
      we have set the frame as garbaged.  So reset clip path to the whole
      view.  */
   /* FIXME: I don't think we need to do this.  */
-#ifdef NS_IMPL_COCOA
   if ([NSView focusView] == FRAME_NS_VIEW (f))
     {
       NSBezierPath *bp;
@@ -1131,10 +1127,6 @@ ns_update_begin (struct frame *f)
         }
     }
 #endif
-
-#ifdef NS_IMPL_GNUSTEP
-  uRect = NSMakeRect (0, 0, 0, 0);
-#endif
 }