Changeset 579 for trunk/Cocoa/Pester/Source/PSAlarmSetController.m

Timestamp:

09/03/09 02:40:57 (15 years ago)

Author:

Nicholas Riley

Message:

Replace use of private/deprecated NSDisclosureButtonCell; a public alternative has been available since 10.3. (Oops.)

Also remove incorrect NSMovieView superclass in nib because 10.6 IB refuses to open the nib with it present.

File:

• trunk/Cocoa/Pester/Source/PSAlarmSetController.m (modified) (4 diffs)

trunk/Cocoa/Pester/Source/PSAlarmSetController.m

@@ -85 +85 @@
         [self _setVolume: volume withPreview: NO];
     }
-    [editAlert setIntValue: 1]; // XXX temporary for 1.1b5
+    [editAlert setState: NSOnState]; // XXX temporary for 1.1b5
     {
         NSDictionary *plAlerts = [defaults dictionaryForKey: PSAlertsSelected];
@@ -301 +301 @@
 - (IBAction)editAlertChanged:(id)sender;
 {
-    BOOL editAlertSelected = [editAlert intValue];
-    NSView *editAlertControl = [editAlert controlView];
+    BOOL editAlertSelected = [editAlert state] == NSOnState;
     NSWindow *window = [self window];
     NSRect frame = [window frame];
     if (editAlertSelected) {
         NSSize editWinSize = [window maxSize];
-        [editAlertControl setNextKeyView: [displayMessage controlView]];
+        [editAlert setNextKeyView: [displayMessage controlView]];
         frame.origin.y += frame.size.height - editWinSize.height;
         frame.size = editWinSize;
@@ -331 +330 @@
             NSResponder *oldResponder = [window firstResponder];
             // make sure focus doesn't get stuck in the edit tab: it is confusing and leaves behind artifacts
-            if (oldResponder == editAlertControl || [oldResponder isKindOfClass: [NSView class]] && [(NSView *)oldResponder isDescendantOf: alertTabs])
-                [window makeFirstResponder: messageField]; // would use editAlertControl, but can't get it to display anomaly-free.
+            if (oldResponder == editAlert || [oldResponder isKindOfClass: [NSView class]] && [(NSView *)oldResponder isDescendantOf: alertTabs])
+                [window makeFirstResponder: messageField]; // would use editAlert, but can't get it to display anomaly-free.
             [self silence: sender];
         }
@@ -345 +344 @@
         frame.size = viewWinSize;
         [window setFrame: frame display: (sender != nil) animate: (sender != nil)];
-        [editAlertControl setNextKeyView: cancelButton];
+        [editAlert setNextKeyView: cancelButton];
     }
     if (sender != nil) {