From 4429fa9d7634699bc6bd2d0dc55bb9791114f27f Mon Sep 17 00:00:00 2001 From: "sfraser%netscape.com" Date: Tue, 2 Jul 2002 05:58:38 +0000 Subject: [PATCH] Fixing signage of the chromeMask flag, and putting an unused function inside the QUICKTIME_THROBBER #ifdef --- camino/BrowserWindowController.h | 5 +++-- camino/BrowserWindowController.mm | 12 +++++++++--- camino/src/browser/BrowserWindowController.h | 5 +++-- camino/src/browser/BrowserWindowController.mm | 12 +++++++++--- chimera/BrowserWindowController.h | 5 +++-- chimera/BrowserWindowController.mm | 12 +++++++++--- chimera/src/browser/BrowserWindowController.h | 5 +++-- chimera/src/browser/BrowserWindowController.mm | 12 +++++++++--- 8 files changed, 48 insertions(+), 20 deletions(-) diff --git a/camino/BrowserWindowController.h b/camino/BrowserWindowController.h index 1abb4b80f30..be628435748 100644 --- a/camino/BrowserWindowController.h +++ b/camino/BrowserWindowController.h @@ -134,7 +134,7 @@ class nsIDOMNode; // be returned to its original position when the drawer closes. NSRect mCachedFrameAfterDrawerOpen; - int mChromeMask; // Indicates which parts of the window to show (e.g., don't show toolbars) + unsigned int mChromeMask; // Indicates which parts of the window to show (e.g., don't show toolbars) // Context menu members. int mContextMenuFlags; @@ -215,7 +215,8 @@ class nsIDOMNode; -(void)autosaveWindowFrame; -(void)disableAutosave; --(void)setChromeMask:(int)aMask; +-(void)setChromeMask:(unsigned int)aMask; +-(unsigned int)chromeMask; -(id)getAddBookmarkSheetWindow; -(id)getAddBookmarkTitle; diff --git a/camino/BrowserWindowController.mm b/camino/BrowserWindowController.mm index 32f464fc304..5c551b8846c 100644 --- a/camino/BrowserWindowController.mm +++ b/camino/BrowserWindowController.mm @@ -1031,11 +1031,16 @@ static NSString *SearchToolbarItemIdentifier = @"Search Toolbar Item"; [mSidebarTabView selectFirstTabViewItem:self]; } --(void)setChromeMask:(int)aMask +-(void)setChromeMask:(unsigned int)aMask { mChromeMask = aMask; } +-(unsigned int)chromeMask +{ + return mChromeMask; +} + -(void) biggerTextSize { nsCOMPtr contentWindow = getter_AddRefs([[mBrowserView getBrowserView] getContentWindow]); @@ -1351,7 +1356,9 @@ static NSString *SearchToolbarItemIdentifier = @"Search Toolbar Item"; [toolbarItem setImage: [mImages objectAtIndex: mFrame]]; } +#define QUICKTIME_THROBBER 0 +#if QUICKTIME_THROBBER static Boolean movieControllerFilter(MovieController mc, short action, void *params, long refCon) { if (action == mcActionMovieClick || action == mcActionMouseDown) { @@ -1361,8 +1368,7 @@ static Boolean movieControllerFilter(MovieController mc, short action, void *par } return false; } - -#define QUICKTIME_THROBBER 0 +#endif - (void)startThrobber { diff --git a/camino/src/browser/BrowserWindowController.h b/camino/src/browser/BrowserWindowController.h index 1abb4b80f30..be628435748 100644 --- a/camino/src/browser/BrowserWindowController.h +++ b/camino/src/browser/BrowserWindowController.h @@ -134,7 +134,7 @@ class nsIDOMNode; // be returned to its original position when the drawer closes. NSRect mCachedFrameAfterDrawerOpen; - int mChromeMask; // Indicates which parts of the window to show (e.g., don't show toolbars) + unsigned int mChromeMask; // Indicates which parts of the window to show (e.g., don't show toolbars) // Context menu members. int mContextMenuFlags; @@ -215,7 +215,8 @@ class nsIDOMNode; -(void)autosaveWindowFrame; -(void)disableAutosave; --(void)setChromeMask:(int)aMask; +-(void)setChromeMask:(unsigned int)aMask; +-(unsigned int)chromeMask; -(id)getAddBookmarkSheetWindow; -(id)getAddBookmarkTitle; diff --git a/camino/src/browser/BrowserWindowController.mm b/camino/src/browser/BrowserWindowController.mm index 32f464fc304..5c551b8846c 100644 --- a/camino/src/browser/BrowserWindowController.mm +++ b/camino/src/browser/BrowserWindowController.mm @@ -1031,11 +1031,16 @@ static NSString *SearchToolbarItemIdentifier = @"Search Toolbar Item"; [mSidebarTabView selectFirstTabViewItem:self]; } --(void)setChromeMask:(int)aMask +-(void)setChromeMask:(unsigned int)aMask { mChromeMask = aMask; } +-(unsigned int)chromeMask +{ + return mChromeMask; +} + -(void) biggerTextSize { nsCOMPtr contentWindow = getter_AddRefs([[mBrowserView getBrowserView] getContentWindow]); @@ -1351,7 +1356,9 @@ static NSString *SearchToolbarItemIdentifier = @"Search Toolbar Item"; [toolbarItem setImage: [mImages objectAtIndex: mFrame]]; } +#define QUICKTIME_THROBBER 0 +#if QUICKTIME_THROBBER static Boolean movieControllerFilter(MovieController mc, short action, void *params, long refCon) { if (action == mcActionMovieClick || action == mcActionMouseDown) { @@ -1361,8 +1368,7 @@ static Boolean movieControllerFilter(MovieController mc, short action, void *par } return false; } - -#define QUICKTIME_THROBBER 0 +#endif - (void)startThrobber { diff --git a/chimera/BrowserWindowController.h b/chimera/BrowserWindowController.h index 1abb4b80f30..be628435748 100644 --- a/chimera/BrowserWindowController.h +++ b/chimera/BrowserWindowController.h @@ -134,7 +134,7 @@ class nsIDOMNode; // be returned to its original position when the drawer closes. NSRect mCachedFrameAfterDrawerOpen; - int mChromeMask; // Indicates which parts of the window to show (e.g., don't show toolbars) + unsigned int mChromeMask; // Indicates which parts of the window to show (e.g., don't show toolbars) // Context menu members. int mContextMenuFlags; @@ -215,7 +215,8 @@ class nsIDOMNode; -(void)autosaveWindowFrame; -(void)disableAutosave; --(void)setChromeMask:(int)aMask; +-(void)setChromeMask:(unsigned int)aMask; +-(unsigned int)chromeMask; -(id)getAddBookmarkSheetWindow; -(id)getAddBookmarkTitle; diff --git a/chimera/BrowserWindowController.mm b/chimera/BrowserWindowController.mm index 32f464fc304..5c551b8846c 100644 --- a/chimera/BrowserWindowController.mm +++ b/chimera/BrowserWindowController.mm @@ -1031,11 +1031,16 @@ static NSString *SearchToolbarItemIdentifier = @"Search Toolbar Item"; [mSidebarTabView selectFirstTabViewItem:self]; } --(void)setChromeMask:(int)aMask +-(void)setChromeMask:(unsigned int)aMask { mChromeMask = aMask; } +-(unsigned int)chromeMask +{ + return mChromeMask; +} + -(void) biggerTextSize { nsCOMPtr contentWindow = getter_AddRefs([[mBrowserView getBrowserView] getContentWindow]); @@ -1351,7 +1356,9 @@ static NSString *SearchToolbarItemIdentifier = @"Search Toolbar Item"; [toolbarItem setImage: [mImages objectAtIndex: mFrame]]; } +#define QUICKTIME_THROBBER 0 +#if QUICKTIME_THROBBER static Boolean movieControllerFilter(MovieController mc, short action, void *params, long refCon) { if (action == mcActionMovieClick || action == mcActionMouseDown) { @@ -1361,8 +1368,7 @@ static Boolean movieControllerFilter(MovieController mc, short action, void *par } return false; } - -#define QUICKTIME_THROBBER 0 +#endif - (void)startThrobber { diff --git a/chimera/src/browser/BrowserWindowController.h b/chimera/src/browser/BrowserWindowController.h index 1abb4b80f30..be628435748 100644 --- a/chimera/src/browser/BrowserWindowController.h +++ b/chimera/src/browser/BrowserWindowController.h @@ -134,7 +134,7 @@ class nsIDOMNode; // be returned to its original position when the drawer closes. NSRect mCachedFrameAfterDrawerOpen; - int mChromeMask; // Indicates which parts of the window to show (e.g., don't show toolbars) + unsigned int mChromeMask; // Indicates which parts of the window to show (e.g., don't show toolbars) // Context menu members. int mContextMenuFlags; @@ -215,7 +215,8 @@ class nsIDOMNode; -(void)autosaveWindowFrame; -(void)disableAutosave; --(void)setChromeMask:(int)aMask; +-(void)setChromeMask:(unsigned int)aMask; +-(unsigned int)chromeMask; -(id)getAddBookmarkSheetWindow; -(id)getAddBookmarkTitle; diff --git a/chimera/src/browser/BrowserWindowController.mm b/chimera/src/browser/BrowserWindowController.mm index 32f464fc304..5c551b8846c 100644 --- a/chimera/src/browser/BrowserWindowController.mm +++ b/chimera/src/browser/BrowserWindowController.mm @@ -1031,11 +1031,16 @@ static NSString *SearchToolbarItemIdentifier = @"Search Toolbar Item"; [mSidebarTabView selectFirstTabViewItem:self]; } --(void)setChromeMask:(int)aMask +-(void)setChromeMask:(unsigned int)aMask { mChromeMask = aMask; } +-(unsigned int)chromeMask +{ + return mChromeMask; +} + -(void) biggerTextSize { nsCOMPtr contentWindow = getter_AddRefs([[mBrowserView getBrowserView] getContentWindow]); @@ -1351,7 +1356,9 @@ static NSString *SearchToolbarItemIdentifier = @"Search Toolbar Item"; [toolbarItem setImage: [mImages objectAtIndex: mFrame]]; } +#define QUICKTIME_THROBBER 0 +#if QUICKTIME_THROBBER static Boolean movieControllerFilter(MovieController mc, short action, void *params, long refCon) { if (action == mcActionMovieClick || action == mcActionMouseDown) { @@ -1361,8 +1368,7 @@ static Boolean movieControllerFilter(MovieController mc, short action, void *par } return false; } - -#define QUICKTIME_THROBBER 0 +#endif - (void)startThrobber {