Fix PR #5849 window deminiaturize.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@17945 72102866-910b-0410-8b05-ffd578937521

ChangeLog

@@ -1,3 +1,12 @@
+2003-10-20  Adam Fedor  <fedor@gnu.org>
+
+	* Source/NSApplication.m (-changeWindowsItem:title:filename:): Use
+	deminiaturize to get the window back.
+
+	* Source/NSWindow.m (-deminiaturize:): Don't order out
+	the miniwindow since it should be ordered out automatically.
+	Fixes PR #5849.
+
 2003-10-18  16:48  Gregory John Casamento <greg_casamento@yahoo.com>
 
 	* Source/NSOutlineView.m: Added full gsdoc documentation for this class.

Source/NSApplication.m

@@ -2137,6 +2137,12 @@ image.
     }
 }
 
+/** Changes the Window menu item associated with aWindow to aString. If no
+    associated window item exists, one is created. If isFilename is YES, then
+    aString is assumed to be a filename representation the way
+    [NSWindow-setTitleWithRepresentedFilename:] would format it, otherwise
+    the string is displayed literally in the menu item.
+ */
 - (void) changeWindowsItem: (NSWindow*)aWindow
 		     title: (NSString*)aString
 		  filename: (BOOL)isFilename
@@ -2237,7 +2243,7 @@ image.
       i++;
     }
   item = [_windows_menu insertItemWithTitle: aString
-			action: @selector(makeKeyAndOrderFront:)
+			action: @selector(deminiaturize:)
 			keyEquivalent: @""
 			atIndex: i];
   [item setTarget: aWindow];

Source/NSCursor.m

@@ -311,6 +311,7 @@ backgroundColorHint:(NSColor *)bg
 
 - (void) mouseExited: (NSEvent*)theEvent
 {
+  NSDebugLLog(@"NSCursor", @"Cursor mouseExited:");
   if (_is_set_on_mouse_exited == YES)
     {
       [self set];

Source/NSWindow.m

@@ -2225,12 +2225,16 @@ resetCursorRectsForView(NSView *theView)
   if (!_f.is_miniaturized)
     return;
 
+#if 0
+  /* At least with X-Windows, the counterpart is tied to us, so it will
+     automatically be ordered out when we are deminiaturized */
   if (_counterpart != 0)
     {
       NSWindow		*mini = GSWindowWithNumber(_counterpart);
 
       [mini orderOut: self];
     }
+#endif
   _f.is_miniaturized = NO;
   [self makeKeyAndOrderFront: self];
   [self _didDeminiaturize: sender];