Diff for /chimera/MyBrowserView.mm between versions 1.15 and 1.16

version 1.15, 2002/02/11 05:47:44 version 1.16, 2002/02/11 07:22:13
Line 40  static const char* ioServiceContractID = Line 40  static const char* ioServiceContractID =
   [browserView loadURI:[NSURL URLWithString:[urlbar stringValue]] flags:NSLoadFlagsNone];    [browserView loadURI:[NSURL URLWithString:[urlbar stringValue]] flags:NSLoadFlagsNone];
 }  }
   
   -(void)disconnectView
   {
       urlbar = nil;
       status = nil;
       progress = nil;
       progressSuper = nil;
       mIsPrimary = NO;
       [[NSNotificationCenter defaultCenter] removeObserver:self];
   }
   
   - (id)initWithFrame:(NSRect)frameRect
   {
       [super initWithFrame: frameRect];
        browserView = [[[NSBrowserView alloc] initWithFrame:[self bounds]] autorelease];
       [self addSubview:browserView];
       [browserView setContainer:self];
       [browserView addListener:self];
       mIsBusy = NO;
       return self;
   }
   
 -(void)makePrimaryBrowserView: (NSTabViewItem*)tab urlbar: (id)aUrlbar status: (id)aStatus  -(void)makePrimaryBrowserView: (NSTabViewItem*)tab urlbar: (id)aUrlbar status: (id)aStatus
     progress: (id)aProgress windowController: aWindowController      progress: (id)aProgress windowController: aWindowController
 {  {
Line 50  static const char* ioServiceContractID = Line 71  static const char* ioServiceContractID =
   progressSuper = [aProgress superview];    progressSuper = [aProgress superview];
   mWindowController = aWindowController;    mWindowController = aWindowController;
       
  [progress retain];  if (!mIsBusy) {
  [progress removeFromSuperview];    [progress retain];
    [progress removeFromSuperview];
   }
   
   defaultStatus = NULL;    defaultStatus = NULL;
   loadingStatus = DOCUMENT_DONE_STRING;    loadingStatus = DOCUMENT_DONE_STRING;
   [status setStringValue:loadingStatus];    [status setStringValue:loadingStatus];
       
   mIsBusy = NO;  
   mIsPrimary = YES;    mIsPrimary = YES;
     
   browserView = [[[NSBrowserView alloc] initWithFrame:[self bounds]] autorelease];  
   [self addSubview:browserView];  
   [browserView setContainer:self];  
   [browserView addListener:self];  
   
   nsCOMPtr<nsIIOService> ioService(do_GetService(ioServiceContractID));    nsCOMPtr<nsIIOService> ioService(do_GetService(ioServiceContractID));
   if (!ioService)    if (!ioService)
     return;      return;
Line 111  static const char* ioServiceContractID = Line 128  static const char* ioServiceContractID =
   [status setStringValue:loadingStatus];    [status setStringValue:loadingStatus];
   
   mIsBusy = YES;    mIsBusy = YES;
     [mTab setLabel: LOADING_STRING];
     
   if (mWindowController)    if (mWindowController)
     [mWindowController updateToolbarItems];      [mWindowController updateToolbarItems];
 }  }

Removed from v.1.15  
changed lines
  Added in v.1.16


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>