qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2024-11-10 23:32:09 +00:00
Code Issues Projects Releases Packages Wiki Activity

Support nibs in MainPrefs.

Browse source
This commit is contained in:
Jeff Teunissen 2002-01-04 20:31:53 +00:00
parent f591b27532
commit abf73ea80a
3 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
tools/Forge/Bundles/MainPrefs/GNUmakefile.preamble
View file

@ -2,7 +2,7 @@
ADDITIONAL_CPPFLAGS += ADDITIONAL_CPPFLAGS +=
# Additional flags to pass to the Objective-C compiler # Additional flags to pass to the Objective-C compiler
ADDITIONAL_OBJCFLAGS += ADDITIONAL_OBJCFLAGS += -DUSING_NIBS
# Additional flags to pass to the C compiler # Additional flags to pass to the C compiler
ADDITIONAL_CFLAGS += ADDITIONAL_CFLAGS +=

1
tools/Forge/Bundles/MainPrefs/MainPrefs.h
View file

@ -37,6 +37,7 @@
@interface MainPrefs: NSObject <PrefsViewController, ForgeBundle> @interface MainPrefs: NSObject <PrefsViewController, ForgeBundle>
{ {
NSView *view;
} }
@end @end

13
tools/Forge/Bundles/MainPrefs/MainPrefs.m
View file

@ -35,6 +35,9 @@ static const char rcsid[] =
#endif #endif
#import <AppKit/NSButton.h> #import <AppKit/NSButton.h>
#ifdef USING_NIBS
# import <AppKit/NSNibLoading.h>
#endif
#import "PrefsPanel.h" #import "PrefsPanel.h"
#import "PrefsController.h" #import "PrefsController.h"
@ -44,7 +47,6 @@ static const char rcsid[] =
@implementation MainPrefs @implementation MainPrefs
static MainPrefs *sharedInstance = nil; static MainPrefs *sharedInstance = nil;
static NSView *view = nil;
static id <BundleDelegate> owner = nil; static id <BundleDelegate> owner = nil;
- (id) initWithOwner: (id <BundleDelegate>) anOwner - (id) initWithOwner: (id <BundleDelegate>) anOwner
@ -56,7 +58,16 @@ static id <BundleDelegate> owner = nil;
owner = anOwner; owner = anOwner;
[owner registerPrefsController: self]; [owner registerPrefsController: self];
#ifdef USING_NIBS
if (![NSBundle loadNibNamed: @"MainPrefsView" owner: self]) {
NSLog (@"MainPrefs: Could not load nib \"MainPrefsView\", using compiled version");
#endif
view = [[MainPrefsView alloc] initWithFrame: PrefsRect]; view = [[MainPrefsView alloc] initWithFrame: PrefsRect];
#ifdef USING_NIBS
}
#endif
[view retain];
sharedInstance = self; sharedInstance = self;
} }
return sharedInstance; return sharedInstance;