Skip to content

Commit 0bed550

Browse files
committed
Remove EmacsOpenPanel and EmacsSavePanel (bug#38031)
1 parent a033602 commit 0bed550

File tree

2 files changed

+1
-40
lines changed

2 files changed

+1
-40
lines changed

src/nsfns.m

Lines changed: 1 addition & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1622,7 +1622,7 @@ Frames are listed from topmost (first) to bottommost (last). */)
16221622
dirS = [dirS stringByExpandingTildeInPath];
16231623

16241624
panel = isSave ?
1625-
(id)[EmacsSavePanel savePanel] : (id)[EmacsOpenPanel openPanel];
1625+
(id)[NSSavePanel savePanel] : (id)[NSOpenPanel openPanel];
16261626

16271627
[panel setTitle: promptS];
16281628

@@ -3077,29 +3077,6 @@ The position is returned as a cons cell (X . Y) of the
30773077
return ret;
30783078
}
30793079

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-
31033080
@implementation EmacsFileDelegate
31043081
/* --------------------------------------------------------------------------
31053082
Delegate methods for Open/Save panels

src/nsterm.h

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -595,22 +595,6 @@ typedef id instancetype;
595595
@end
596596

597597

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-
614598
@interface EmacsFileDelegate : NSObject
615599
{
616600
}

0 commit comments

Comments
 (0)