From 43fd1886782724f2113fa462ead452ad7f451962 Mon Sep 17 00:00:00 2001 From: Gregory John Casamento Date: Sun, 9 Jul 2006 15:19:44 +0000 Subject: [PATCH] Removal of dead code and correction of custom view problem. git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/apps/gorm/trunk@23151 72102866-910b-0410-8b05-ffd578937521 --- ChangeLog | 6 ++++++ GormCore/GormCustomView.m | 7 ++++--- GormCore/GormNibWrapperLoader.m | 11 ----------- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/ChangeLog b/ChangeLog index cc39d5f7..89146d25 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-07-09 11:18 Gregory John Casamento + + * GormCore/GormCustomView.m: initWithCoder: move call to get customView + className after the if, so that it's properly set. + * GormCore/GormNibWrapperLoader.m: Remove commented out code. + 2006-07-09 10:46 Gregory John Casamento * English.lproj/GormDocument.gorm: New version profile added diff --git a/GormCore/GormCustomView.m b/GormCore/GormCustomView.m index 06a540b4..cae6e218 100644 --- a/GormCore/GormCustomView.m +++ b/GormCore/GormCustomView.m @@ -123,9 +123,6 @@ NSCustomView *customView = [[NSCustomView alloc] initWithCoder: aCoder]; NSArray *subviews = [customView subviews]; - // get the classname... - [self setClassName: [customView className]]; - // if the custom view has subviews.... if(subviews != nil && [subviews count] > 0) { @@ -147,6 +144,10 @@ [self initWithFrame: [customView frame]]; _autoresizingMask = [customView autoresizingMask]; } + + // get the classname... + [self setClassName: [customView className]]; + RELEASE(customView); return self; diff --git a/GormCore/GormNibWrapperLoader.m b/GormCore/GormNibWrapperLoader.m index bba88e49..78dbe62b 100644 --- a/GormCore/GormNibWrapperLoader.m +++ b/GormCore/GormNibWrapperLoader.m @@ -230,17 +230,6 @@ } } - // - // Add the main menu - // - /* - id menu = [container objectForName: @"MainMenu"]; - if(menu) - { - [document attachObject: menu toParent: nil]; - } - */ - // // Add custom classes... //