suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

wrong check for the result of system-type

Browse Source
This commit is contained in:
Robby Findler 2011-09-02 08:57:28 -05:00
parent d857385797
commit 171858add1
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
collects/drracket/private/unit.rkt
View File

@ -2984,7 +2984,7 @@ module browser threading seems wrong.
(define/private (update-close-menu-item-shortcut item) (define/private (update-close-menu-item-shortcut item)
(cond (cond
[(eq? (system-type) 'linux) [(eq? (system-type) 'unix)
(send item set-label (string-constant close-menu-item))] (send item set-label (string-constant close-menu-item))]
[else [else
(define just-one? (and (pair? tabs) (null? (cdr tabs)))) (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/override (file-menu:close-callback item control)
(define just-one? (and (pair? tabs) (null? (cdr tabs)))) (define just-one? (and (pair? tabs) (null? (cdr tabs))))
(if (and (eq? (system-type) 'linux) (if (and (eq? (system-type) 'unix)
(not just-one?)) (not just-one?))
(close-current-tab) (close-current-tab)
(super file-menu:close-callback item control))) (super file-menu:close-callback item control)))
@ -3342,7 +3342,7 @@ module browser threading seems wrong.
(make-object separator-menu-item% file-menu))] (make-object separator-menu-item% file-menu))]
(define close-tab-menu-item #f) (define close-tab-menu-item #f)
(define/override (file-menu:between-close-and-quit file-menu) (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 (set! close-tab-menu-item
(new (get-menu-item%) (new (get-menu-item%)
(label (string-constant close-tab)) (label (string-constant close-tab))

2
collects/framework/private/standard-menus-items.rkt
View File

@ -265,7 +265,7 @@
'(λ (item control) (when (can-close?) (on-close) (show #f)) #t) '(λ (item control) (when (can-close?) (on-close) (show #f)) #t)
#\w #\w
'(get-default-shortcut-prefix) '(get-default-shortcut-prefix)
'(if (eq? (system-type) 'linux) '(if (eq? (system-type) 'unix)
(string-constant close-menu-item) (string-constant close-menu-item)
(string-constant close-window-menu-item)) (string-constant close-window-menu-item))
on-demand-do-nothing on-demand-do-nothing

2
collects/framework/private/standard-menus.rkt
View File

@ -274,7 +274,7 @@
(define/public (file-menu:get-close-item) file-menu:close-item) (define/public (file-menu:get-close-item) file-menu:close-item)
(define/public (define/public
(file-menu:close-string) (file-menu:close-string)
(if (eq? (system-type) 'linux) (if (eq? (system-type) 'unix)
(string-constant close-menu-item) (string-constant close-menu-item)
(string-constant close-window-menu-item))) (string-constant close-window-menu-item)))
(define/public (file-menu:close-help-string) (string-constant close-info)) (define/public (file-menu:close-help-string) (string-constant close-info))

2
collects/scribblings/framework/standard-menus.scrbl
View File

@ -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-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)) ".") @(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)) ".")