Mac OS: improve multi-line text support for button%

Related to #163

Author: mflatt

gui-doc/scribblings/gui/button-class.scrbl

@@ -17,7 +17,7 @@ Whenever a button is clicked by the user, the button's callback
                  [parent (or/c (is-a?/c frame%) (is-a?/c dialog%) 
                                (is-a?/c panel%) (is-a?/c pane%))]
                  [callback ((is-a?/c button%) (is-a?/c control-event%) . -> . any) (lambda (b e) (void))]
-                 [style (listof (or/c 'border 'deleted)) null]
+                 [style (listof (or/c 'border 'multi-line 'deleted)) null]
                  [font (is-a?/c font%) normal-control-font]
                  [enabled any/c #t]
                  [vert-margin spacing-integer? 2]
@@ -59,9 +59,17 @@ The @racket[callback] procedure is called (with the event type
 If @racket[style] includes @racket['border], the button is drawn with
 a special border that indicates to the user that it is the default
 action button (see @method[top-level-window<%>
-on-traverse-char]). @DeletedStyleNote[@racket[style] @racket[parent]]{button}
+on-traverse-char]). If @racket[style] includes @racket['multi-line],
+the button is drawn in a way that can stretch vertically and accommodate
+multiple lines in a text label; currently, this style makes a difference only
+on Mac OS, and it is selected automatically when @racket[label] is a string
+that contains @racket[#\newline] or @racket[#\return].
+@DeletedStyleNote[@racket[style] @racket[parent]]{button}
 
-@FontKWs[@racket[font]] @WindowKWs[@racket[enabled]] @SubareaKWs[] @AreaKWs[]}
+@FontKWs[@racket[font]] @WindowKWs[@racket[enabled]] @SubareaKWs[] @AreaKWs[]
+
+@history[#:changed "1.47" @elem{Added the @racket['multi-line] style, and made it
+                                selected when @racket[label] contains @racket[#\return].}]}
 
 
 @defmethod[#:mode override

gui-lib/info.rkt

@@ -31,4 +31,4 @@
 
 (define pkg-authors '(mflatt robby))
 
-(define version "1.46")
+(define version "1.47")

gui-lib/mred/private/mritem.rkt

@@ -243,7 +243,7 @@
       (check-label-string-or-bitmap-or-both cwho label)
       (check-container-parent cwho parent)
       (check-callback cwho callback)
-      (check-style cwho #f '(border deleted) style)
+      (check-style cwho #f '(border multi-line deleted) style)
       (check-font cwho font))
     (as-entry
      (lambda ()

gui-lib/mred/private/wx/cocoa/button.rkt

@@ -53,8 +53,9 @@
       (when button-type
         (tellv cocoa setButtonType: #:type _int button-type))
       (unless button-type
-        (tellv cocoa setBezelStyle: #:type _int (if (or (not (string? label))
-                                                        (regexp-match? #rx"\n" label))
+        (tellv cocoa setBezelStyle: #:type _int (if (or (memq 'multi-line style)
+                                                        (not (string? label))
+                                                        (regexp-match? #rx"[\n\r]" label))
                                                     NSRegularSquareBezelStyle
                                                     NSRoundedBezelStyle)))
       (cond