Changeset 20e0e10972176a97a348f56b51e3b998715bff3e

Show
Ignore:
Timestamp:
23/08/08 23:37:42 (3 months ago)
Author:
Felix Paul Kühne <fkuehne@videolan.org>
git-committer:
Felix Paul Kühne <fkuehne@videolan.org> 1219527462 +0200
git-parent:

[a673ad77028bf87d1ff0f936fa959f6d816882b1]

git-author:
Felix Paul Kühne <fkuehne@videolan.org> 1219527441 +0200
Message:

macosx: compilation fix for the 10.4u SDK and removal of a hack

Note that all NS*Integer types were introduced on 10.5 only. They can tollfree bridged with the respective plain ints. They are undocumented anyway...

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/gui/macosx/embeddedwindow.h

    r75c8bbc r20e0e10  
    5454 
    5555    NSSize videoRatio; 
    56     NSInteger originalLevel; 
     56    int originalLevel; 
    5757} 
    5858 

  • modules/gui/macosx/intf.h

    r55de54d r20e0e10  
    3737 
    3838#include <Cocoa/Cocoa.h> 
    39  
    40 /* this was introduced in Darwin 9. We need to declare it to prevent both 
    41  * compilation warnings and errors */ 
    42 #ifndef NSInteger 
    43 #define NSInteger int 
    44 #endif 
    4539 
    4640/***************************************************************************** 

  • modules/gui/macosx/intf.m

    rb37eec6 r20e0e10  
    21252125    NSString *fname; 
    21262126    NSString * latestLog = nil; 
    2127     NSInteger year  = !previouslySeen ? [[NSUserDefaults standardUserDefaults] integerForKey:@"LatestCrashReportYear"] : 0; 
    2128     NSInteger month = !previouslySeen ? [[NSUserDefaults standardUserDefaults] integerForKey:@"LatestCrashReportMonth"]: 0; 
    2129     NSInteger day   = !previouslySeen ? [[NSUserDefaults standardUserDefaults] integerForKey:@"LatestCrashReportDay"]  : 0; 
    2130     NSInteger hours = !previouslySeen ? [[NSUserDefaults standardUserDefaults] integerForKey:@"LatestCrashReportHours"]: 0; 
     2127    int year  = !previouslySeen ? [[NSUserDefaults standardUserDefaults] integerForKey:@"LatestCrashReportYear"] : 0; 
     2128    int month = !previouslySeen ? [[NSUserDefaults standardUserDefaults] integerForKey:@"LatestCrashReportMonth"]: 0; 
     2129    int day   = !previouslySeen ? [[NSUserDefaults standardUserDefaults] integerForKey:@"LatestCrashReportDay"]  : 0; 
     2130    int hours = !previouslySeen ? [[NSUserDefaults standardUserDefaults] integerForKey:@"LatestCrashReportHours"]: 0; 
    21312131 
    21322132    while (fname = [direnum nextObject]) 

  • modules/gui/macosx/playlist.m

    r9667973 r20e0e10  
    12221222    pt = [o_outline_view convertPoint: [o_event locationInWindow] 
    12231223                                                 fromView: nil]; 
    1224     NSInteger row = [o_outline_view rowAtPoint:pt]; 
     1224    int row = [o_outline_view rowAtPoint:pt]; 
    12251225    if( row != -1 ) 
    12261226        [o_outline_view selectRowIndexes:[NSIndexSet indexSetWithIndex:row] byExtendingSelection:NO]; 

  • modules/gui/macosx/simple_prefs.h

    ra251a03 r20e0e10  
    203203- (IBAction)hotkeySettingChanged:(id)sender; 
    204204- (void)showHotkeySettings; 
    205 - (NSInteger)numberOfRowsInTableView:(NSTableView *)aTableView; 
    206 - (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex; 
     205- (int)numberOfRowsInTableView:(NSTableView *)aTableView; 
     206- (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(int)rowIndex; 
    207207- (BOOL)changeHotkeyTo: (int)i_theNewKey; 
    208208 

  • modules/gui/macosx/simple_prefs.m

    r6932d8c r20e0e10  
    11941194} 
    11951195 
    1196 - (NSInteger)numberOfRowsInTableView:(NSTableView *)aTableView 
     1196- (int)numberOfRowsInTableView:(NSTableView *)aTableView 
    11971197{ 
    11981198    return [o_hotkeySettings count]; 
    11991199} 
    12001200 
    1201 - (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex 
     1201- (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(int)rowIndex 
    12021202{ 
    12031203    if( [[aTableColumn identifier] isEqualToString: @"action"] )