summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwolfsuit <wolfsuit>2003-03-08 02:15:45 (GMT)
committerwolfsuit <wolfsuit>2003-03-08 02:15:45 (GMT)
commit1238067f586fbaeae2bd4884928148be043cdf12 (patch)
tree3d85c24e612d56a706d180983bd8b868023489ed
parentca9be35a9fc7236e607923ad25ab5fd75d0029cc (diff)
downloadtk-1238067f586fbaeae2bd4884928148be043cdf12.zip
tk-1238067f586fbaeae2bd4884928148be043cdf12.tar.gz
tk-1238067f586fbaeae2bd4884928148be043cdf12.tar.bz2
Fix a bug with MacOS X Tk's handling of the help menu. The code expected the
MacOS 9 behavior, which was to insert a separator item after the system help menus, but this doesn't happen on X...
-rw-r--r--ChangeLog11
-rw-r--r--macosx/tkMacOSXMenu.c36
-rw-r--r--macosx/tkMacOSXMenus.c3
3 files changed, 27 insertions, 23 deletions
diff --git a/ChangeLog b/ChangeLog
index df1747e..35eb60f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2003-03-07 Jim Ingham <jingham@apple.com>
+
+ * macosx/tkMacOSXMenus.c (TkMacOSXInitMenus): No longer need
+ to call TkMacOSXSetHelpMenuItemCount.
+ * macosx/tkMacOSXMenu.c (TkMacOSXHelpMenuItemCount): Stub out
+ since it is no longer need (but is in the stubs table...).
+ (TkMacOSXDispatchMenuEvent): Get the number of system help
+ menu items from HMGetHelpMenu.
+ (ReconfigureMacintoshMenu): Ditto.
+ (TkpDestroyMenu): Ditto.
+
2003-03-06 Donal K. Fellows <fellowsd@cs.man.ac.uk>
* doc/FindPhoto.3: Documentation of the photo API changes due to
diff --git a/macosx/tkMacOSXMenu.c b/macosx/tkMacOSXMenu.c
index d92a8fb..0f853f9 100644
--- a/macosx/tkMacOSXMenu.c
+++ b/macosx/tkMacOSXMenu.c
@@ -9,7 +9,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacOSXMenu.c,v 1.6 2003/02/19 19:27:48 wolfsuit Exp $
+ * RCS: @(#) $Id: tkMacOSXMenu.c,v 1.7 2003/03/08 02:15:46 wolfsuit Exp $
*/
#include "tkMacOSXInt.h"
#include "tkMenuButton.h"
@@ -180,10 +180,6 @@ static Tk_Window currentMenuBarOwner;
static char elipsisString[TCL_UTF_MAX + 1];
/* The UTF representation of the elipsis (...)
* character. */
-static int helpItemCount; /* The number of items in the help menu.
- * -1 means that the help menu is
- * unavailable. This does not include
- * the automatically generated separator. */
static int inPostMenu; /* We cannot be re-entrant like X
* windows. */
static short lastMenuID; /* To pass to NewMenu; need to figure out
@@ -640,8 +636,8 @@ TkpDestroyMenu(
&& (helpMenuHdl != NULL)) {
int i, count = CountMenuItems(helpMenuHdl);
- for (i = helpItemCount; i <= count; i++) {
- DeleteMenuItem(helpMenuHdl, helpItemCount);
+ for (i = helpIndex; i <= count; i++) {
+ DeleteMenuItem(helpMenuHdl, helpIndex);
}
}
currentHelpMenuID = 0;
@@ -1036,7 +1032,8 @@ ReconfigureIndividualMenu(
* be the help menu. */
int base) /* The last index that we do not want
* touched. 0 for normal menus;
- * helpMenuItemCount for help menus. */
+ * # of system help menu items
+ * for help menus. */
{
int count;
int index;
@@ -1290,7 +1287,8 @@ ReconfigureMacintoshMenu(
MenuItemIndex helpIndex;
HMGetHelpMenu(&helpMenuHdl,&helpIndex);
if (helpMenuHdl != NULL) {
- ReconfigureIndividualMenu(menuPtr, helpMenuHdl, helpItemCount);
+ ReconfigureIndividualMenu(menuPtr, helpMenuHdl,
+ helpIndex - 1);
}
}
@@ -2109,7 +2107,10 @@ TkMacOSXDispatchMenuEvent(
helpMenuName);
ckfree(helpMenuName);
if ((helpMenuRef != NULL) && (helpMenuRef->menuPtr != NULL)) {
- int newIndex = index - helpItemCount - 1;
+ MenuRef outHelpMenu;
+ MenuItemIndex itemIndex;
+ HMGetHelpMenu(&outHelpMenu, &itemIndex);
+ int newIndex = index - itemIndex;
result = TkInvokeMenu(currentMenuBarInterp,
helpMenuRef->menuPtr, newIndex);
}
@@ -2881,12 +2882,15 @@ DrawTearoffEntry(
* Has to be called after the first call to InsertMenu. Sets
* up the global variable for the number of items in the
* unmodified help menu.
+ * NB. Nobody uses this any more, since you can get the number
+ * of system help items from HMGetHelpMenu trivially.
+ * But it is in the stubs table...
*
* Results:
* None.
*
* Side effects:
- * Sets the global helpItemCount.
+ * Nothing.
*
*----------------------------------------------------------------------
*/
@@ -2894,16 +2898,6 @@ DrawTearoffEntry(
void
TkMacOSXSetHelpMenuItemCount()
{
- MenuRef helpMenuHandle;
- MenuItemIndex itemIndex;
-
- if ((HMGetHelpMenu(&helpMenuHandle,&itemIndex) != noErr)
- || (helpMenuHandle == NULL)) {
- helpItemCount = -1;
- } else {
- helpItemCount = CountMenuItems(helpMenuHandle);
- DeleteMenuItem(helpMenuHandle, helpItemCount);
- }
}
/*
diff --git a/macosx/tkMacOSXMenus.c b/macosx/tkMacOSXMenus.c
index f3aa259..805467d 100644
--- a/macosx/tkMacOSXMenus.c
+++ b/macosx/tkMacOSXMenus.c
@@ -10,7 +10,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacOSXMenus.c,v 1.2 2002/08/31 06:12:30 das Exp $
+ * RCS: @(#) $Id: tkMacOSXMenus.c,v 1.3 2003/03/08 02:15:46 wolfsuit Exp $
*/
#include "tk.h"
@@ -209,7 +209,6 @@ TkMacOSXInitMenus(
}
DrawMenuBar();
- TkMacOSXSetHelpMenuItemCount();
return;
}