frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

xquartz: Remove some dead code for compatibility with older nibs 

Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
This commit is contained in:
Jeremy Huddleston Sequoia 2021-02-17 20:55:06 -08:00
parent 72a39dccf9
commit 318f8a4a8a
2 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hw/xquartz/X11Controller.h
View File

@ -72,12 +72,6 @@
IBOutlet NSTextField *sync_text2; IBOutlet NSTextField *sync_text2;
IBOutlet NSPopUpButton *depth; IBOutlet NSPopUpButton *depth;
IBOutlet NSMenuItem *window_separator;
// window_separator is DEPRECATED due to this radar:
// <rdar://problem/7088335> NSApplication releases the separator in the Windows menu even though it's an IBOutlet
// It is kept around for localization compatibility and is subject to removal "eventually"
// If it is !NULL (meaning it is in the nib), it is removed from the menu and released
IBOutlet NSMenuItem *x11_about_item; IBOutlet NSMenuItem *x11_about_item;
IBOutlet NSMenuItem *dock_window_separator; IBOutlet NSMenuItem *dock_window_separator;
IBOutlet NSMenuItem *apps_separator; IBOutlet NSMenuItem *apps_separator;

6
hw/xquartz/X11Controller.m
View File

@ -104,12 +104,6 @@ extern char *bundle_id_prefix;
name: NSWindowWillCloseNotification name: NSWindowWillCloseNotification
object: [apps_table window]]; object: [apps_table window]];
// Setup data about our Windows menu
if (window_separator) {
[[window_separator menu] removeItem:window_separator];
window_separator = nil;
}
windows_menu_start = [[X11App windowsMenu] numberOfItems]; windows_menu_start = [[X11App windowsMenu] numberOfItems];
} }