Changeset 579 for trunk

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.

Location:

trunk/Cocoa/Pester/Source

Files:

• English.lproj/MainMenu.nib/classes.nib (modified) (4 diffs)
• English.lproj/MainMenu.nib/info.nib (modified) (1 diff)
• English.lproj/MainMenu.nib/keyedobjects.nib (modified) ( previous)
• NSDisclosureButtonCell.h (deleted)
• PSAlarmSetController.h (modified) (1 diff)
• PSAlarmSetController.m (modified) (4 diffs)
• Pester.xcodeproj/project.pbxproj (modified) (3 diffs)

trunk/Cocoa/Pester/Source/English.lproj/MainMenu.nib/classes.nib

@@ -19 +19 @@
                 </dict>
                 <dict>
-                        <key>CLASS</key>
-                        <string>NSDisclosureButtonCell</string>
-                        <key>LANGUAGE</key>
-                        <string>ObjC</string>
-                        <key>SUPERCLASS</key>
-                        <string>NSButtonCell</string>
-                </dict>
-                <dict>
                         <key>ACTIONS</key>
                         <dict>
@@ -77 +69 @@
                                 <string>NSButtonCell</string>
                                 <key>editAlert</key>
-                                <string>NSButtonCell</string>
+                                <string>NSButton</string>
                                 <key>inAtMatrix</key>
                                 <string>NSMatrix</string>
@@ -155 +147 @@
                 </dict>
                 <dict>
-                        <key>CLASS</key>
-                        <string>NSMenuItem</string>
-                        <key>LANGUAGE</key>
-                        <string>ObjC</string>
-                        <key>SUPERCLASS</key>
-                        <string>NSObject</string>
-                </dict>
-                <dict>
                         <key>ACTIONS</key>
                         <dict>
@@ -179 +163 @@
                         <key>SUPERCLASS</key>
                         <string>NSPopUpButton</string>
+                </dict>
+                <dict>
+                        <key>CLASS</key>
+                        <string>NSMenuItem</string>
+                        <key>LANGUAGE</key>
+                        <string>ObjC</string>
+                        <key>SUPERCLASS</key>
+                        <string>NSObject</string>
                 </dict>
                 <dict>

trunk/Cocoa/Pester/Source/English.lproj/MainMenu.nib/info.nib

@@ -14 +14 @@
         </array>
         <key>IBSystem Version</key>
-        <string>9J61</string>
+        <string>9L30</string>
         <key>targetFramework</key>
         <string>IBCocoaFramework</string>

trunk/Cocoa/Pester/Source/PSAlarmSetController.h

@@ -27 +27 @@
     IBOutlet NSPopUpButton *timeDateCompletions; // XXX should go away when bug preventing both formatters and popup menus from existing is fixed
     IBOutlet NSButton *timeCalendarButton;
-    IBOutlet NSButtonCell *editAlert;
+    IBOutlet NSButton *editAlert;
     IBOutlet NSTextField *alertView;
     IBOutlet NSTabView *alertTabs;

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) {

trunk/Cocoa/Pester/Source/Pester.xcodeproj/project.pbxproj

@@ -213 +213 @@
                 E18DAAEB0442CC3E00050002 /* NJRSoundManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NJRSoundManager.m; sourceTree = "<group>"; };
                 E18DAAEE0442D02500050002 /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = /System/Library/Frameworks/CoreAudio.framework; sourceTree = "<absolute>"; };
-                E191700B03AD24A600AEFBE0 /* NSDisclosureButtonCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSDisclosureButtonCell.h; sourceTree = "<group>"; };
                 E19CC5220CFDE3350079DCFC /* libParseDate-10.4.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = "libParseDate-10.4.dylib"; sourceTree = BUILT_PRODUCTS_DIR; };
                 E19CC5260CFDE3C70079DCFC /* DynaLoader-10.5.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "DynaLoader-10.5.a"; sourceTree = "<group>"; };
@@ -460 +459 @@
                                 1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */,
                                 1058C7A2FEA54F0111CA2CBB /* Other Frameworks */,
-                                E162698803B618BD00000028 /* Private Headers */,
                                 E17CA7B60CF7D07400018B34 /* Perl */,
                         );
@@ -490 +488 @@
                         );
                         name = Categories;
-                        sourceTree = "<group>";
-                };
-                E162698803B618BD00000028 /* Private Headers */ = {
-                        isa = PBXGroup;
-                        children = (
-                                E191700B03AD24A600AEFBE0 /* NSDisclosureButtonCell.h */,
-                        );
-                        name = "Private Headers";
                         sourceTree = "<group>";
                 };