Update of /cvsroot/scopeapp/scopeapp/src
In directory usw-pr-cvs1:/tmp/cvs-serv17885
Modified Files:
ScopeAppDelegate.h ScopeAppDelegate.m
Log Message:
Remove unnecessary notification from delegate, move code from awakeFromNib
to applicationDidFinishLaunching to prevent it being called twice on macosx
Index: ScopeAppDelegate.h
===================================================================
RCS file: /cvsroot/scopeapp/scopeapp/src/ScopeAppDelegate.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** ScopeAppDelegate.h 21 Jul 2002 19:40:07 -0000 1.4
--- ScopeAppDelegate.h 22 Jul 2002 08:19:20 -0000 1.5
***************
*** 32,37 ****
}
- - (void) awakeFromNib;
-
// - (NSApplicationTerminateReply)applicationShouldTerminate:(NSApplication *)sender;
--- 32,35 ----
***************
*** 40,46 ****
- (BOOL)applicationShouldTerminateAfterLastWindowClosed:(NSApplication *)sender;
- // Quick fix to make something appear on the screen. These methods
- // respond to delegate object messages from NSApp
- - (void) applicationWillFinishLaunching: (NSNotification *)not;
- (void) applicationDidFinishLaunching: (NSNotification *)not;
--- 38,41 ----
Index: ScopeAppDelegate.m
===================================================================
RCS file: /cvsroot/scopeapp/scopeapp/src/ScopeAppDelegate.m,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** ScopeAppDelegate.m 21 Jul 2002 19:48:29 -0000 1.5
--- ScopeAppDelegate.m 22 Jul 2002 08:19:20 -0000 1.6
***************
*** 32,36 ****
@implementation ScopeAppDelegate
! - (void) awakeFromNib
{
ScopeController* controller;
--- 32,36 ----
@implementation ScopeAppDelegate
! - (void) applicationDidFinishLaunching: (NSNotification *)not
{
ScopeController* controller;
***************
*** 56,72 ****
return YES; // FIXME change after adding support for reading from files ?
}
-
- // FIXME this responds to NSApp, as an effort to show something on the screen.
- // it does show something on the screen, but the program segfaults
- - (void) applicationWillFinishLaunching: (NSNotification *)not
- {
- [self awakeFromNib];
- }
-
- /*- (void) applicationDidFinishLaunching: (NSNotification *)not;
- {
- [mainController windowDidLoad];
- }
- */
@end
--- 56,59 ----
|
