Before moving ContentDataSource into Content.xib. Big Split of BkmxDocWinCon working pretty good.

Author: jerrykrinock

SSWebBrowsing.m

@@ -65,7 +65,7 @@ + (NSString*)defaultBrowserDisplayName {
 		name = @"??" ;
 	}
 
-    // Memory leak fixed in BookMacster 1.16.5.  See LSGetApplicationForURL() doc.
+    // Memory leak fixed in BookMacster 1.17.  See LSGetApplicationForURL() doc.
     if (defaultBrowserURL) {
         CFRelease(defaultBrowserURL) ;
     }

SSYAboutPanelController.m

@@ -236,7 +236,7 @@ + (SSYAboutPanelController *) sharedInstance
     {
         sharedInstance = [[self alloc] init];
        [NSBundle loadNibNamed: @"SSYAboutPanel.nib"
-						owner: sharedInstance];
+						owner: sharedInstance] ;
     }
 
     return sharedInstance;

SSYCarbonSearcher.m

@@ -45,7 +45,7 @@ void CStringToUnicode(
 struct SearchInfo {
 	FSCatalogBulkParam searchPB ;  // Needed so we can back out of it using offsetof()
 	FSCatalogBulkParamPtr searchPB_p ; // Needed so we can dealloc it
-    FSIterator iterator ; // Needed so we can close it.  Added in BookMacster 1.16.5.
+    FSIterator iterator ; // Needed so we can close it.  Added in BookMacster 1.17.
 	UInt32 maxFindsGrandTotal ;
 	NSInteger maxIterations ;
 	BOOL runAsync ;
@@ -62,7 +62,7 @@ void CStringToUnicode(
 typedef struct SearchInfo SearchInfo ;
 
 void DisposeAndRelease(SearchInfo *searchInfo_p) {
-    // Memory leak fixed in BookMacster 1.16.5.  Without this, it definitely leaks…
+    // Memory leak fixed in BookMacster 1.17.  Without this, it definitely leaks…
     FSCloseIterator(searchInfo_p->iterator) ;
 
 
@@ -408,7 +408,7 @@ + (BOOL)catalogPathsForName:(NSString*)searchString
 		// Note: NewIOCompletionUPP() is just a silly macro that typecasts to IOCompletionUPP
 
 		SearchInfo* searchInfo_p = (SearchInfo*) NewPtrClear( sizeof(SearchInfo) );
-		searchInfo_p->iterator = iterator ; // Added in BookMacster 1.16.5
+		searchInfo_p->iterator = iterator ; // Added in BookMacster 1.17
 		searchInfo_p->paths = [[NSMutableArray alloc] init] ;
 		searchParams_p->searchName = (UniChar*) NewPtrClear(MAX_SEARCH_BYTES) ;
 		// I suppose that if we broke up CStringTo Unicode so that we could get a

SSYDocChildObject.m

@@ -37,6 +37,7 @@ - (id)initWithDocument:(BkmxDoc*)document_ {
 		[self setDocument:document_] ;
 	}
 
+    /*SSYDBL*/ NSLog(@"Initted %@", self) ;
 	return self;
 }
 

SSYDragDestinationTextView.m

@@ -12,6 +12,7 @@ - (void)awakeFromNib {
 
 	// Safely invoke super
 	[self safelySendSuperSelector:_cmd
+                   prettyFunction:__PRETTY_FUNCTION__
 						arguments:nil] ;
 }
 

SSYHierarchicalTabViewItem.h

@@ -25,24 +25,4 @@ extern NSString* const constDiscontiguousTabViewHierarchyString ;
  */
 - (NSTabViewItem*)selectedLeafmostTabViewItem ;
 
-/*
- @brief    Returns whether or not the receiver is selected, *and* all of its
- ancestor tab view items are selected, which means that the receiver should be
- actually visible.
- 
- @details  Unfortunately, because there is no way for a given view, which
- happens to be the 'view' of a tab view item, to access its "parent' tab view
- item, we cannot walk the hierarchy upward as we would like.  A tab view item
- can access its window, though, and a view can access its subviews.  So we start
- at the receiver's window and walk down.
- 
- Because of this walking down, this method will fail if the receiver's greatest
- ancestor tab view is directly a subview of the the receiver's window, or if
- any of its intermediate ancestor tab views are not directly a subview of the
- view of the parent tab view items.  If this condition occurs, this method will
- return NO and NSLog constDiscontiguousTabViewHierarchyString with the
- receiver's identifier appended.
- */
-- (BOOL)isDeeplySelected ;
-#warning The 'unfortunately' above is not true because -superview returns the tab view  (Not the item, but at least it's something)
 @end

SSYHierarchicalTabViewItem.m

@@ -2,42 +2,23 @@
 
 NSString* const constDiscontiguousTabViewHierarchyString = @"Discontiguous tab view hierarchy" ;
 
+@interface NSView (SSYTabSubviews)
 
-@implementation SSYHierarchicalTabViewItem
+- (NSTabViewItem*)deeplySelectedTabViewItem ;
 
-- (NSTabViewItem*)selectedChild {
+@end
+
+@implementation NSView (SSYTabSubviews)
+
+- (NSTabViewItem*)deeplySelectedTabViewItem {
     NSTabViewItem* selectedChild = nil ;
-    for (NSTabView* subview in [[self view] subviews]) {
-        if ([subview isKindOfClass:[NSTabView class]]) {
-            selectedChild = [subview selectedTabViewItem] ;
-            // Note that we consider only the *first* subview which is an
-            // NSTabView.  For this method to make sense, this must also be the
-            // *only* subview which is an NSTabViewItem.
-            break ;
-        }
+    if ([self respondsToSelector:@selector(selectedTabViewItem)]) {
+        // self is a tab view
+        selectedChild = [(NSTabView*)self selectedTabViewItem] ;
     }
-
-    //  The following code seems to have been a good guess.  That is,
-    //  it seems to work, but I haven't really thought it through.
-    //  The idea is that it can reach down to find a tab view through, I
-    //  think, one level of NSView subview.  I need this for the topTabView
-    //  in BookMacster.  This "feature" is not explained in the header doc.
-    if (!selectedChild) {
-        for (NSView* subview in [[self view] subviews]) {
-//          NSLog(@"2 Considering subview %@", subview) ;
-            if ([subview respondsToSelector:@selector(subviews)]) {
-                for (NSTabView* innerSubview in [subview subviews]) {
-//                  NSLog(@"3 Considering innerSubview %@", innerSubview) ;
-                    if ([innerSubview isKindOfClass:[NSTabView class]]) {
-                        selectedChild = [innerSubview selectedTabViewItem] ;
-                        // Note that we consider only the *first* subview which is an
-                        // NSTabView.  For this method to make sense, this must also be the
-                        // *only* subview which is an NSTabViewItem.
-                        break ;
-                    }
-                }
-            }
-            
+    else {
+       for (NSView* subview in [self subviews]) {
+            selectedChild = [subview deeplySelectedTabViewItem] ;
             if (selectedChild) {
                 break ;
             }
@@ -47,58 +28,37 @@ - (NSTabViewItem*)selectedChild {
     return selectedChild ;
 }
 
+
+@end
+
+@implementation SSYHierarchicalTabViewItem
+
+- (NSTabViewItem*)selectedChild {
+    NSTabViewItem* selectedChild = [[self view] deeplySelectedTabViewItem] ;
+
+    return selectedChild ;
+}
+
 - (NSTabViewItem*)selectedLeafmostTabViewItem {
     NSTabViewItem* leafItem = self ;
     NSTabViewItem* selectedChild = nil ;
-    do {
+   do {
         // This is in case the leaf item in a tree of SSYHierarchicalTabViewItem
         // objects is not itself a class descendant of
         // SSYHierarchicalTabViewItem.  It is also for safety,
         // in case someone sends this message to a tab view item
         // which is not or does not inherit from this class.
         if (![leafItem respondsToSelector:@selector(selectedChild)]) {
-            break ;
+          break ;
         }
 
         selectedChild = [(SSYHierarchicalTabViewItem*)leafItem selectedChild] ;
-        if ([selectedChild isKindOfClass:[NSTabViewItem class]]) {
+       if ([selectedChild isKindOfClass:[NSTabViewItem class]]) {
             leafItem = selectedChild ;
         }
     } while (selectedChild != nil) ;
 
     return leafItem ;
 }
 
-- (BOOL)isDeeplySelected {
-    NSView* view = [[[self view] window] contentView] ;
-    NSTabViewItem* tabViewItem = nil ;
-    BOOL answer = NO ;
-    while (view != nil) {
-        NSArray* subviews = [view subviews] ;
-        view = nil ;
-        for (NSTabView* tabView in subviews) {
-            // Of course, tabView is not necessarily an NSTabView.  Test it…
-            if ([tabView isKindOfClass:[NSTabView class]]) {
-                tabViewItem = [tabView selectedTabViewItem] ;
-                view = [tabViewItem view] ;
-                break ;
-            }
-        }
-        
-        if (tabViewItem == self) {
-            answer = YES ;
-            break ;
-        }
-        else if (!tabViewItem) {
-            NSLog(
-                  @"%@ : %@",
-                  constDiscontiguousTabViewHierarchyString,
-                  [self identifier]) ;
-        }
-    }
-    // NSLog(@"<< %s is returning %hhd for %@", __PRETTY_FUNCTION__, answer, [self identifier]) ;
-
-    return answer ;
-}
-
 @end

SSYLazyView.h

@@ -1,45 +1,74 @@
 #import <Cocoa/Cocoa.h>
 
-@class SSYExtrospectiveViewController ;
+/*
+ @brief    Notification which is posted when the payload view loads.
+ 
+ @details  The notification object is the window in which the SSYLazyView object
+ resides.  Note that the
+ loading of the payload, and hence the posting of this notification, occurs no
+ more than once during the lifetime of an SSYLazyView object.
+ */
+extern NSString* SSYLazyViewDidLoadPayloadNotification;
+
+/*
+ @brief    A companion to SSYLazyView; provides a method by which a tab view
+ item whose view is an instance of SSYLazyView can look down and see if their
+ view has been payloaded
+ */
+@interface NSTabViewItem (SSYLazyPayload)
+
+/*
+ @brief    If the receiver's view is an instance of SSYLazyView, returns 
+ that view's response to -isPayloaded; otherwise, returns YES
+ */
+- (BOOL)isViewPayloaded ;
+
+@end
 
 /*
- @details  
+ @brief    View which, upon being moved to a window for the first time, or
+ upon demand (-loadWithOwner:), removes all of its original subviews
+ ("placeholders") and adds a in their place a single "payload" view which it
+ loads from a designated nib
+ 
+ @details  When the receiver loads its nib as a result of being moved to a
+ window, the window controller of the window to which it was moved is assigned
+ as the file's owner of the nib.
  
  In the Xcode xib editor, you may have one or more initial placeholder subviews
  in your Lazy View.  For example, you may place a text field with large
  font size that says "Loading Stuff…".  All of these placeholder subviews
  will be removed when the new view is placed in.
  */
 @interface SSYLazyView : NSView {
-    SSYExtrospectiveViewController* m_viewController ;
-    BOOL m_isLoaded ;
+    BOOL m_isPayloaded ;
+    
+    // Needed in Mac OS X 10.8 or later…
+    NSArray* m_topLevelObjects ;
 }
 
-@property (retain) SSYExtrospectiveViewController* viewController ;
-@property (assign) BOOL isLoaded ;
+@property (assign) BOOL isPayloaded ;
 
 /*
- @brief    Returns the view controller class which will be instantiated
- when the receiver loads.
- 
- @details  The default implementation returns NSViewController.  Subclasses
- override this method to return the desired subclass of NSViewController.
- */
-+ (Class)lazyViewControllerClass ;
-
-/*
- @brief    Returns the name of the nib. without the .nib extension, which will
- be loaded and become the one and only subview of the receiver when it loads.
+ @brief    Returns the name of the nib, without the .nib extension, which will
+ be loaded and whose top-level view object become the one and only subview of
+ the receiver when the payload view loads.
  
  @details  The default implementation returns @"Internal Error 939-7834".
- Subclasses should override this method.
+ You must subclass this class and override this method.
  */
 + (NSString*)lazyNibName ;
 
 /*
  @brief    Creates the receiver's view controller and loads the receiver's
- view, or if these things have not already been done, no op.
+ view, or if these things have not already been done, no op
+ 
+ @details  This method is used to "manually" load the payload, before the
+ receiver is moved to a window.
+ 
+ @param    owner  The object which to assign as the File's Owner when the 
+ nib is loaded.
  */
-- (void)loadInWindow:(NSWindow*)window ;
+- (void)loadWithOwner:(id)owner ;
 
 @end