ViewVC Help

View File | Revision Log | Show Annotations | Revision Graph | Root Listing

root/cebix/SheepShaver/src/MacOSX/prefs_macosx.mm

Comparing SheepShaver/src/MacOSX/prefs_macosx.mm (file contents):
Revision 1.1 by asvitkine, 2007-07-28T15:46:17Z vs.
Revision 1.2 by asvitkine, 2009-08-18T18:22:01Z

#	Line 25 | Line 25
25		#include "sysdeps.h"
26
27		#include <Cocoa/Cocoa.h>
28	<
29	<	#include "PrefsEditor.h"
28	>	#include "VMSettingsController.h"
29
30		@interface SheepShaverMain : NSObject
31		NSArray *nibObjects;
#	Line 38 | Line 37
37
38		- (NSArray*) loadPrefsNibFile
39		{
40	<	NSNib *nib = [[NSNib alloc] initWithNibNamed:@"MainMenu" bundle:nil];
40	>	NSNib *nib = [[NSNib alloc] initWithNibNamed:@"VMSettingsWindow" bundle:nil];
41		NSArray *objects = nil;
42
43	<	if (![nib instantiateNibWithOwner:self topLevelObjects:&objects]) {
43	>	if (![nib instantiateNibWithOwner:[VMSettingsController sharedInstance] topLevelObjects:&objects]) {
44		NSLog(@"Could not load Prefs NIB file!\n");
45		return nil;
46		}
#	Line 83 | Line 82
82		[nibObjects retain];
83		}
84
85	+	[[VMSettingsController sharedInstance] setupGUI];
86		[NSApp runModalForWindow:prefsWindow];
87		}
88

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines