diff options
| author | das <das> | 2005-05-14 20:53:31 (GMT) |
|---|---|---|
| committer | das <das> | 2005-05-14 20:53:31 (GMT) |
| commit | 96723e49a59aebc9468bb4f297062273172cfe34 (patch) | |
| tree | 00b7ac832dfb7876972240ccb8ec825b0796b567 /macosx/tkMacOSXMenu.c | |
| parent | 00a8d27d5712be73ac8277e02ec7c273c2bce91c (diff) | |
| download | tk-96723e49a59aebc9468bb4f297062273172cfe34.zip tk-96723e49a59aebc9468bb4f297062273172cfe34.tar.gz tk-96723e49a59aebc9468bb4f297062273172cfe34.tar.bz2 | |
* macosx/tkMacOSXInit.c:
* macosx/tkMacOSXNotify.c: introduction of new tcl notifier based on
CFRunLoop allows replacement of the custom TkAqua notifier by a
standard tcl event source. Removes requirement of threaded tcl core
for TkAqua, allows to stub-link TkAqua against Tcl by removing use of
the unstubbed TclInitNotifier & TclFinalizeNotifier. [Tcl Patch 1202052]
* macosx/Wish.pbproj/project.pbxproj: stub-link TkAqua: build with
USE_TCL_STUBS and link against libtclstub instead of Tcl.framework,
unexport libtclstub symbols from Tk to avoid duplicate symbol warnings
when linking with both Tcl and Tk, fixes for gcc4.0 warnings.
* macosx/tkMacOSXBitmap.c:
* macosx/tkMacOSXButton.c:
* macosx/tkMacOSXDialog.c:
* macosx/tkMacOSXFont.c:
* macosx/tkMacOSXHLEvents.c:
* macosx/tkMacOSXInit.c:
* macosx/tkMacOSXKeyboard.c:
* macosx/tkMacOSXMenu.c:
* macosx/tkMacOSXMenubutton.c:
* macosx/tkMacOSXWm.c:
* macosx/tkMacOSXXStubs.c: fixed gcc 4.0 warnings.
* unix/tcl.m4: sync with tcl
* unix/configure: autoconf-2.13
Diffstat (limited to 'macosx/tkMacOSXMenu.c')
| -rw-r--r-- | macosx/tkMacOSXMenu.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/macosx/tkMacOSXMenu.c b/macosx/tkMacOSXMenu.c index 2e3d8ee..f9d1e23 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.2.6 2004/07/20 06:05:59 das Exp $ + * RCS: @(#) $Id: tkMacOSXMenu.c,v 1.6.2.7 2005/05/14 20:53:31 das Exp $ */ #include "tkMacOSXInt.h" #include "tkMenubutton.h" @@ -946,9 +946,11 @@ TkpConfigureMenuEntry( * some fields. */ { TkMenu *menuPtr = mePtr->menuPtr; +#if 0 /* Unused */ int index = mePtr->index; MenuHandle macMenuHdl = ((MacMenu *) menuPtr->platformData)->menuHdl; MenuHandle helpMenuHdl = NULL; +#endif /* * Cascade menus have to have menu IDs of less than 256. So @@ -1081,7 +1083,6 @@ ReconfigureIndividualMenu( 0, NULL); } else { Tcl_DString itemTextDString; - int destWrote; CFStringRef cf; GetEntryText(mePtr, &itemTextDString); cf = CFStringCreateWithCString(NULL, @@ -1754,7 +1755,6 @@ DrawMenuBarWhenIdle( } else if (i == helpIndex) { TkMenu *helpMenuPtr = menuBarPtr->entries[i] ->childMenuRefPtr->menuPtr; - MenuHandle helpMenuHdl = NULL; if (helpMenuPtr == NULL) { continue; @@ -4307,9 +4307,11 @@ HandleMenuFindItemsMsg (MenuRef menu, TkMenu *menuPtr) { TkMenuEntry *parentEntryPtr; +#if 0 /* Unused */ Tk_Font tkfont; Tk_FontMetrics fontMetrics, entryMetrics; Tk_FontMetrics *fmPtr; +#endif TkMenuEntry *mePtr; int i; int newItem = -1; @@ -4475,8 +4477,10 @@ HandleMenuFindItemsMsg (MenuRef menu, } if (scrollDirection != DONT_SCROLL) { +#if 0 Tk_Font menuFont; RgnHandle updateRgn = NewRgn(); +#endif ScrollMenuImage(menu, menuRectPtr, 0, scrollAmt, NULL); mtdPtr->virtualMenuTop += scrollAmt; |