* Source/NSCollectionView.m (-_moveUpAndExpandSelection:):

* Correct
        the comparision. Bug reported by Gregory John Casamento
        <greg.casamento@gmail.com>
        * Headers/AppKit/NSPopover.h: Add missing import.
        * Source/GSXibLoader.m: Disable NSCustomView hack again.
        * Headers/AppKit/NSApplication.h: Replace GSAppDelegateProtocol
        with NSApplicationDelegate.
        * Source/NSApplication.m: Adjust documentation to this
        * replacement.



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

Source/GSXibLoader.m

@@ -1492,10 +1492,12 @@ didStartElement: (NSString*)elementName
   if ([@"object" isEqualToString: elementName])
     {
       NSString *classname = [element attributeForKey: @"class"];
-      if([classname isEqualToString:@"NSCustomView"])
+      /*
+      if ([classname isEqualToString:@"NSCustomView"])
 	{
 	  classname = @"NSView"; // instantiate an NSView instead...
 	}
+      */
       return [self decodeObjectForXib: element
                          forClassName: classname
                                withID: objID];

Source/NSApplication.m

@@ -742,7 +742,7 @@ static NSSize scaledIconSizeForSize(NSSize imageSize)
  *
  * <p>To avoid most common needs for subclassing, NSApplication allows you to
  * specify a <em>delegate</em> that is messaged in particular situations.
- * See -delegate , -setDelegate: , and [(GSAppDelegateProtocol)].</p>
+ * See -delegate , -setDelegate: , and [(NSApplicationDelegate)].</p>
  *
  * <p><strong>Subclassing</strong> should be a last resort, and delegate
  * methods should be used in most cases.  However, subclassing is most
@@ -3576,7 +3576,7 @@ struct _DelegateWrapper
  *   messages sent to the application from remote processes (see the
  *   section documenting distributed objects for [NSPasteboard]).
  * </p>
- * <p>See -setDelegate: and [(GSAppDelegateProtocol)] for more information.</p>
+ * <p>See -setDelegate: and [(NSApplicationDelegate)] for more information.</p>
  */
 - (id) delegate
 {
@@ -3590,7 +3590,7 @@ struct _DelegateWrapper
  * stop it being the application delagate by calling this
  * method again with another object (or nil) as the argument.
  * </p>
- * <p>See -delegate and [(GSAppDelegateProtocol)] for more information.</p>
+ * <p>See -delegate and [(NSApplicationDelegate)] for more information.</p>
  */
 - (void) setDelegate: (id)anObject
 {

Source/NSCollectionView.m

@@ -782,7 +782,7 @@ static NSString *placeholderItem = nil;
 - (void) _moveUpAndExpandSelection: (BOOL)shouldExpand
 {
   NSInteger index = [[self selectionIndexes] firstIndex];
-  if (index != NSNotFound && (index - _numberOfColumns) >= 0)
+  if (index != NSNotFound && index >= _numberOfColumns)
     {
       [self _modifySelectionWithNewIndex: index - _numberOfColumns
                                direction: -1