Merge branch 'master' of github.com:gnustep/libs-gui into NSBrowser_bindings_branch

Source/GSThemeDrawing.m

@@ -3319,9 +3319,9 @@ static NSDictionary *titleTextAttributes[3] = {nil, nil, nil};
 
     if (selectionColor == nil)
       {
-	selectionColor = [NSColor colorWithCalibratedRed: 0.86
-						   green: 0.92
-						    blue: 0.99
+	selectionColor = [NSColor colorWithCalibratedRed: 1.0
+						   green: 1.0
+						    blue: 1.0
 						   alpha: 1.0];
       }
     [selectionColor set];

Source/NSApplication.m

@@ -2496,6 +2496,7 @@ image.</p><p>See Also: -applicationIconImage</p>
 	  NSDictionary  	*info;
 	  NSWindow		*win;
 	  NSEnumerator  	*iter;
+          id<NSMenuItem>  	menuItem;
 
 	  [nc postNotificationName: NSApplicationWillHideNotification
 	                    object: self];
@@ -2543,7 +2544,16 @@ image.</p><p>See Also: -applicationIconImage</p>
                   [_hidden addObject: win];
                   [win orderOut: self];
                 }
-            }
+	    }
+	  menuItem = [sender isKindOfClass:[NSMenuItem class]]
+		       ? sender
+		       : [_main_menu itemWithTitle:_(@"Hide")];
+	  if (menuItem)
+	    {
+	      [menuItem setAction:@selector(unhide:)];
+	      [menuItem setTitle:_(@"Show")];
+	    }
+
 	  _app_is_hidden = YES;
 	  
 	  if (YES == [[NSUserDefaults standardUserDefaults]
@@ -2606,6 +2616,14 @@ image.</p><p>See Also: -applicationIconImage</p>
  */
 - (void) unhide: (id)sender
 {
+  id<NSMenuItem> menuItem = [sender isKindOfClass:[NSMenuItem class]]
+			      ? sender
+			      : [_main_menu itemWithTitle:_(@"Show")];
+  if (menuItem)
+    {
+      [menuItem setAction:@selector(hide:)];
+      [menuItem setTitle:_(@"Hide")];
+    }
   if (_app_is_hidden)
     {
       [self unhideWithoutActivation];

Source/NSTextFieldCell.m

@@ -363,6 +363,11 @@
           [self setBezelStyle: [aDecoder decodeIntForKey: 
                                              @"NSTextBezelStyle"]];
         }
+      if ([aDecoder containsValueForKey: @"NSPlaceholderString"])
+        {
+          [self setPlaceholderString: [aDecoder decodeObjectForKey: 
+                                             @"NSPlaceholderString"]];
+        }
     }
   else
     {

Source/NSWindow.m

@@ -2109,10 +2109,7 @@ titleWithRepresentedFilename(NSString *representedFilename)
 
 - (BOOL) showsResizeIndicator
 {
-  // TODO
-  NSLog(@"Method %s is not implemented for class %s",
-        "showsResizeIndicator", "NSWindow");
-  return YES;
+  return ([self styleMask] & NSResizableWindowMask) ? YES : NO;
 }
 
 - (void) setShowsResizeIndicator: (BOOL)show