emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

scratch/ns/performance 231ef52 4/4: Fix GNUstep warnings


From: Alan Third
Subject: scratch/ns/performance 231ef52 4/4: Fix GNUstep warnings
Date: Sun, 20 Dec 2020 05:47:52 -0500 (EST)

branch: scratch/ns/performance
commit 231ef5250485c56ab94810563357994e54e6e3a6
Author: Alan Third <alan@idiocy.org>
Commit: Alan Third <alan@idiocy.org>

    Fix GNUstep warnings
    
    * src/nsterm.h: EmacsSurface is only required if NS_DRAW_TO_BUFFER is
    defined.
    * src/nsterm.m (ns_judge_scroll_bars): Remove unused variable.
    * src/nsmenu.m (update_frame_tool_bar):
    (ns_update_menubar): Remove unused variables.
---
 src/nsmenu.m | 4 ----
 src/nsterm.h | 3 ++-
 src/nsterm.m | 4 +---
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/nsmenu.m b/src/nsmenu.m
index a286a80..b16169a 100644
--- a/src/nsmenu.m
+++ b/src/nsmenu.m
@@ -100,7 +100,6 @@ popup_activated (void)
 static void
 ns_update_menubar (struct frame *f, bool deep_p, EmacsMenu *submenu)
 {
-  NSAutoreleasePool *pool;
   id menu = [NSApp mainMenu];
   static EmacsMenu *last_submenu = nil;
   BOOL needsSet = NO;
@@ -1022,15 +1021,12 @@ update_frame_tool_bar (struct frame *f)
   int i, k = 0;
   EmacsView *view = FRAME_NS_VIEW (f);
   EmacsToolbar *toolbar = [view toolbar];
-  int oldh;
 
   NSTRACE ("update_frame_tool_bar");
 
   if (view == nil || toolbar == nil) return;
   block_input ();
 
-  oldh = FRAME_TOOLBAR_HEIGHT (f);
-
 #ifdef NS_IMPL_COCOA
   [toolbar clearActive];
 #else
diff --git a/src/nsterm.h b/src/nsterm.h
index 38fc2dc..1f03c4f 100644
--- a/src/nsterm.h
+++ b/src/nsterm.h
@@ -712,7 +712,7 @@ typedef id instancetype;
 + (CGFloat)scrollerWidth;
 @end
 
-
+#ifdef NS_DRAW_TO_BUFFER
 @interface EmacsSurface : NSObject
 {
   NSMutableArray *cache;
@@ -729,6 +729,7 @@ typedef id instancetype;
 - (void) releaseContext;
 - (IOSurfaceRef) getSurface;
 @end
+#endif
 
 
 /* ==========================================================================
diff --git a/src/nsterm.m b/src/nsterm.m
index 33527d5..c3ced6b 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -5170,15 +5170,13 @@ ns_judge_scroll_bars (struct frame *f)
   id view;
   EmacsView *eview = FRAME_NS_VIEW (f);
   NSArray *subviews = [[eview superview] subviews];
-  BOOL removed = NO;
 
   NSTRACE ("ns_judge_scroll_bars");
   for (i = [subviews count]-1; i >= 0; --i)
     {
       view = [subviews objectAtIndex: i];
       if (![view isKindOfClass: [EmacsScroller class]]) continue;
-      if ([view judge])
-        removed = YES;
+      [view judge];
     }
 }
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]