[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 1c5208b 2/2: Fix GNUstep warnings
From: |
Alan Third |
Subject: |
master 1c5208b 2/2: Fix GNUstep warnings |
Date: |
Fri, 1 Jan 2021 17:54:39 -0500 (EST) |
branch: master
commit 1c5208ba71156d225b54592e5e36788748f48ade
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 | 3 ---
src/nsterm.h | 3 ++-
src/nsterm.m | 4 +---
3 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/src/nsmenu.m b/src/nsmenu.m
index 2e0b2c1..9b56958 100644
--- a/src/nsmenu.m
+++ b/src/nsmenu.m
@@ -956,15 +956,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 9d3ac75..3fb6449 100644
--- a/src/nsterm.h
+++ b/src/nsterm.h
@@ -705,7 +705,7 @@ typedef id instancetype;
+ (CGFloat)scrollerWidth;
@end
-
+#ifdef NS_DRAW_TO_BUFFER
@interface EmacsSurface : NSObject
{
NSMutableArray *cache;
@@ -722,6 +722,7 @@ typedef id instancetype;
- (void) releaseContext;
- (IOSurfaceRef) getSurface;
@end
+#endif
/* ==========================================================================
diff --git a/src/nsterm.m b/src/nsterm.m
index e0db204..a4ee147 100644
--- a/src/nsterm.m
+++ b/src/nsterm.m
@@ -5080,15 +5080,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];
}
}