Merges from the testplant branch for NSTabView, GSXibLoader.

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

ChangeLog

@@ -1,3 +1,9 @@
+2012-10-07 02:12-EDT Gregory John Casamento <greg.casamento@gmail.com>
+
+	* Headers/AppKit/NSTabView.h
+	* Source/GSXibLoader.m
+	* Source/NSTabView.m: Merge changes from TestPlant branch
+
 2012-10-06  Wolfgang Lux  <wolfgang.lux@gmail.com>
 
 	* Source/NSWindow.m (-_checkTrackingRectangles:forEvent:):
@@ -12,6 +18,7 @@
 	* Source/GSToolTips.m (GSTTProvider): Remove view rectangles from
 	GSTTProvider class. They are no longer used.
 
+>>>>>>> .r35660
 2012-10-04  Wolfgang Lux  <wolfgang.lux@gmail.com>
 
 	Improve keyboard navigation by automatically computing a key view

Headers/AppKit/NSTabView.h

@@ -54,8 +54,8 @@ typedef enum {
   BOOL _draws_background;
   BOOL _truncated_label;
   id _delegate;
-  NSUInteger _selected_item;
   NSView *_original_nextKeyView;
+  NSUInteger _selected_item;
 }
 - (void)addTabViewItem:(NSTabViewItem *)tabViewItem;
 - (void)insertTabViewItem:(NSTabViewItem *)tabViewItem

Source/GSXibLoader.m

@@ -55,7 +55,9 @@
 @end
 
 @interface NSCustomObject (NibCompatibility)
+- (id) realObject;
 - (void) setRealObject: (id)obj;
+- (NSString *)className;
 @end
 
 @interface NSNibConnector (NibCompatibility)
@@ -841,6 +843,19 @@
   id obj;
   NSMutableArray *topLevelObjects = [context objectForKey: NSNibTopLevelObjects];
   id owner = [context objectForKey: NSNibOwner];
+  id first = nil;
+  id app   = [(NSCustomObject*)[rootObjects objectAtIndex: 2] realObject];
+  
+  // Get the file's owner and NSApplication object references...
+  if ([[(NSCustomObject*)[rootObjects objectAtIndex: 1] className] isEqualToString: @"FirstResponder"])
+    first = [(NSCustomObject*)[rootObjects objectAtIndex: 1] realObject];
+  else
+    NSLog(@"%s:first responder missing\n", __PRETTY_FUNCTION__);
+
+  if ([[(NSCustomObject*)[rootObjects objectAtIndex: 2] className] isEqualToString: @"NSApplication"])
+    app = [(NSCustomObject*)[rootObjects objectAtIndex: 2] realObject];
+  else
+    NSLog(@"%s:NSApplication missing\n", __PRETTY_FUNCTION__);
 
   // Use the owner as first root object
   [(NSCustomObject*)[rootObjects objectAtIndex: 0] setRealObject: owner];
@@ -858,6 +873,8 @@
           // All top level objects must be released by the caller to avoid
           // leaking, unless they are going to be released by other nib
           // objects on behalf of the owner.
+          // IGNORE file's owner, first responder and NSApplication instances...
+          if ((obj != owner) && (obj != first) && (obj != app))
             RETAIN(obj);
         }
 
@@ -1175,8 +1192,14 @@
 - (id) initForReadingWithData: (NSData*)data
 {
   NSXMLParser *theParser;
+  NSData *theData = data;
 
-  NSData *theData = [self _preProcessXib: data];
+  // If we are in the interface builder app, do not replace
+  // the existing classes with their custom subclasses.
+  if([NSClassSwapper isInInterfaceBuilder] == NO)
+    {
+      theData = [self _preProcessXib: data];
+    }
 
   objects = [[NSMutableDictionary alloc] init];
   stack = [[NSMutableArray alloc] init];

Source/NSTabView.m

@@ -49,6 +49,7 @@
 - (NSView *) _lastKeyView;
 @end
 
+
 @implementation NSTabView
 
 /*
@@ -76,8 +77,7 @@
       // setup variables  
       ASSIGN(_items, [NSMutableArray array]);
       ASSIGN(_font, [NSFont systemFontOfSize: 0]);
-      _selected_item = NSNotFound;
+      _selected = nil;
-      //_selected = nil;
       //_truncated_label = NO;
     }
 
@@ -112,13 +112,15 @@
 - (void) insertTabViewItem: (NSTabViewItem*)tabViewItem
                    atIndex: (NSInteger)index
 {
+  if (tabViewItem == nil)
+    return;
+  
   [tabViewItem _setTabView: self];
   [_items insertObject: tabViewItem atIndex: index];
   
-  if ((_selected_item != NSNotFound) && (index <= _selected_item))
+  // If this is the first inserted then select it...
-    {
+  if ([_items count] == 1)
-      _selected_item++;
+    [self selectTabViewItem: tabViewItem];
-    }
 
   if ([_delegate respondsToSelector:
     @selector(tabViewDidChangeNumberOfTabViewItems:)])
@@ -132,35 +134,33 @@
 
 - (void) removeTabViewItem: (NSTabViewItem*)tabViewItem
 {
-  NSUInteger i = [_items indexOfObject: tabViewItem];
+  NSUInteger i = [self indexOfTabViewItem: tabViewItem];
   
   if (i == NSNotFound)
     return;
 
-  if ([tabViewItem isEqual: _selected])
+  // Do this BEFORE removing from array...in case it gets released...
-    {
+  [tabViewItem _setTabView:nil];
-      // We cannot call [self selectTabViewItem: nil] here as the delegate might refuse this
-      [[_selected view] removeFromSuperview];
-      _selected = nil;
-      _selected_item = NSNotFound;
-    }
-
   [_items removeObjectAtIndex: i];
 
-  if ((_selected_item != NSNotFound) && (i <= _selected_item))
+  if (tabViewItem == _selected)
     {
-      _selected_item--;
+      if ([_items count] == 0)
+        {
+          [self selectTabViewItem: nil];
+        }
+      else
+        {
+          // Select a new tab index...
+          NSUInteger newIndex = ((i < [_items count]) ? i : (i-1));
+          [self selectTabViewItem: [_items objectAtIndex: newIndex]];
+        }
     }
   
-  if ([_delegate respondsToSelector: 
+  if ([_delegate respondsToSelector: @selector(tabViewDidChangeNumberOfTabViewItems:)])
-    @selector(tabViewDidChangeNumberOfTabViewItems:)])
     {
       [_delegate tabViewDidChangeNumberOfTabViewItems: self];
     }
-
-  /* TODO (Optimize) - just mark the tabs rect as needing redisplay unless
-                       removed tab was selected */
-  [self setNeedsDisplay: YES];
 }
 
 - (NSInteger) indexOfTabViewItem: (NSTabViewItem*)tabViewItem
@@ -211,42 +211,43 @@
 
 - (void) selectNextTabViewItem: (id)sender
 {
-  if ((_selected_item != NSNotFound) && ((_selected_item + 1) < [_items count]))
+  NSUInteger selected_item = [self indexOfTabViewItem:_selected];
+  if (selected_item != NSNotFound)
     {
-      [self selectTabViewItemAtIndex: _selected_item + 1];
+      [self selectTabViewItemAtIndex: selected_item + 1];
     }
 }
 
 - (void) selectPreviousTabViewItem: (id)sender
 {
-  if ((_selected_item != NSNotFound) && (_selected_item > 0))
+  NSUInteger selected_item = [self indexOfTabViewItem:_selected];
+  if (selected_item != NSNotFound)
     {
-      [self selectTabViewItemAtIndex: _selected_item - 1];
+      [self selectTabViewItemAtIndex: selected_item - 1];
     }
 }
 
 - (NSTabViewItem*) selectedTabViewItem
 {
-  // FIXME: Why not just return _selected?
+  return _selected;
-  if (_selected_item == NSNotFound || [_items count] == 0)
-    return nil;
-  return [_items objectAtIndex: _selected_item];
 }
 
 - (void) selectTabViewItem: (NSTabViewItem*)tabViewItem
 {
   BOOL canSelect = YES;
+  NSView *selectedView = nil;
 
-  if ([_delegate respondsToSelector: 
+  if ([_delegate respondsToSelector: @selector(tabView: shouldSelectTabViewItem:)])
-    @selector(tabView: shouldSelectTabViewItem:)])
     {
-      canSelect = [_delegate tabView: self
+      canSelect = [_delegate tabView: self shouldSelectTabViewItem: tabViewItem];
-                shouldSelectTabViewItem: tabViewItem];
     }
   
   if (canSelect)
     {
-      NSView *selectedView;
+      if ([_delegate respondsToSelector: @selector(tabView: willSelectTabViewItem:)])
+        {
+          [_delegate tabView: self willSelectTabViewItem: tabViewItem];
+        }
       
       if (_selected != nil)
         {
@@ -255,6 +256,7 @@
           /* NB: If [_selected view] is nil this does nothing, which
              is fine.  */
           [[_selected view] removeFromSuperview];
+	  _selected = nil;
         }
 
       if ([_delegate respondsToSelector: 
@@ -507,11 +509,9 @@
   
   if (anItem != nil  &&  ![anItem isEqual: _selected])
     {
-      GSKeyValueBinding *theBinding;
-
       [self selectTabViewItem: anItem];
 
-      theBinding = [GSKeyValueBinding getBinding: NSSelectedIndexBinding 
+      GSKeyValueBinding *theBinding = [GSKeyValueBinding getBinding: NSSelectedIndexBinding
                                                           forObject: self];
       if (theBinding != nil)
         [theBinding reverseSetValueFor: NSSelectedIndexBinding];
@@ -565,13 +565,14 @@
     }
   else
     {
+      NSUInteger selected_item = [self indexOfTabViewItem:_selected];
       [aCoder encodeObject: _items];
       [aCoder encodeObject: _font];
       [aCoder encodeValueOfObjCType: @encode(int) at: &_type];
       [aCoder encodeValueOfObjCType: @encode(BOOL) at: &_draws_background];
       [aCoder encodeValueOfObjCType: @encode(BOOL) at: &_truncated_label];
       [aCoder encodeConditionalObject: _delegate];
-      [aCoder encodeValueOfObjCType: @encode(NSUInteger) at: &_selected_item];
+      [aCoder encodeValueOfObjCType: @encode(NSUInteger) at: &selected_item];
     }
 }
 
@@ -579,8 +580,6 @@
 {
   self = [super initWithCoder: aDecoder];
 
-  _selected_item = NSNotFound;
-
   if ([aDecoder allowsKeyedCoding])
     {
       if ([aDecoder containsValueForKey: @"NSAllowTruncatedLabels"])
@@ -654,17 +653,21 @@
       [aDecoder decodeValueOfObjCType: @encode(BOOL) at: &_draws_background];
       [aDecoder decodeValueOfObjCType: @encode(BOOL) at: &_truncated_label];
       _delegate = [aDecoder decodeObject];
+      
+      NSUInteger selected_item = NSNotFound;
       if (version < 3)
         {
           int tmp;
           [aDecoder decodeValueOfObjCType: @encode(int) at: &tmp];
-          _selected_item = tmp;
+          selected_item = tmp;
         }
       else
       {
-          [aDecoder decodeValueOfObjCType: @encode(NSUInteger) at: &_selected_item];
+        [aDecoder decodeValueOfObjCType: @encode(NSUInteger) at: &selected_item];
       }
-      _selected = [_items objectAtIndex: _selected_item];
+      
+      if (selected_item != NSNotFound)
+        _selected = [_items objectAtIndex: selected_item];
     }
   return self;
 }