From df6be6e7f189294c0fa31139549b14f69e1cd427 Mon Sep 17 00:00:00 2001 From: Robby Findler Date: Tue, 17 May 2011 10:14:02 -0500 Subject: [PATCH] Adjust the menubar sizing code to explicitly take into account the size of the dummy menu item that was added. related to PR 11926 related to PR 11893 related to PR 11623 related to PR 11917 --- collects/mred/private/wx/gtk/menu-bar.rkt | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/collects/mred/private/wx/gtk/menu-bar.rkt b/collects/mred/private/wx/gtk/menu-bar.rkt index 29168c81cc..90b0a8b907 100644 --- a/collects/mred/private/wx/gtk/menu-bar.rkt +++ b/collects/mred/private/wx/gtk/menu-bar.rkt @@ -92,15 +92,17 @@ ;; return initial size; also, add a menu to make sure there is one, ;; and force the menu bar to be at least that tall always (atomically - (let ([item (gtk_menu_item_new_with_mnemonic "Xyz")]) - (gtk_menu_shell_append gtk item) - (gtk_widget_show item) - (begin0 - (let ([req (make-GtkRequisition 0 0)]) - (gtk_widget_size_request gtk req) - (gtk_widget_set_usize gtk -1 (GtkRequisition-height req)) - (GtkRequisition-height req)) - (gtk_container_remove gtk item))))) + (define item (gtk_menu_item_new_with_mnemonic "Xyz")) + (gtk_menu_shell_append gtk item) + (gtk_widget_show item) + (define req (make-GtkRequisition 0 0)) + (gtk_widget_size_request item req) + (define item-height (GtkRequisition-height req)) + (gtk_widget_size_request gtk req) + (define height (max (GtkRequisition-height req) item-height)) + (gtk_widget_set_usize gtk -1 height) + (gtk_container_remove gtk item) + height)) (define/public (get-top-window) top-wx)