From de0e98511d4ea40dfb6dbfcd3d307a91a2137154 Mon Sep 17 00:00:00 2001 From: "pinkerton%netscape.com" Date: Wed, 29 Jul 1998 21:18:56 +0000 Subject: [PATCH] Removed Guide submenu (rev saari, appr sdagley) git-svn-id: svn://10.0.0.236/trunk@6775 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/cmd/macfe/central/CBookmarksAttachment.cp | 9 +++++---- mozilla/cmd/macfe/central/CBookmarksAttachment.h | 3 ++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/mozilla/cmd/macfe/central/CBookmarksAttachment.cp b/mozilla/cmd/macfe/central/CBookmarksAttachment.cp index cd20f9c9bbb..9633217f8ef 100644 --- a/mozilla/cmd/macfe/central/CBookmarksAttachment.cp +++ b/mozilla/cmd/macfe/central/CBookmarksAttachment.cp @@ -35,9 +35,6 @@ #include #include -#define PERM_BOOKMARK_ITEMS 4 - -const CommandT cmd_BookmarkHierItem = BOOKMARKS_MENU_BASE_LAST; LMenu *CBookmarksAttachment::sMenu = NULL; Boolean CBookmarksAttachment::sInvalidMenu = true; @@ -45,6 +42,8 @@ LArray CBookmarksAttachment::sMenusList; // this will use the default constructo HT_View CBookmarksAttachment::sQuickfileView = NULL; +const uint32 PERM_BOOKMARK_ITEMS = 2; +const CommandT cmd_BookmarkHierItem = BOOKMARKS_MENU_BASE_LAST; //=========================================================== @@ -384,7 +383,8 @@ void CBookmarksAttachment::InstallMenus() } StValueChanger okayToFail(gDebugThrow, debugAction_Nothing); currentMenuBar->InstallMenu(sMenu, InstallMenu_AtEnd); - +#if 0 +// no more Guide menu. Leave this here in case mktg wants to replace it with something (pinkerton). LMenu *directoryMenu = currentMenuBar->FetchMenu(cDirectoryMenuID); if (directoryMenu) @@ -394,6 +394,7 @@ void CBookmarksAttachment::InstallMenus() for (short index2 = CountMItems(directoryMenu->GetMacMenuH()); index2 > 0; --index2) directoryMenu->SetCommand(index2, DIR_MENU_BASE + index2 - 1); } +#endif } } } diff --git a/mozilla/cmd/macfe/central/CBookmarksAttachment.h b/mozilla/cmd/macfe/central/CBookmarksAttachment.h index f0485b3928f..375ddfac8ce 100644 --- a/mozilla/cmd/macfe/central/CBookmarksAttachment.h +++ b/mozilla/cmd/macfe/central/CBookmarksAttachment.h @@ -32,6 +32,7 @@ #include #include + /*********************************************************************************** * CBookmarksAttachment * Processes bookmark menu commands -- should be attached to application @@ -44,7 +45,6 @@ public: // ¥¥Êevents virtual void ExecuteSelf( MessageT inMessage, void* ioParam ); -// static void AddToBookmarks( BM_Entry* newBookmark ); static void AddToBookmarks( const char* url, const CStr255& title ); static LMenu* GetMenu(); @@ -57,6 +57,7 @@ public: void InitQuickfileView ( ) ; protected: + static void FillMenuFromList( HT_Resource top, LMenu* newMenu, int& nextMenuID, int whichItem, int depth ); virtual void HandleNotification( HT_Notification notifyStruct, HT_Resource node, HT_Event event, void *token, uint32 tokenType);