[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
emacs-27 0bed550: Remove EmacsOpenPanel and EmacsSavePanel (bug#38031)
From: |
Alan Third |
Subject: |
emacs-27 0bed550: Remove EmacsOpenPanel and EmacsSavePanel (bug#38031) |
Date: |
Fri, 24 Jan 2020 04:59:28 -0500 (EST) |
branch: emacs-27
commit 0bed550e210b2dfe898a0755592db5747fb3da37
Author: Alan Third <address@hidden>
Commit: Alan Third <address@hidden>
Remove EmacsOpenPanel and EmacsSavePanel (bug#38031)
---
src/nsfns.m | 25 +------------------------
src/nsterm.h | 16 ----------------
2 files changed, 1 insertion(+), 40 deletions(-)
diff --git a/src/nsfns.m b/src/nsfns.m
index 93d5a1e..0f879fe 100644
--- a/src/nsfns.m
+++ b/src/nsfns.m
@@ -1622,7 +1622,7 @@ Optional arg DIR_ONLY_P, if non-nil, means choose only
directories. */)
dirS = [dirS stringByExpandingTildeInPath];
panel = isSave ?
- (id)[EmacsSavePanel savePanel] : (id)[EmacsOpenPanel openPanel];
+ (id)[NSSavePanel savePanel] : (id)[NSOpenPanel openPanel];
[panel setTitle: promptS];
@@ -3077,29 +3077,6 @@ handlePanelKeys (NSSavePanel *panel, NSEvent *theEvent)
return ret;
}
-@implementation EmacsSavePanel
-- (BOOL)performKeyEquivalent:(NSEvent *)theEvent
-{
- BOOL ret = handlePanelKeys (self, theEvent);
- if (! ret)
- ret = [super performKeyEquivalent:theEvent];
- return ret;
-}
-@end
-
-
-@implementation EmacsOpenPanel
-- (BOOL)performKeyEquivalent:(NSEvent *)theEvent
-{
- // NSOpenPanel inherits NSSavePanel, so passing self is OK.
- BOOL ret = handlePanelKeys (self, theEvent);
- if (! ret)
- ret = [super performKeyEquivalent:theEvent];
- return ret;
-}
-@end
-
-
@implementation EmacsFileDelegate
/* --------------------------------------------------------------------------
Delegate methods for Open/Save panels
diff --git a/src/nsterm.h b/src/nsterm.h
index fb9ac1b..f68c324 100644
--- a/src/nsterm.h
+++ b/src/nsterm.h
@@ -595,22 +595,6 @@ typedef id instancetype;
@end
-/* ==========================================================================
-
- File open/save panels
- This and next override methods to handle keyboard input in panels.
-
- ==========================================================================
*/
-
-@interface EmacsSavePanel : NSSavePanel
-{
-}
-@end
-@interface EmacsOpenPanel : NSOpenPanel
-{
-}
-@end
-
@interface EmacsFileDelegate : NSObject
{
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- emacs-27 0bed550: Remove EmacsOpenPanel and EmacsSavePanel (bug#38031),
Alan Third <=