diff options
| author | Alan Third <alan@idiocy.org> | 2020-01-14 21:36:14 +0000 |
|---|---|---|
| committer | Alan Third <alan@idiocy.org> | 2020-01-24 09:55:55 +0000 |
| commit | 0bed550e210b2dfe898a0755592db5747fb3da37 (patch) | |
| tree | 1ecec907729aaf52746abbc86314d9a82694244a /src | |
| parent | a0336029db597a7fa7f22c463f90e1135c2b8da0 (diff) | |
Remove EmacsOpenPanel and EmacsSavePanel (bug#38031)
Diffstat (limited to 'src')
| -rw-r--r-- | src/nsfns.m | 25 | ||||
| -rw-r--r-- | src/nsterm.h | 16 |
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. */) 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 fb9ac1b462c..f68c3246a70 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 { } |
