Changeset 579


Ignore:
Timestamp:
09/03/09 02:40:57 (9 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:
1 deleted
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cocoa/Pester/Source/English.lproj/MainMenu.nib/classes.nib

    r551 r579  
    1919                </dict>
    2020                <dict>
    21                         <key>CLASS</key>
    22                         <string>NSDisclosureButtonCell</string>
    23                         <key>LANGUAGE</key>
    24                         <string>ObjC</string>
    25                         <key>SUPERCLASS</key>
    26                         <string>NSButtonCell</string>
    27                 </dict>
    28                 <dict>
    2921                        <key>ACTIONS</key>
    3022                        <dict>
     
    7769                                <string>NSButtonCell</string>
    7870                                <key>editAlert</key>
    79                                 <string>NSButtonCell</string>
     71                                <string>NSButton</string>
    8072                                <key>inAtMatrix</key>
    8173                                <string>NSMatrix</string>
     
    155147                </dict>
    156148                <dict>
    157                         <key>CLASS</key>
    158                         <string>NSMenuItem</string>
    159                         <key>LANGUAGE</key>
    160                         <string>ObjC</string>
    161                         <key>SUPERCLASS</key>
    162                         <string>NSObject</string>
    163                 </dict>
    164                 <dict>
    165149                        <key>ACTIONS</key>
    166150                        <dict>
     
    179163                        <key>SUPERCLASS</key>
    180164                        <string>NSPopUpButton</string>
     165                </dict>
     166                <dict>
     167                        <key>CLASS</key>
     168                        <string>NSMenuItem</string>
     169                        <key>LANGUAGE</key>
     170                        <string>ObjC</string>
     171                        <key>SUPERCLASS</key>
     172                        <string>NSObject</string>
    181173                </dict>
    182174                <dict>
  • trunk/Cocoa/Pester/Source/English.lproj/MainMenu.nib/info.nib

    r551 r579  
    1414        </array>
    1515        <key>IBSystem Version</key>
    16         <string>9J61</string>
     16        <string>9L30</string>
    1717        <key>targetFramework</key>
    1818        <string>IBCocoaFramework</string>
  • trunk/Cocoa/Pester/Source/PSAlarmSetController.h

    r522 r579  
    2727    IBOutlet NSPopUpButton *timeDateCompletions; // XXX should go away when bug preventing both formatters and popup menus from existing is fixed
    2828    IBOutlet NSButton *timeCalendarButton;
    29     IBOutlet NSButtonCell *editAlert;
     29    IBOutlet NSButton *editAlert;
    3030    IBOutlet NSTextField *alertView;
    3131    IBOutlet NSTabView *alertTabs;
  • trunk/Cocoa/Pester/Source/PSAlarmSetController.m

    r552 r579  
    8585        [self _setVolume: volume withPreview: NO];
    8686    }
    87     [editAlert setIntValue: 1]; // XXX temporary for 1.1b5
     87    [editAlert setState: NSOnState]; // XXX temporary for 1.1b5
    8888    {
    8989        NSDictionary *plAlerts = [defaults dictionaryForKey: PSAlertsSelected];
     
    301301- (IBAction)editAlertChanged:(id)sender;
    302302{
    303     BOOL editAlertSelected = [editAlert intValue];
    304     NSView *editAlertControl = [editAlert controlView];
     303    BOOL editAlertSelected = [editAlert state] == NSOnState;
    305304    NSWindow *window = [self window];
    306305    NSRect frame = [window frame];
    307306    if (editAlertSelected) {
    308307        NSSize editWinSize = [window maxSize];
    309         [editAlertControl setNextKeyView: [displayMessage controlView]];
     308        [editAlert setNextKeyView: [displayMessage controlView]];
    310309        frame.origin.y += frame.size.height - editWinSize.height;
    311310        frame.size = editWinSize;
     
    331330            NSResponder *oldResponder = [window firstResponder];
    332331            // make sure focus doesn't get stuck in the edit tab: it is confusing and leaves behind artifacts
    333             if (oldResponder == editAlertControl || [oldResponder isKindOfClass: [NSView class]] && [(NSView *)oldResponder isDescendantOf: alertTabs])
    334                 [window makeFirstResponder: messageField]; // would use editAlertControl, but can't get it to display anomaly-free.
     332            if (oldResponder == editAlert || [oldResponder isKindOfClass: [NSView class]] && [(NSView *)oldResponder isDescendantOf: alertTabs])
     333                [window makeFirstResponder: messageField]; // would use editAlert, but can't get it to display anomaly-free.
    335334            [self silence: sender];
    336335        }
     
    345344        frame.size = viewWinSize;
    346345        [window setFrame: frame display: (sender != nil) animate: (sender != nil)];
    347         [editAlertControl setNextKeyView: cancelButton];
     346        [editAlert setNextKeyView: cancelButton];
    348347    }
    349348    if (sender != nil) {
  • trunk/Cocoa/Pester/Source/Pester.xcodeproj/project.pbxproj

    r569 r579  
    213213                E18DAAEB0442CC3E00050002 /* NJRSoundManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NJRSoundManager.m; sourceTree = "<group>"; };
    214214                E18DAAEE0442D02500050002 /* CoreAudio.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = /System/Library/Frameworks/CoreAudio.framework; sourceTree = "<absolute>"; };
    215                 E191700B03AD24A600AEFBE0 /* NSDisclosureButtonCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSDisclosureButtonCell.h; sourceTree = "<group>"; };
    216215                E19CC5220CFDE3350079DCFC /* libParseDate-10.4.dylib */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.dylib"; includeInIndex = 0; path = "libParseDate-10.4.dylib"; sourceTree = BUILT_PRODUCTS_DIR; };
    217216                E19CC5260CFDE3C70079DCFC /* DynaLoader-10.5.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = "DynaLoader-10.5.a"; sourceTree = "<group>"; };
     
    460459                                1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */,
    461460                                1058C7A2FEA54F0111CA2CBB /* Other Frameworks */,
    462                                 E162698803B618BD00000028 /* Private Headers */,
    463461                                E17CA7B60CF7D07400018B34 /* Perl */,
    464462                        );
     
    490488                        );
    491489                        name = Categories;
    492                         sourceTree = "<group>";
    493                 };
    494                 E162698803B618BD00000028 /* Private Headers */ = {
    495                         isa = PBXGroup;
    496                         children = (
    497                                 E191700B03AD24A600AEFBE0 /* NSDisclosureButtonCell.h */,
    498                         );
    499                         name = "Private Headers";
    500490                        sourceTree = "<group>";
    501491                };
Note: See TracChangeset for help on using the changeset viewer.