Mac OS: repairs for enable state, menus, and tab panels

Make sure a control added to a disabled window starts out disabled.

Fix renaming of menus in a menu bar.

Put tab-panel content properly in the containing view, and make
disabling a tab-panel control work for Tahoe.

Author: mflatt

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

@@ -61,6 +61,7 @@
 
   (define/override (enable on?) (void))
   (define/override (is-window-enabled?) #t)
+  (define/override (is-enabled-to-root?) #t)
 
   (define/public (get-range)
     (inexact->exact (floor (tell #:type _double cocoa maxValue))))

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

@@ -34,7 +34,8 @@
 
 (defclass item% window%
   (inherit get-cocoa
-           is-window-enabled?)
+           is-window-enabled?
+           is-enabled-to-root?)
 
   (init-field callback)
 
@@ -54,5 +55,8 @@
   (def/public-unimplemented get-label)
   (super-new)
 
+  (unless (is-enabled-to-root?)
+    (tellv (get-cocoa-control) setEnabled: #:type _BOOL #false))
+
   (define/public (init-font cocoa font)
     (install-control-font cocoa font)))

gui-lib/mred/private/wx/cocoa/menu-bar.rkt

@@ -203,7 +203,7 @@
                    (list (cons (car i) (cons str (cddr i)))))
                  (drop menus (add1 pos))))
     (when (eq? current-mb this)
-      (tellv (tell cocoa-mb itemAtIndex: #:type _NSInteger 1)
+      (tellv (tell (tell cocoa-mb itemAtIndex: #:type _NSInteger 1) submenu)
              setTitle: #:type _NSString (clean-menu-label str))))
 
   (define/public (do-on-menu-click)

gui-lib/mred/private/wx/cocoa/tab-panel.rkt

@@ -43,7 +43,7 @@
 (define NSDefaultControlTint 0)
 (define NSClearControlTint 7)
 
-(import-class NSView NSTabView NSTabViewItem)
+(import-class NSView NSTabView NSTabViewItem NSSegmentedControl)
 (define TabBarControl
   (cond
     [(not tab-ok?) #f]
@@ -126,6 +126,7 @@
         labels)
   (inherit get-cocoa register-as-child
            is-window-enabled?
+           is-enabled-to-root?
            block-mouse-events
            refresh)
 
@@ -168,11 +169,17 @@
              (tellv i setResizeTabsToFitTotalWidth: #:type _BOOL #t))
            i)))
 
+  (define content-cocoa
+    (as-objc-allocation
+     (tell (tell NSView alloc)
+           initWithFrame: #:type _NSRect (tell #:type _NSRect tabv-cocoa contentRect))))
+
   (define item-cocoas
     (for/list ([lbl (in-list labels)])
       (let ([item (as-objc-allocation
                    (tell (tell NSTabViewItem alloc) initWithIdentifier: #f))])
         (tellv item setLabel: #:type _NSString (label->plain-label lbl))
+        (tellv item setView: content-cocoa)
         (when (and has-close?
                    use-mm?)
           (tellv item setHasCloseButton: #:type _BOOL #t))
@@ -185,12 +192,6 @@
         (tellv tabv-cocoa setFrame: #:type _NSRect (make-NSRect (make-init-point x y) sz))
         (tellv tabv-cocoa setDelegate: tabv-cocoa)))
 
-  (define content-cocoa 
-    (as-objc-allocation
-     (tell (tell NSView alloc)
-           initWithFrame: #:type _NSRect (tell #:type _NSRect tabv-cocoa contentRect))))
-  (tellv tabv-cocoa addSubview: content-cocoa)
-
   (define/override (get-cocoa-content) content-cocoa)
   (define/override (get-cocoa-cursor-content) tabv-cocoa)
   (define/override (set-size x y w h)
@@ -241,6 +242,7 @@
     (let ([item (as-objc-allocation
                  (tell (tell NSTabViewItem alloc) initWithIdentifier: #f))])
       (tellv item setLabel: #:type _NSString (label->plain-label lbl))
+      (tellv item setView: content-cocoa)
       (when (and has-close?
                  use-mm?)
         (tellv item setHasCloseButton: #:type _BOOL #t))
@@ -279,7 +281,7 @@
   (super-new [parent parent]
              [cocoa cocoa]
              [no-show? (memq 'deleted style)])
-  
+
   (when control-cocoa
     (set-ivar! control-cocoa wxb (->wxb this)))
 
@@ -291,7 +293,17 @@
              (if on? NSDefaultControlTint NSClearControlTint))
       (when control-cocoa
         (unless use-mm?
-          (tellv control-cocoa setEnabled: #:type _BOOL on?)))))
+          (tellv control-cocoa seteEnabled: #:type _BOOL on?)))
+      (when (version-26.0-or-later?)
+        (when (eq? cocoa tabv-cocoa)
+          (let ([subviews (tell cocoa subviews)])
+            (for ([i (in-range 0 (tell #:type _NSUInteger subviews count))])
+              (define c (tell subviews objectAtIndex: #:type _NSUInteger i))
+              (when (tell #:type _BOOL c isKindOfClass: (tell NSSegmentedControl class))
+                (tellv c setEnabled: #:type _BOOL on?))))))))
+
+  (unless (is-enabled-to-root?)
+    (enable-window #f))
 
   (define/override (can-accept-focus?)
     (and (not control-cocoa)

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

@@ -619,7 +619,7 @@
     (set-ivar! cocoa wxb (->wxb this))
 
     (unless no-show?
-      (show #t)) 
+      (show #t))
 
     (define/public (focus-is-on on?)
       (void))