Minor bugfix and consistency cleanups.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/gorm/trunk@13020 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-Macdonald 2002-03-06 11:43:38 +00:00
parent 1cd5332653
commit ee033590b1
10 changed files with 33 additions and 137 deletions

View file

@ -1,3 +1,19 @@
2002-03-06 Richard Frith-Macdonald <rfm@gnu.org>
* IBInspector.m: Release all ivars on dealloc.
* IBPalette.m: ditto
* Palettes/0Menus/GormMenuInspectors.m: Don't release superclass
ivars in own dealloc method.
* Palettes/1Windows/main.m: ditto
* Palettes/2Controls/inspectors.m: ditto
* Palettes/3Containers/inspectors.m: ditto
* Palettes/3Containers/main.m: ditto
* Palettes/4Data/inspectors.m: ditto
Changes to make retain/release consistent ... subclasses must not
release the ivars of a superclass in their dealloc method as the
superclass dealloc method should do that. Fixes bug exposed by
recent NSWindow dealloc fixes.
2002-03-04 Pierre-Yves Rivaille <pyrivail@ens-lyon.fr>
* Gorm.m ([GormObjectProxy -initWithCoder:]):

3
Gorm.m
View file

@ -33,6 +33,7 @@ NSString *IBWillEndTestingInterfaceNotification
NSString *IBDidEndTestingInterfaceNotification
= @"IBDidEndTestingInterfaceNotification";
NSDate *startDate;
NSString *GormLinkPboardType = @"GormLinkPboardType";
@ -699,6 +700,7 @@ NSString *GormLinkPboardType = @"GormLinkPboardType";
// [mainMenu display];
[self setDelegate: self];
[super finishLaunching];
NSLog(@"StartupTime %f", [startDate timeIntervalSinceNow]);
}
- (void) handleNotification: (NSNotification*)notification
@ -1231,6 +1233,7 @@ main(int argc, const char **argv)
NSImageDoesCaching = YES;
//[NSObject enableDoubleReleaseCheck: YES];
startDate = [[NSDate alloc] init];
NSApplicationMain(argc, argv);
return 0;

View file

@ -34,7 +34,11 @@ NSString *IBSelectionChangedNotification
- (void) dealloc
{
[[NSNotificationCenter defaultCenter] removeObserver: self];
RELEASE(object);
RELEASE(okButton);
RELEASE(revertButton);
RELEASE(window);
[super dealloc];
}

View file

@ -80,6 +80,7 @@ static NSMapTable *viewToType = 0;
- (void) dealloc
{
[[NSNotificationCenter defaultCenter] removeObserver: self];
RELEASE(icon);
RELEASE(window);
[super dealloc];

View file

@ -44,13 +44,6 @@
[object setTitle: [titleText stringValue]];
}
- (void) dealloc
{
[[NSNotificationCenter defaultCenter] removeObserver: self];
RELEASE(window);
[super dealloc];
}
- (id) init
{
self = [super init];
@ -59,6 +52,7 @@
NSView *contents;
NSTextField *title;
RELEASE(window);
window = [[NSWindow alloc] initWithContentRect: NSMakeRect(0, 0, IVW, IVH)
styleMask: NSBorderlessWindowMask
backing: NSBackingStoreRetained
@ -129,13 +123,6 @@
[[object menu] display];
}
- (void) dealloc
{
[[NSNotificationCenter defaultCenter] removeObserver: self];
RELEASE(window);
[super dealloc];
}
- (id) init
{
self = [super init];
@ -144,6 +131,7 @@
NSView *contents;
NSTextField *title;
RELEASE(window);
window = [[NSWindow alloc] initWithContentRect: NSMakeRect(0, 0, IVW, IVH)
styleMask: NSBorderlessWindowMask
backing: NSBackingStoreRetained

View file

@ -93,6 +93,7 @@
NSString *path = [bundle pathForImageResource: @"WindowDrag"];
NSImage *dragImage = [[NSImage alloc] initWithContentsOfFile: path];
RELEASE(window);
window = [[NSWindow alloc] initWithContentRect: NSMakeRect(0, 0, 272, 192)
styleMask: NSBorderlessWindowMask
backing: NSBackingStoreRetained
@ -292,15 +293,9 @@ NSwindow inspector
}
- (void) dealloc
{
RELEASE(window);
[super dealloc];
}
- (id) init
{
if ([super init] == nil)
if ([super init] == nil)
return nil;
if ([NSBundle loadNibNamed: @"GormWindowInspector" owner: self] == NO)
@ -313,7 +308,7 @@ NSwindow inspector
- (void) ok: (id)sender
{
[self _setValuesFromControl: sender];
[self _setValuesFromControl: sender];
}
- (void) setObject: (id)anObject
@ -381,13 +376,6 @@ NSwindow inspector
[self _getValuesFromObject: notifier];
}
- (void) dealloc
{
[[NSNotificationCenter defaultCenter] removeObserver: self];
RELEASE(window);
[super dealloc];
}
- (id) init
{
if ([super init] == nil)

View file

@ -92,12 +92,6 @@
[verticalSlider setFloatValue: [anObject contentViewMargins].height];
}
- (void) dealloc
{
RELEASE(window);
[super dealloc];
}
- (id) init
{
if ([super init] == nil)
@ -332,13 +326,6 @@
[typeButton indexOfItemWithTag: [self buttonTypeForObject: anObject]]];
}
- (void) dealloc
{
RELEASE(window);
RELEASE(okButton);
[super dealloc];
}
- (id) init
{
if ([super init] == nil)
@ -454,12 +441,6 @@
[[tagForm cellAtRow: 0 column: 0] setIntValue: [anObject tag]];
}
- (void) dealloc
{
RELEASE(window);
[super dealloc];
}
- (id) init
{
if ([super init] == nil)
@ -623,12 +604,6 @@
[[tagForm cellAtRow: 0 column: 0] setIntValue: [anObject tag]];
}
- (void) dealloc
{
RELEASE(window);
[super dealloc];
}
- (id) init
{
if ([super init] == nil)
@ -788,13 +763,6 @@
[[tagForm cellAtIndex: 0] setIntValue: [anObject tag]];
}
- (void) dealloc
{
RELEASE(window);
RELEASE(okButton);
[super dealloc];
}
- (id) init
{
if ([super init] == nil)
@ -872,12 +840,6 @@
[[tagForm cellAtRow: 0 column: 0] setIntValue: [anObject tag]];
}
- (void) dealloc
{
RELEASE(window);
[super dealloc];
}
- (id) init
{
if ([super init] == nil)
@ -994,12 +956,6 @@
[[tagForm cellAtIndex: 0] setIntValue: [[anObject cell] tag]];
}
- (void) dealloc
{
RELEASE(window);
[super dealloc];
}
- (id) init
{
if ([super init] == nil)
@ -1124,12 +1080,6 @@
[valueWrapsButton setState: 0];
}
- (void) dealloc
{
RELEASE(window);
[super dealloc];
}
- (id) init
{
if ([super init] == nil)
@ -1304,13 +1254,6 @@
[[tagForm cellAtIndex: 0] setIntValue: [anObject tag]];
}
- (void) dealloc
{
RELEASE(window);
RELEASE(okButton);
[super dealloc];
}
- (id) init
{
if ([super init] == nil)

View file

@ -106,13 +106,6 @@
[[tagField cellAtIndex:0] setIntValue:[anObject tag]];
}
- (void) dealloc
{
RELEASE(window);
RELEASE(okButton);
[super dealloc];
}
- (id) init
{
if ([super init] == nil)
@ -280,13 +273,6 @@
[[tagField cellAtIndex:0] setIntValue:[anObject tag]];
}
- (void) dealloc
{
RELEASE(window);
RELEASE(okButton);
[super dealloc];
}
- (id) init
{
if ([super init] == nil)

View file

@ -60,12 +60,6 @@
@implementation ContainersPalette
- (void) dealloc
{
// RELEASE(browserDelegate);
[super dealloc];
}
- (void) finishInstantiate
{

View file

@ -119,15 +119,11 @@ extern NSArray *predefinedDateFormats, *predefinedNumberFormats;
if ([anObject usesDataSource])
[optionMatrix selectCellAtRow: 2 column: 0];
[[visibleItemsForm cellAtIndex: 0] setIntValue: [anObject numberOfVisibleItems]];
[[visibleItemsForm cellAtIndex: 0]
setIntValue: [anObject numberOfVisibleItems]];
}
- (void) dealloc
{
RELEASE(window);
[super dealloc];
}
- (id) init
{
@ -226,12 +222,6 @@ extern NSArray *predefinedDateFormats, *predefinedNumberFormats;
[editableSwitch setState: [anObject isEditable]];
}
- (void) dealloc
{
RELEASE(window);
[super dealloc];
}
- (id) init
{
if ([super init] == nil)
@ -350,12 +340,6 @@ extern NSArray *predefinedDateFormats, *predefinedNumberFormats;
}
- (void) dealloc
{
RELEASE(window);
[super dealloc];
}
- (id) init
{
if ([super init] == nil)
@ -499,12 +483,6 @@ extern NSArray *predefinedDateFormats, *predefinedNumberFormats;
[languageSwitch setState: [fmtr allowsNaturalLanguage]];
}
- (void) dealloc
{
RELEASE(window);
[super dealloc];
}
- (id) init
{
@ -813,12 +791,6 @@ extern NSArray *predefinedDateFormats, *predefinedNumberFormats;
}
- (void) dealloc
{
RELEASE(window);
[super dealloc];
}
- (id) init
{
@ -826,7 +798,8 @@ extern NSArray *predefinedDateFormats, *predefinedNumberFormats;
{
return nil;
}
if ([NSBundle loadNibNamed: @"GormNumberFormatterInspector" owner: self] == NO)
if ([NSBundle loadNibNamed: @"GormNumberFormatterInspector"
owner: self] == NO)
{
NSLog(@"Could not gorm GormNumberFormatterInspector");
return nil;