From 57489095d813f5b6ffde9b78e0de05e7d4b37a09 Mon Sep 17 00:00:00 2001
From: gcasa <gcasa@72102866-910b-0410-8b05-ffd578937521>
Date: Mon, 27 Jul 2009 16:31:32 +0000
Subject: [PATCH] 	* Headers/AppKit/NSWindow.h: Comment out
 _attachedSheet ivar. 	* Source/NSAlert.m: Change code to use
 hightlightWithLevel: method 	in resetWindow method. 	*
 Source/NSApplication.m: Stub out setAttachedSheet method. 	*
 Source/NSWindow.m: Remove new ivar for next release and stub out 
 attachedSheet method.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@28415 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog                 | 16 +++++++++++++---
 Headers/AppKit/NSWindow.h |  2 +-
 Source/NSAlert.m          | 15 +++------------
 Source/NSApplication.m    |  2 +-
 Source/NSWindow.m         |  5 +++--
 5 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2382f74f2..340d12f9e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-07-27 12:18-EDT Gregory John Casamento <greg.casamento@gmail.com>
+
+	* Headers/AppKit/NSWindow.h: Comment out _attachedSheet ivar.
+	* Source/NSAlert.m: Change code to use hightlightWithLevel: method
+	in resetWindow method.
+	* Source/NSApplication.m: Stub out setAttachedSheet method.
+	* Source/NSWindow.m: Remove new ivar for next release and stub out
+	attachedSheet method.
+
 2009-07-26 Fred Kiefer <FredKiefer@gmx.de>
 
 	* Headers/AppKit/NSFontDescriptor.h,
@@ -2226,14 +2235,15 @@
 	-frameRectForContentRect:styleMask): New instance methods.
 	* Source/NSWindow.m: Use these new methods.
 
-2008-10-19 Riccardo Mottola <rmottola@users.sf.net>>
+2008-10-19 Riccardo Mottola <rmottola@users.sf.net>
 
         * Source/GSServicesManager.m: dont unreigster non existent named port
 
 2008-10-18 19:06-EDT Gregory John Casamento <greg_casamento@yahoo.com>
 
-	* Source/NSWindow.m: Remove code in stringWithSavedFrame which was causing a
-	crash due to issues in NSToolbar described in bug#24601.
+	* Source/NSWindow.m: Remove code in stringWithSavedFrame which 
+	was causing a crash due to issues in NSToolbar described 
+	in bug#24601.
 
 2008-10-18 Riccardo Mottola <rmottola@users.sf.net>>
 
diff --git a/Headers/AppKit/NSWindow.h b/Headers/AppKit/NSWindow.h
index b9edc6989..4266f3f00 100644
--- a/Headers/AppKit/NSWindow.h
+++ b/Headers/AppKit/NSWindow.h
@@ -203,7 +203,7 @@ APPKIT_EXPORT NSSize NSTokenSize;
   NSWindow       *_parent;
   NSCachedImageRep *_cachedImage;
   NSPoint        _cachedImageOrigin;
-  NSWindow       *_attachedSheet;
+  // NSWindow       *_attachedSheet;
 
   struct GSWindowFlagsType {
     unsigned	accepts_drag:1;
diff --git a/Source/NSAlert.m b/Source/NSAlert.m
index b66d5f179..cfead0a4d 100644
--- a/Source/NSAlert.m
+++ b/Source/NSAlert.m
@@ -969,18 +969,9 @@ setControl(NSView* content, id control, NSString *title)
 
   if((parent = [self parentWindow]) != nil)
     {
-      NSColor *color = nil;
-      float r, g, b, a;
-      
-      [[[parent backgroundColor]
-	 colorUsingColorSpaceName: NSCalibratedRGBColorSpace] 
-	getRed: &r green: &g blue: &b alpha: &a];
-
-      color = [NSColor colorWithCalibratedRed: r + 0.05 
-		       green: g + 0.05 
-		       blue: b + 0.05 
-		       alpha: a];
-      [self setBackgroundColor: color];
+      [self setBackgroundColor: 
+	      [[parent backgroundColor] 
+		highlightWithLevel: 0.4]];
     }
 
   [self setFrame: frame display: YES];
diff --git a/Source/NSApplication.m b/Source/NSApplication.m
index 8adcd338b..26f59be26 100644
--- a/Source/NSApplication.m
+++ b/Source/NSApplication.m
@@ -382,7 +382,7 @@ struct _NSModalSession {
  */ 
 - (void) setAttachedSheet: (id) sheet
 {
-  _attachedSheet = sheet;
+  // _attachedSheet = sheet;
 }
 @end
 
diff --git a/Source/NSWindow.m b/Source/NSWindow.m
index 8fb188795..fa3a44f3d 100644
--- a/Source/NSWindow.m
+++ b/Source/NSWindow.m
@@ -986,7 +986,7 @@ many times.
   [super init];
   [self _initDefaults];
 
-  _attachedSheet = nil;
+  // _attachedSheet = nil;
   _backingType = bufferingType;
   _styleMask = aStyle;
   if (aScreen == nil)
@@ -5102,7 +5102,8 @@ current key view.<br />
 
 - (NSWindow *) attachedSheet
 {
-  return _attachedSheet;
+  // return _attachedSheet;
+  return nil;
 }
 
 @end