summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston Sequoia <jeremyhu@apple.com>2021-02-17 20:55:06 -0800
committerJeremy Huddleston Sequoia <jeremyhu@apple.com>2021-02-18 22:32:14 -0800
commit318f8a4a8a47a0ce4bbbf4290469e933602c9b30 (patch)
tree533f28fd80886e83b4aa02d03818a4b4442cbfd7
parent72a39dccf99191fbfbb4b399c446fd017d55f24e (diff)
xquartz: Remove some dead code for compatibility with older nibs
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
-rw-r--r--hw/xquartz/X11Controller.h6
-rw-r--r--hw/xquartz/X11Controller.m6
2 files changed, 0 insertions, 12 deletions
diff --git a/hw/xquartz/X11Controller.h b/hw/xquartz/X11Controller.h
index 29008c593..139b035c4 100644
--- a/hw/xquartz/X11Controller.h
+++ b/hw/xquartz/X11Controller.h
@@ -72,12 +72,6 @@
IBOutlet NSTextField *sync_text2;
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 *dock_window_separator;
IBOutlet NSMenuItem *apps_separator;
diff --git a/hw/xquartz/X11Controller.m b/hw/xquartz/X11Controller.m
index ad7a7871e..abef8156a 100644
--- a/hw/xquartz/X11Controller.m
+++ b/hw/xquartz/X11Controller.m
@@ -104,12 +104,6 @@ extern char *bundle_id_prefix;
name: NSWindowWillCloseNotification
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];
}