From 91feeb10d78cd75eac2c1d243611159f41cb4365 Mon Sep 17 00:00:00 2001
From: fredkiefer <fredkiefer@72102866-910b-0410-8b05-ffd578937521>
Date: Fri, 6 Mar 2015 22:40:27 +0000
Subject: [PATCH]         * Source/NSCollectionView.m (+initialize): Add
 binding for         content.         * Source/NSViewController.m (-loadView):
 Don't try to load the         view if there is no name for the NIB.         *
 Source/NSArrayController.m (-initWithContent:): Sets        
 automaticallyRearrangesObjects to true.

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/gui/trunk@38384 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog                  | 8 ++++++++
 Source/NSArrayController.m | 1 +
 Source/NSCollectionView.m  | 7 ++++++-
 Source/NSViewController.m  | 2 +-
 4 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 60a54dd28..d5c0364f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2015-03-06 Fred Kiefer <FredKiefer@gmx.de>
+
+	* Source/NSCollectionView.m (+initialize): Add binding for content.
+	* Source/NSViewController.m (-loadView): Don't try to load the
+	view if there is no name for the NIB.
+	* Source/NSArrayController.m (-initWithContent:): Sets
+	automaticallyRearrangesObjects to true.
+
 2015-03-05 Fred Kiefer <FredKiefer@gmx.de>
 
 	* Source/NSCollectionView.m (-drawRect:): Work around strange
diff --git a/Source/NSArrayController.m b/Source/NSArrayController.m
index 25cb62c86..4e96a4468 100644
--- a/Source/NSArrayController.m
+++ b/Source/NSArrayController.m
@@ -55,6 +55,7 @@
 {
   if ((self = [super initWithContent: content]) != nil)
     {
+      [self setAutomaticallyRearrangesObjects: YES];
       [self rearrangeObjects];
       [self setSelectsInsertedObjects: YES];
     }
diff --git a/Source/NSCollectionView.m b/Source/NSCollectionView.m
index f339cb425..936076544 100644
--- a/Source/NSCollectionView.m
+++ b/Source/NSCollectionView.m
@@ -37,6 +37,7 @@
 #import "AppKit/NSEvent.h"
 #import "AppKit/NSGraphics.h"
 #import "AppKit/NSImage.h"
+#import "AppKit/NSKeyValueBinding.h"
 #import "AppKit/NSPasteboard.h"
 #import "AppKit/NSWindow.h"
 
@@ -94,7 +95,11 @@ static NSString *placeholderItem = nil;
 //
 + (void) initialize
 {
-  placeholderItem = @"Placeholder";
+  if (self == [NSCollectionView class])
+    {
+      placeholderItem = @"Placeholder";
+      [self exposeBinding: NSContentBinding];
+    }
 }
 
 - (id) initWithFrame: (NSRect)frame
diff --git a/Source/NSViewController.m b/Source/NSViewController.m
index 76ac1f0d2..47a871a19 100644
--- a/Source/NSViewController.m
+++ b/Source/NSViewController.m
@@ -108,7 +108,7 @@
 {
   NSNib *nib;
 
-  if (_vcFlags.nib_is_loaded)
+  if (_vcFlags.nib_is_loaded || ([self nibName] == nil))
     {
       return;
     }