Update changelog

ChangeLog

@@ -10,6 +10,15 @@
 	* Source/NSLayoutConstraint.m: Layout constraint.
 	* Source/NSLayoutGuide.m: Constraints guide implementation.
 
+2020-05-10 Fred Kiefer <FredKiefer@gmx.de>
+
+	* Source/GSXib5KeyedUnarchiver.m: Clean up NSPathCell decoding.
+
+2020-05-09 Fred Kiefer <FredKiefer@gmx.de>
+
+	* Source/NSStringDrawing.m: Initialize all the cache entries as
+	not used.
+
 2020-05-09 Gregory John Casamento <greg.casamento@gmail.com>
 
 	* Source/NSPersistentDocument.[hm]: Add implementation of abstract

Source/GSXib5KeyedUnarchiver.m

@@ -48,7 +48,6 @@
 #import "AppKit/NSNib.h"
 #import "AppKit/NSParagraphStyle.h"
 #import "AppKit/NSPathCell.h"
-#import "AppKit/NSPathComponentCell.h"
 #import "AppKit/NSPopUpButton.h"
 #import "AppKit/NSPopUpButtonCell.h"
 #import "AppKit/NSScroller.h"
@@ -157,10 +156,6 @@ static NSString *ApplicationClass = nil;
 
 @end
 
-@interface NSPathCell (Private)
-+ (NSArray *) _generateCellsForURL: (NSURL *)url;
-@end
-
 @implementation GSXib5KeyedUnarchiver
 
 static NSDictionary *XmlTagToObjectClassMap = nil;
@@ -212,6 +207,7 @@ static NSArray      *XmlBoolDefaultYes  = nil;
                             @"NSWindowTemplate", @"window",
                             @"NSView", @"tableCellView",
                             @"IBUserDefinedRuntimeAttribute5", @"userDefinedRuntimeAttribute",
+                            @"NSURL", @"url",
                             nil];
           RETAIN(XmlTagToObjectClassMap);
 
@@ -279,6 +275,7 @@ static NSArray      *XmlBoolDefaultYes  = nil;
                                            @"implicitItemIdentifier", @"NSToolbarItemIdentifier",
                                            @"bordered", @"NSIsBordered",
                                            @"altersStateOfSelectedItem", @"NSAltersState",
+                                           @"string", @"NS.relative",
                                            nil];
           RETAIN(XmlKeyMapTable);
 
@@ -2202,8 +2199,7 @@ didStartElement: (NSString*)elementName
     }
   else if ([class isSubclassOfClass: [NSPathCell class]])
     {
-      GSXibElement *el = [element elementForKey: @"url"];
-      object = [NSURL URLWithString: [el attributeForKey: @"string"]];
+      object = [self decodeObjectForKey: @"url"];
     }
   else
     {
@@ -3204,7 +3200,6 @@ didStartElement: (NSString*)elementName
         {
           hasValue  = [currentElement attributeForKey: @"title"] != nil;
           hasValue |= [currentElement attributeForKey: @"image"] != nil;
-          hasValue |= [currentElement attributeForKey: @"string"] != nil;
         }
       else if ([@"NSControlContents" isEqualToString: key])
         {

Source/NSPathCell.m

@@ -220,12 +220,11 @@ static Class pathComponentCellClass;
 
 - (void) drawInteriorWithFrame: (NSRect)frame inView: (NSView *)controlView
 {
-  NSUInteger count = [_pathComponentCells count];
+  NSEnumerator *en = [_pathComponentCells objectEnumerator];
+  NSPathComponentCell *cell = nil;
 
   [super drawInteriorWithFrame: frame
                         inView: controlView];
-  NSEnumerator *en = [_pathComponentCells objectEnumerator];
-  NSPathComponentCell *cell = nil;
   
   while ((cell = (NSPathComponentCell *)[en nextObject]) != nil)
     {

Source/NSStringDrawing.m

@@ -126,7 +126,8 @@ static void init_string_drawing(void)
       [textContainer setLineFragmentPadding: 0];
       [layoutManager addTextContainer: textContainer];
       [textContainer release];
-      
+
+      cache[i].used = 0;
       cache[i].textStorage = textStorage;
       cache[i].layoutManager = layoutManager;
       cache[i].textContainer = textContainer;