From 171858add12c3f801b08beba6f32025283d477d7 Mon Sep 17 00:00:00 2001 From: Robby Findler Date: Fri, 2 Sep 2011 08:57:28 -0500 Subject: [PATCH] wrong check for the result of system-type --- collects/drracket/private/unit.rkt | 6 +++--- collects/framework/private/standard-menus-items.rkt | 2 +- collects/framework/private/standard-menus.rkt | 2 +- collects/scribblings/framework/standard-menus.scrbl | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/collects/drracket/private/unit.rkt b/collects/drracket/private/unit.rkt index cc1d82c19d..4e0c5e5fa0 100644 --- a/collects/drracket/private/unit.rkt +++ b/collects/drracket/private/unit.rkt @@ -2984,7 +2984,7 @@ module browser threading seems wrong. (define/private (update-close-menu-item-shortcut item) (cond - [(eq? (system-type) 'linux) + [(eq? (system-type) 'unix) (send item set-label (string-constant close-menu-item))] [else (define just-one? (and (pair? tabs) (null? (cdr tabs)))) @@ -2998,7 +2998,7 @@ module browser threading seems wrong. (define/override (file-menu:close-callback item control) (define just-one? (and (pair? tabs) (null? (cdr tabs)))) - (if (and (eq? (system-type) 'linux) + (if (and (eq? (system-type) 'unix) (not just-one?)) (close-current-tab) (super file-menu:close-callback item control))) @@ -3342,7 +3342,7 @@ module browser threading seems wrong. (make-object separator-menu-item% file-menu))] (define close-tab-menu-item #f) (define/override (file-menu:between-close-and-quit file-menu) - (unless (eq? (system-type) 'linux) + (unless (eq? (system-type) 'unix) (set! close-tab-menu-item (new (get-menu-item%) (label (string-constant close-tab)) diff --git a/collects/framework/private/standard-menus-items.rkt b/collects/framework/private/standard-menus-items.rkt index fa1abca2a6..10fbca7b56 100644 --- a/collects/framework/private/standard-menus-items.rkt +++ b/collects/framework/private/standard-menus-items.rkt @@ -265,7 +265,7 @@ '(λ (item control) (when (can-close?) (on-close) (show #f)) #t) #\w '(get-default-shortcut-prefix) - '(if (eq? (system-type) 'linux) + '(if (eq? (system-type) 'unix) (string-constant close-menu-item) (string-constant close-window-menu-item)) on-demand-do-nothing diff --git a/collects/framework/private/standard-menus.rkt b/collects/framework/private/standard-menus.rkt index 0daadbb1cd..9e9a48b7c6 100644 --- a/collects/framework/private/standard-menus.rkt +++ b/collects/framework/private/standard-menus.rkt @@ -274,7 +274,7 @@ (define/public (file-menu:get-close-item) file-menu:close-item) (define/public (file-menu:close-string) - (if (eq? (system-type) 'linux) + (if (eq? (system-type) 'unix) (string-constant close-menu-item) (string-constant close-window-menu-item))) (define/public (file-menu:close-help-string) (string-constant close-info)) diff --git a/collects/scribblings/framework/standard-menus.scrbl b/collects/scribblings/framework/standard-menus.scrbl index e0f22dd621..247a4cdb26 100644 --- a/collects/scribblings/framework/standard-menus.scrbl +++ b/collects/scribblings/framework/standard-menus.scrbl @@ -118,7 +118,7 @@ @(defmethod (file-menu:close-on-demand (menu-item (is-a?/c menu-item%))) void? "The menu item's on-demand proc calls this method." "\n" "\n" "Defaults to " (racketblock (void))) -@(defmethod (file-menu:close-string) string? "The result of this method is used as the name of the " (racket menu-item%) "." "\n" "\n" "Defaults to " (racket (if (eq? (system-type) (quote linux)) (string-constant close-menu-item) (string-constant close-window-menu-item))) ".") +@(defmethod (file-menu:close-string) string? "The result of this method is used as the name of the " (racket menu-item%) "." "\n" "\n" "Defaults to " (racket (if (eq? (system-type) (quote unix)) (string-constant close-menu-item) (string-constant close-window-menu-item))) ".") @(defmethod (file-menu:close-help-string) string? "The result of this method is used as the help string" "\n" "when the " (racket menu-item%) " object is created." "\n" "\n" "Defaults to " (racket (string-constant close-info)) ".")