From d0cfc34a77c23c8b5fd61b341dc6c446c3deae96 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Mon, 4 Feb 2013 19:28:37 -0700 Subject: [PATCH] racket/gui/base: fix `menu-bar%' `get-frame' to return 'root Return 'root istead of exposing the (hidden) root frame for a menu bar that is shown when no frames are visible. --- collects/mred/private/mrmenu.rkt | 2 +- collects/scribblings/gui/menu-bar-class.scrbl | 5 +++-- doc/release-notes/racket/HISTORY.txt | 4 +++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/collects/mred/private/mrmenu.rkt b/collects/mred/private/mrmenu.rkt index 967c7cf73e..018a648df2 100644 --- a/collects/mred/private/mrmenu.rkt +++ b/collects/mred/private/mrmenu.rkt @@ -441,7 +441,7 @@ (define wx-parent #f) (define shown? #f) (public* - [get-frame (lambda () prnt)] + [get-frame (lambda () (if (eq? root-menu-frame prnt) 'root prnt))] [get-items (entry-point (lambda () (send wx get-items)))] [enable (entry-point (lambda (on?) (send wx enable-all on?)))] [is-enabled? (entry-point (lambda () (send wx all-enabled?)))] diff --git a/collects/scribblings/gui/menu-bar-class.scrbl b/collects/scribblings/gui/menu-bar-class.scrbl index 66a420ee04..5349195beb 100644 --- a/collects/scribblings/gui/menu-bar-class.scrbl +++ b/collects/scribblings/gui/menu-bar-class.scrbl @@ -41,9 +41,10 @@ Enables or disables the menu bar (i.e., all of its menus). Each @defmethod[(get-frame) - (is-a?/c frame%)]{ + (or/c (is-a?/c frame%) 'root)]{ -Returns the menu bar's frame. +Returns the menu bar's frame, or returns @racket['root] if the menu +bar is shown when no other frames are shown. } diff --git a/doc/release-notes/racket/HISTORY.txt b/doc/release-notes/racket/HISTORY.txt index c2bb553203..76c885d797 100644 --- a/doc/release-notes/racket/HISTORY.txt +++ b/doc/release-notes/racket/HISTORY.txt @@ -1,9 +1,11 @@ -Version 5.3.2.2 +Version 5.3.2.3 Added extflonums racket/extflonum: added racket/unsafe/ops: added extflonum operations racket/date: changed current-date to provide nanoseconds, added date*->seconds +racket/gui/base: changed menu-bar% get-frame method to + return 'root for root menu bar Version 5.3.2.2 Added file-truncate