diff --git a/ChangeLog b/ChangeLog index a2cc7dc7b..773208611 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2010-05-15 Wolfgang Lux + + * Source/NSAlert.m: + * Source/NSDrawer.m: + * Source/NSHelpPanel.m: + * Source/NSPrintPanel.m: Propagate the change of NSWindow's + designated initializer to all affected subclasses. + 2010-05-14 Wolfgang Lux * Source/GSGormLoading.m (-awakeWithContext): Add support for a diff --git a/Source/NSAlert.m b/Source/NSAlert.m index 2cbc555a8..838c63480 100644 --- a/Source/NSAlert.m +++ b/Source/NSAlert.m @@ -362,8 +362,7 @@ setControl(NSView* content, id control, NSString *title) self = [self initWithContentRect: r styleMask: NSTitledWindowMask backing: NSBackingStoreRetained - defer: YES - screen: nil]; + defer: YES]; if (self == nil) return nil; @@ -955,7 +954,6 @@ setControl(NSView* content, id control, NSString *title) styleMask: (unsigned int)aStyle backing: (NSBackingStoreType)bufferingType defer: (BOOL)flag - screen: (NSScreen*)aScreen { if(NSIsEmptyRect(contentRect)) { @@ -965,8 +963,7 @@ setControl(NSView* content, id control, NSString *title) self = [super initWithContentRect: contentRect styleMask: NSBorderlessWindowMask backing: bufferingType - defer: flag - screen: aScreen]; + defer: flag]; if (self != nil) { diff --git a/Source/NSDrawer.m b/Source/NSDrawer.m index 2ca931b8a..0e4e05c6e 100644 --- a/Source/NSDrawer.m +++ b/Source/NSDrawer.m @@ -96,7 +96,6 @@ static NSNotificationCenter *nc = nil; styleMask: (unsigned int)aStyle backing: (NSBackingStoreType)bufferingType defer: (BOOL)flag - screen: (NSScreen*)aScreen { if(NSIsEmptyRect(contentRect)) { @@ -106,8 +105,7 @@ static NSNotificationCenter *nc = nil; self = [super initWithContentRect: contentRect styleMask: aStyle backing: bufferingType - defer: flag - screen: aScreen]; + defer: flag]; if (self != nil) { NSRect rect = contentRect; diff --git a/Source/NSHelpPanel.m b/Source/NSHelpPanel.m index e73f45ee0..6be0f6aeb 100644 --- a/Source/NSHelpPanel.m +++ b/Source/NSHelpPanel.m @@ -133,7 +133,6 @@ static NSHelpPanel *_sharedPanel = nil; styleMask: (unsigned int)aStyle backing: (NSBackingStoreType)bufferingType defer: (BOOL)flag - screen: (NSScreen*)aScreen { if (_sharedPanel == nil) { @@ -147,8 +146,7 @@ static NSHelpPanel *_sharedPanel = nil; self = [super initWithContentRect: contentRect styleMask: NSTitledWindowMask|NSClosableWindowMask|NSResizableWindowMask backing: NSBackingStoreBuffered - defer: NO - screen: nil]; + defer: NO]; [self setReleasedWhenClosed: NO]; [self setTitle: _(@"Help")]; s = [[NSScrollView alloc] initWithFrame: contentRect]; diff --git a/Source/NSPrintPanel.m b/Source/NSPrintPanel.m index 9dff2e8cc..ade2f5c16 100644 --- a/Source/NSPrintPanel.m +++ b/Source/NSPrintPanel.m @@ -123,7 +123,6 @@ static NSPrintPanel *shared_instance; styleMask: (unsigned int)aStyle backing: (NSBackingStoreType)bufferingType defer: (BOOL)flag - screen: (NSScreen*)aScreen { unsigned int i; id control; @@ -134,8 +133,7 @@ static NSPrintPanel *shared_instance; self = [super initWithContentRect: contentRect styleMask: aStyle backing: bufferingType - defer: flag - screen: aScreen]; + defer: flag]; if (self == nil) return nil;