Commit 20e0e109 authored by Felix Paul Kühne's avatar Felix Paul Kühne

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...
parent a673ad77
......@@ -53,7 +53,7 @@
BOOL b_window_is_invisible;
NSSize videoRatio;
NSInteger originalLevel;
int originalLevel;
}
- (void)controlTintChanged;
......
......@@ -37,12 +37,6 @@
#include <Cocoa/Cocoa.h>
/* this was introduced in Darwin 9. We need to declare it to prevent both
* compilation warnings and errors */
#ifndef NSInteger
#define NSInteger int
#endif
/*****************************************************************************
* Local prototypes.
*****************************************************************************/
......
......@@ -2124,10 +2124,10 @@ end:
NSDirectoryEnumerator *direnum = [[NSFileManager defaultManager] enumeratorAtPath:crashReporter];
NSString *fname;
NSString * latestLog = nil;
NSInteger year = !previouslySeen ? [[NSUserDefaults standardUserDefaults] integerForKey:@"LatestCrashReportYear"] : 0;
NSInteger month = !previouslySeen ? [[NSUserDefaults standardUserDefaults] integerForKey:@"LatestCrashReportMonth"]: 0;
NSInteger day = !previouslySeen ? [[NSUserDefaults standardUserDefaults] integerForKey:@"LatestCrashReportDay"] : 0;
NSInteger hours = !previouslySeen ? [[NSUserDefaults standardUserDefaults] integerForKey:@"LatestCrashReportHours"]: 0;
int year = !previouslySeen ? [[NSUserDefaults standardUserDefaults] integerForKey:@"LatestCrashReportYear"] : 0;
int month = !previouslySeen ? [[NSUserDefaults standardUserDefaults] integerForKey:@"LatestCrashReportMonth"]: 0;
int day = !previouslySeen ? [[NSUserDefaults standardUserDefaults] integerForKey:@"LatestCrashReportDay"] : 0;
int hours = !previouslySeen ? [[NSUserDefaults standardUserDefaults] integerForKey:@"LatestCrashReportHours"]: 0;
while (fname = [direnum nextObject])
{
......
......@@ -1221,7 +1221,7 @@
pt = [o_outline_view convertPoint: [o_event locationInWindow]
fromView: nil];
NSInteger row = [o_outline_view rowAtPoint:pt];
int row = [o_outline_view rowAtPoint:pt];
if( row != -1 )
[o_outline_view selectRowIndexes:[NSIndexSet indexSetWithIndex:row] byExtendingSelection:NO];
......
......@@ -202,8 +202,8 @@
/* hotkeys */
- (IBAction)hotkeySettingChanged:(id)sender;
- (void)showHotkeySettings;
- (NSInteger)numberOfRowsInTableView:(NSTableView *)aTableView;
- (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex;
- (int)numberOfRowsInTableView:(NSTableView *)aTableView;
- (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(int)rowIndex;
- (BOOL)changeHotkeyTo: (int)i_theNewKey;
@end
......
......@@ -1193,12 +1193,12 @@ static inline void save_module_list( intf_thread_t * p_intf, id object, const ch
[self showSettingsForCategory: o_hotkeys_view];
}
- (NSInteger)numberOfRowsInTableView:(NSTableView *)aTableView
- (int)numberOfRowsInTableView:(NSTableView *)aTableView
{
return [o_hotkeySettings count];
}
- (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex
- (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(int)rowIndex
{
if( [[aTableColumn identifier] isEqualToString: @"action"] )
return [o_hotkeyDescriptions objectAtIndex: rowIndex];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment