Merge with trunk revision 40072

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

Source/NSColor.m

@@ -1388,7 +1388,6 @@ systemColorWithName(NSString *name)
 //
 - (void) drawSwatchInRect: (NSRect)rect
 {
-  // Testplant-MAL-2015-06-25 Merged with GUI trunk...
   if ([self alphaComponent] < 1.0)
     {
       NSBezierPath *triangle = [NSBezierPath bezierPath];

Source/NSColorPanel.m

@@ -58,7 +58,6 @@
 #import "GNUstepGUI/GSDisplayServer.h"
 #import "GNUstepGUI/IMLoading.h"
 
-#import "unistd.h"
 
 #import "GSGuiPrivate.h"
 
@@ -187,6 +186,7 @@ static int _gs_gui_color_picker_mode = NSRGBModeColorPanel;
       [cells addObject: cell];
     }
 
+  [_pickerMatrix renewRows: 0 columns: count];
   [_pickerMatrix addRowWithCells: cells];
   RELEASE(cells);
   [_pickerMatrix setCellSize: NSMakeSize(size.width / count, size.height)];

Source/NSComboBoxCell.m

@@ -1898,6 +1898,7 @@ static inline NSRect buttonCellFrameFromRect(NSRect cellRect)
   [_buttonCell setBordered: YES];
   [_buttonCell setTarget: self];
   [_buttonCell setAction: @selector(_didClickWithinButton:)];
+  [_buttonCell setEnabled: [self isEnabled]];
 }
 
 - (void) _selectCompleted

Source/NSFont.m

@@ -46,11 +46,6 @@
 #import "AppKit/NSView.h"
 #import "GNUstepGUI/GSFontInfo.h"
 
-#if 0
-// Testplant-MAL-2015-06-30: Certain missing fonts would cause GUI problems...
-// Is this still needed???  Omitting for testing...
-#include <GNUstepGUI/GSDisplayServer.h>
-#endif
 
 @interface NSFont (Private)
 - (id) initWithName: (NSString*)name 

Source/NSFontDescriptor.m

@@ -2,7 +2,7 @@
 
    <abstract>The font descriptor class</abstract>
 
-   Copyright (C) 2007 Free Software Foundation, Inc.
+   Copyright (C) 2007-2016 Free Software Foundation, Inc.
 
    Author: H. Nikolaus Schaller <hns@computer.org>
    Date: 2006
@@ -268,7 +268,7 @@
           withString: @""
           options: 0
           range: NSMakeRange(0, [family length])];
-  if ([face isEqualToString: @"Regular"])
+  if (!face || [face isEqualToString: @"Regular"])
     return family;
   return [NSString stringWithFormat: @"%@-%@", family, face];
 }

Source/NSInputManager.m

@@ -45,8 +45,6 @@ static struct
   NSString *name;
   unichar character;
 } 
-
-// Testplant-MAL-2015-06-30: Removed main branch constant definition...
 character_table[] =
 {
   /* Function keys.  */
@@ -134,7 +132,6 @@ character_table[] =
   { @"Escape", 0x1b }
 };
 
-// Testplant-MAL-2015-06-30: This replaces main branch constant definition...
 static int CHARACTER_TABLE_SIZE = (sizeof(character_table) / sizeof(character_table[0]));
 
 static NSInputManager *currentInputManager = nil;
@@ -679,7 +676,6 @@ static NSInputManager *currentInputManager = nil;
         case NSEnterCharacter:
         case NSFormFeedCharacter:
         case NSCarriageReturnCharacter:
-          // Testplant-MAL-2015-06-30: Included from testplant branch...
           if (flags & NSAlternateKeyMask)
             {
               [self doCommandBySelector: @selector (insertNewlineIgnoringFieldEditor:)];

Source/NSLayoutManager.m

@@ -911,9 +911,7 @@ has the same y origin and height as the line frag rect it is in.
       fraction_through = 1.0;
     }
   else
-    {
       [self _doLayoutToGlyph: glyph_index];
-    }
   
   for (tc = textcontainers, i = 0; i < num_textcontainers; i++, tc++)
     if (tc->pos + tc->length > glyph_index)
@@ -2959,11 +2957,13 @@ no_soft_invalidation:
       else
 	{ /* before before */
 	}
+
 	/* sanity check */
 	if (NSMaxRange(newRange) > [_textStorage length]) 
+        {
 		newRange = NSMakeRange(MIN(range.location, [_textStorage length]), 0);
+        }
 		
-
       /* If there are text views attached to us, let them handle the
       change. */
       if ([self firstTextView])

Source/NSNib.m

@@ -68,7 +68,7 @@
     }
   NS_HANDLER
     {
-      NSLog(@"Exception occured while loading model: %@", [localException reason]);
+      NSLog(@"Exception occurred while loading model: %@", [localException reason]);
     }
   NS_ENDHANDLER
 }
@@ -101,7 +101,7 @@
             }
           NS_HANDLER
             {
-              NSLog(@"Exception occured while loading model: %@", [localException reason]);
+              NSLog(@"Exception occurred while loading model: %@", [localException reason]);
             }
           NS_ENDHANDLER
         }

Source/nsimage-tiff.h

@@ -30,7 +30,7 @@
 /*
     Warning:  This header file should not be used for reading and
     writing tiff files.  You should use the NSImage and NSBitmapImageRep
-    classes for general reading/writting of tiff files.
+    classes for general reading/writing of tiff files.
 */
 
 #ifndef _GNUstep_H_tiff
@@ -41,7 +41,8 @@
 
 /* Structure to store common information about a tiff. */
 typedef struct {
-    uint32  imageNumber;
+    uint16  numImages;	      /* number of images in tiff */
+    uint16  imageNumber;      /* number of current image */
     uint32  subfileType;
     uint32  width;
     uint32  height;
@@ -53,7 +54,6 @@ typedef struct {
     uint16 extraSamples;     /* Alpha */
     int     assocAlpha;
     int     quality;	      /* compression quality (for jpeg) 1 to 255 */
-    int     numImages;	      /* number of images in tiff */
     int     error;
     float   xdpi;
     float   ydpi;