From 8381f6ab03a00510290711c59e9e886ffbeb0ff2 Mon Sep 17 00:00:00 2001
From: Matthew Flatt <mflatt@racket-lang.org>
Date: Thu, 10 Feb 2005 22:55:37 +0000
Subject: [PATCH] .

original commit: 67edd184335d7bcc25fd00f167cfbd2a2142cb0d
---
 collects/framework/private/frame.ss |  4 ++--
 collects/mred/private/wxpanel.ss    |  2 +-
 notes/mred/HISTORY                  | 15 ++++++++++++++-
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/collects/framework/private/frame.ss b/collects/framework/private/frame.ss
index 6613c0f0..3999fa9b 100644
--- a/collects/framework/private/frame.ss
+++ b/collects/framework/private/frame.ss
@@ -277,7 +277,7 @@
             (let* ([dc (get-dc)]
                    [draw
                     (λ (str bg-color bg-style line-color line-style)
-                      (send dc set-font (send (get-parent) get-label-font))
+                      (send dc set-font normal-control-font)
                       (let-values ([(w h) (get-client-size)]
                                    [(tw th ta td) (send dc get-text-extent str)])
                         (send dc set-pen (send the-pen-list find-or-create-pen line-color 1 line-style))
@@ -294,7 +294,7 @@
 	  (super-new [style '(transparent)])
 
           (let ([dc (get-dc)])
-            (send dc set-font (send (get-parent) get-label-font))
+            (send dc set-font normal-control-font)
             (let-values ([(w1 h1 _1 _2) (send dc get-text-extent locked-message)]
                          [(w2 h2 _3 _4) (send dc get-text-extent unlocked-message)])
               (stretchable-width #f)
diff --git a/collects/mred/private/wxpanel.ss b/collects/mred/private/wxpanel.ss
index 7d3a6c8f..fd615f88 100644
--- a/collects/mred/private/wxpanel.ss
+++ b/collects/mred/private/wxpanel.ss
@@ -55,7 +55,7 @@
 			   2
 			   3))
   (define tab-v-bottom-border (if (memq (system-type) '(macosx macos))
-				  2
+				  0
 				  2))
 
   (define (wx-make-basic-panel% wx:panel% stretch?)
diff --git a/notes/mred/HISTORY b/notes/mred/HISTORY
index 1784f3b7..6c41d85d 100644
--- a/notes/mred/HISTORY
+++ b/notes/mred/HISTORY
@@ -1,4 +1,17 @@
 
+Version 299.31
+Added a font intialization argument for control<%> classes
+Added a font intialization argument for popup-menu%
+Added a label-font intialization argument for list-box%
+Removed get-label-font, get-button-font, set-label-font, 
+ set-button-front, get-label-position, and set-label-position
+ from area-container<%> and implementing classes
+Added get-font to classes with a font initalization argument
+Added normal-control-font, small-control-font, tiny-control-font,
+ and view-control-font
+Added a default callback procedure for every control<%> class
+ that has a callback
+
 Version 299.29
 Changed the default mapping for the 'default font in PostScript
  from Times to Helvetica
@@ -153,7 +166,7 @@ Added >> and << from the editor-stream classes,
 Changed the font% constructor so that weight and style
  arguments are optional
 Added screen-glyph-exists? to font% and glyph-exists to dc<%>
-Removed get-afm-path and set-afm-path from ps-setup%
+Removed get-afm-path and set-afm-path from ps-setup%;
  use the PLTAFMDIR environment variable or the
  current-ps-afm-file-paths parameter, instead