aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Third2020-01-14 21:36:14 +0000
committerAlan Third2020-01-24 09:55:55 +0000
commit0bed550e210b2dfe898a0755592db5747fb3da37 (patch)
tree1ecec907729aaf52746abbc86314d9a82694244a
parenta0336029db597a7fa7f22c463f90e1135c2b8da0 (diff)
downloademacs-0bed550e210b2dfe898a0755592db5747fb3da37.tar.gz
emacs-0bed550e210b2dfe898a0755592db5747fb3da37.zip
Remove EmacsOpenPanel and EmacsSavePanel (bug#38031)
-rw-r--r--src/nsfns.m25
-rw-r--r--src/nsterm.h16
2 files changed, 1 insertions, 40 deletions
diff --git a/src/nsfns.m b/src/nsfns.m
index 93d5a1e9488..0f879fe390c 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. */)
1622 dirS = [dirS stringByExpandingTildeInPath]; 1622 dirS = [dirS stringByExpandingTildeInPath];
1623 1623
1624 panel = isSave ? 1624 panel = isSave ?
1625 (id)[EmacsSavePanel savePanel] : (id)[EmacsOpenPanel openPanel]; 1625 (id)[NSSavePanel savePanel] : (id)[NSOpenPanel openPanel];
1626 1626
1627 [panel setTitle: promptS]; 1627 [panel setTitle: promptS];
1628 1628
@@ -3077,29 +3077,6 @@ handlePanelKeys (NSSavePanel *panel, NSEvent *theEvent)
3077 return ret; 3077 return ret;
3078} 3078}
3079 3079
3080@implementation EmacsSavePanel
3081- (BOOL)performKeyEquivalent:(NSEvent *)theEvent
3082{
3083 BOOL ret = handlePanelKeys (self, theEvent);
3084 if (! ret)
3085 ret = [super performKeyEquivalent:theEvent];
3086 return ret;
3087}
3088@end
3089
3090
3091@implementation EmacsOpenPanel
3092- (BOOL)performKeyEquivalent:(NSEvent *)theEvent
3093{
3094 // NSOpenPanel inherits NSSavePanel, so passing self is OK.
3095 BOOL ret = handlePanelKeys (self, theEvent);
3096 if (! ret)
3097 ret = [super performKeyEquivalent:theEvent];
3098 return ret;
3099}
3100@end
3101
3102
3103@implementation EmacsFileDelegate 3080@implementation EmacsFileDelegate
3104/* -------------------------------------------------------------------------- 3081/* --------------------------------------------------------------------------
3105 Delegate methods for Open/Save panels 3082 Delegate methods for Open/Save panels
diff --git a/src/nsterm.h b/src/nsterm.h
index fb9ac1b462c..f68c3246a70 100644
--- a/src/nsterm.h
+++ b/src/nsterm.h
@@ -595,22 +595,6 @@ typedef id instancetype;
595@end 595@end
596 596
597 597
598/* ==========================================================================
599
600 File open/save panels
601 This and next override methods to handle keyboard input in panels.
602
603 ========================================================================== */
604
605@interface EmacsSavePanel : NSSavePanel
606{
607}
608@end
609@interface EmacsOpenPanel : NSOpenPanel
610{
611}
612@end
613
614@interface EmacsFileDelegate : NSObject 598@interface EmacsFileDelegate : NSObject
615{ 599{
616} 600}