Merge conflic fixes

ChangeLog

@@ -1,4 +1,4 @@
-2024-06-30 Gregory John Casamento <greg.casamento@gmail.com>
+2024-08-18 Gregory John Casamento <greg.casamento@gmail.com>
 
 	* Headers/AppKit/NSTreeController.h: Update header
 	* Headers/AppKit/NSTreeNode.h: Update header
@@ -16,6 +16,13 @@
 	* Source/NSTreeController.m: Implement new methods.
 	* Source/NSTreeNode.m: Implement new methods
 
+2024-07-25 Gregory John Casamento <greg.casamento@gmail.com>
+
+	* Headers/AppKit/NSBrowser.h: Add declarations for
+	10.6 delegate methods for item-based browsers.
+	* Source/NSBrowser.m: Add support for 10.6 item-based
+	delegate methods.
+
 2024-06-28 Gregory John Casamento <greg.casamento@gmail.com>
 
 	* Headers/AppKit/AppKit.h: Add NSMenuToolbarItem.h

Headers/AppKit/NSBrowser.h

@@ -42,7 +42,7 @@
 @class NSEvent;
 @class NSMatrix;
 @class NSScroller;
-//@class NSBox;
+@class NSViewController;
 
 #if OS_API_VERSION(MAC_OS_X_VERSION_10_3, GS_API_LATEST)
 enum _NSBrowserColumnResizingType
@@ -62,7 +62,6 @@ APPKIT_EXPORT_CLASS
   Class _browserMatrixClass;
   NSString *_pathSeparator;
   
-  //NSBox *_horizontalScrollerBox;
   NSScroller *_horizontalScroller;
   NSTimeInterval _lastKeyPressed;
   NSString *_charBuffer;
@@ -99,6 +98,8 @@ APPKIT_EXPORT_CLASS
   int _lastVisibleColumn;
   NSString *_columnsAutosaveName;
   NSBrowserColumnResizingType _columnResizing;
+
+  BOOL _itemBasedDelegate;
 }
 
 //
@@ -355,6 +356,31 @@ canDragRowsWithIndexes: (NSIndexSet *)rowIndexes
         inColumn: (NSInteger)column
        withEvent: (NSEvent *)event;
 #endif
+#if OS_API_VERSION(MAC_OS_X_VERSION_10_6, GS_API_LATEST)
+- (NSInteger) browser: (NSBrowser *)browser
+numberOfChildrenOfItem: (id)item;
+- (id) browser: (NSBrowser *)browser
+         child: (NSInteger)index
+        ofItem: (id)item;
+- (BOOL) browser: (NSBrowser *)browser
+      isLeafItem: (id)item;
+- (BOOL) browser: (NSBrowser *)browser
+  shouldEditItem: (id)item;
+- (id) browser: (NSBrowser *)browser
+objectValueForItem: (id)item;
+- (id) browser: (NSBrowser *)browser
+setObjectValue: (id)object
+       forItem: (id)item;
+- (id) rootItemForBrowser: (NSBrowser *)browser;
+- (NSViewController *) browser: (NSBrowser *)browser
+previewViewControllerForLeafItem: (id)item;
+- (NSViewController *) browser: (NSBrowser *)browser
+   headerViewControllerForItem: (id)item;
+- (void) browser: (NSBrowser *)browser
+didChangeLastColumn: (NSInteger)oldLastColumn
+        toColumn: (NSInteger)column;
+#endif
+
 @end
 
 #if OS_API_VERSION(MAC_OS_X_VERSION_10_3, GS_API_LATEST)