* Headers/AppKit/NSKeyValueBinding.h,

* Source/externs.m: Additional binding name
        * NSContentValuesBinding.
        * Source/NSPopUpButton.m: Add KVB for NSContentValuesBinding.
        Patch by Marcian Lytwyn <marcian.lytwyn@advcsi.com>
        * Source/NSArrayController.m: Encode/decode
        * clearsFilterPredicateOnInsertion.



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

ChangeLog

@@ -1,3 +1,11 @@
+2013-04-15  Fred Kiefer <FredKiefer@gmx.de>
+
+	* Headers/AppKit/NSKeyValueBinding.h,
+	* Source/externs.m: Additional binding name NSContentValuesBinding.
+	* Source/NSPopUpButton.m: Add KVB for NSContentValuesBinding.
+	Patch by Marcian Lytwyn <marcian.lytwyn@advcsi.com>
+	* Source/NSArrayController.m: Encode/decode clearsFilterPredicateOnInsertion.
+
 2013-04-06  Eric Wasylishen <ewasylishen@gmail.com>
 
 	* Source/GSTheme.m:

Headers/AppKit/NSKeyValueBinding.h

@@ -106,6 +106,7 @@ APPKIT_EXPORT NSString *NSAlignmentBinding;
 APPKIT_EXPORT NSString *NSContentArrayBinding;
 APPKIT_EXPORT NSString *NSContentBinding;
 APPKIT_EXPORT NSString *NSContentObjectBinding;
+APPKIT_EXPORT NSString *NSContentValuesBinding;
 APPKIT_EXPORT NSString *NSEditableBinding;
 APPKIT_EXPORT NSString *NSEnabledBinding;
 APPKIT_EXPORT NSString *NSFontBinding;

Source/NSArrayController.m

@@ -287,32 +287,32 @@
   _acflags.preserves_selection = flag;
 }
 
-- (BOOL) alwaysUsesMultipleValuesMarker;
+- (BOOL) alwaysUsesMultipleValuesMarker
 {
   return _acflags.always_uses_multiple_values_marker;
 }
 
-- (void) setAlwaysUsesMultipleValuesMarker: (BOOL)flag;
+- (void) setAlwaysUsesMultipleValuesMarker: (BOOL)flag
 {
   _acflags.always_uses_multiple_values_marker = flag;
 }
 
-- (BOOL) clearsFilterPredicateOnInsertion;
+- (BOOL) clearsFilterPredicateOnInsertion
 {
   return _acflags.clears_filter_predicate_on_insertion;
 }
 
-- (void) setClearsFilterPredicateOnInsertion: (BOOL)flag;
+- (void) setClearsFilterPredicateOnInsertion: (BOOL)flag
 {
   _acflags.clears_filter_predicate_on_insertion = flag;
 }
 
-- (BOOL) automaticallyRearrangesObjects;
+- (BOOL) automaticallyRearrangesObjects
 {
   return _acflags.automatically_rearranges_objects;
 }
 
-- (void) setAutomaticallyRearrangesObjects: (BOOL)flag;
+- (void) setAutomaticallyRearrangesObjects: (BOOL)flag
 {
   _acflags.automatically_rearranges_objects = flag;
 }
@@ -438,6 +438,8 @@ atArrangedObjectIndexes: (NSIndexSet*)idx
       [coder encodeBool: [self avoidsEmptySelection] forKey: @"NSAvoidsEmptySelection"];
       [coder encodeBool: [self preservesSelection] forKey: @"NSPreservesSelection"];
       [coder encodeBool: [self selectsInsertedObjects] forKey: @"NSSelectsInsertedObjects"];
+      [coder encodeBool: [self clearsFilterPredicateOnInsertion] forKey:
+               @"NSClearsFilterPredicateOnInsertion"];
     }
   else
     {
@@ -468,6 +470,11 @@ atArrangedObjectIndexes: (NSIndexSet*)idx
           [self setSelectsInsertedObjects: 
                 [coder decodeBoolForKey: @"NSSelectsInsertedObjects"]];
         }
+      if ([coder containsValueForKey: @"NSClearsFilterPredicateOnInsertion"])
+        {
+          [self setClearsFilterPredicateOnInsertion: 
+                [coder decodeBoolForKey: @"NSClearsFilterPredicateOnInsertion"]];
+        }
     }
   else
     {

Source/NSPopUpButton.m

@@ -67,6 +67,7 @@ Class _nspopupbuttonCellClass = 0;
       [self exposeBinding: NSSelectedIndexBinding];
       [self exposeBinding: NSSelectedObjectBinding];
       [self exposeBinding: NSSelectedTagBinding];
+      [self exposeBinding: NSContentValuesBinding];
    } 
 }
 
@@ -572,6 +573,11 @@ this to return nil to indicate that we have no context menu.
     {
       [self selectItemWithTag: [anObject intValue]];
     }
+  else if ([aKey isEqual: NSContentValuesBinding])
+    {
+      [self removeAllItems];
+      [self addItemsWithTitles: (NSArray*)anObject];
+    }
   else
     {
       [super setValue: anObject forKey: aKey];
@@ -592,6 +598,10 @@ this to return nil to indicate that we have no context menu.
     {
       return [NSNumber numberWithInt: [self selectedTag]];
     }
+  else if ([aKey isEqual: NSContentValuesBinding])
+    {
+      return [self itemTitles];
+    }
   else
     {
       return [super valueForKey: aKey];

Source/externs.m

@@ -682,6 +682,7 @@ NSString *NSAlignmentBinding = @"alignment";
 NSString *NSContentArrayBinding = @"contentArray";
 NSString *NSContentBinding = @"content";
 NSString *NSContentObjectBinding = @"contentObject";
+NSString *NSContentValuesBinding = @"contentValues";
 NSString *NSEditableBinding = @"editable";
 NSString *NSEnabledBinding = @"enabled";
 NSString *NSFontBinding = @"font";