ViewVC Help
View File | Revision Log | Show Annotations | Revision Graph | Root Listing
root/cebix/SheepShaver/src/MacOSX/Launcher/VMSettingsController.mm
(Generate patch)

Comparing SheepShaver/src/MacOSX/Launcher/VMSettingsController.mm (file contents):
Revision 1.7 by asvitkine, 2009-08-30T17:56:30Z vs.
Revision 1.10 by asvitkine, 2011-12-28T17:51:56Z

# Line 1 | Line 1
1   /*
2   *  VMSettingsController.mm - Preferences editing in Cocoa on Mac OS X
3   *
4 < *  Copyright (C) 2006-2009 Alexei Svitkine
4 > *  Copyright (C) 2006-2010 Alexei Svitkine
5   *
6   *  This program is free software; you can redistribute it and/or modify
7   *  it under the terms of the GNU General Public License as published by
# Line 18 | Line 18
18   *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
19   */
20  
21 #import "VMSettingsController.h"
22
21   #import "sysdeps.h"
22   #import "prefs.h"
23  
24 + // The _UINT64 define is needed to guard against a typedef mismatch with Snow Leopard headers.
25 + #define _UINT64
26 +
27 + #import "VMSettingsController.h"
28 +
29 + #include <unistd.h>
30 +
31   const int CDROMRefNum = -62;                    // RefNum of driver
32  
33   #ifdef STANDALONE_PREFS
# Line 70 | Line 75 | static NSString *getStringFromPrefs(cons
75    const char *value = PrefsFindString(key);
76    if (value == NULL)
77      return @"";
78 <  return [NSString stringWithCString: value];
78 >  return [NSString stringWithUTF8String: value];
79   }
80  
81   - (void) setupGUI
# Line 80 | Line 85 | static NSString *getStringFromPrefs(cons
85    const char *dsk;
86    int index = 0;
87    while ((dsk = PrefsFindString("disk", index++)) != NULL)
88 <    [diskArray addObject: [NSString stringWithCString: dsk ]];
88 >    [diskArray addObject: [NSString stringWithUTF8String: dsk ]];
89  
90    [disks setDataSource: self];
91    [disks reloadData];
# Line 198 | Line 203 | static NSString *makeRelativeIfNecessary
203    if (!strncmp(cwd, filename, cwdlen)) {
204      if (cwdlen >= 0 && cwd[cwdlen-1] != '/')
205        cwdlen++;
206 <    return [NSString stringWithCString: filename + cwdlen];
206 >    return [NSString stringWithUTF8String: filename + cwdlen];
207    }
208    return path;
209   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines