diff options
| author | das <das> | 2006-09-10 17:07:35 (GMT) |
|---|---|---|
| committer | das <das> | 2006-09-10 17:07:35 (GMT) |
| commit | ee1108db075d48eb9926012a05e0d9ee7e905497 (patch) | |
| tree | 0ebf513edd6850ddaf086cc1404d6768e491fe45 /macosx/Makefile | |
| parent | 310e8028ec1d91d84536a77021f4a3f8e48a51f5 (diff) | |
| download | tk-ee1108db075d48eb9926012a05e0d9ee7e905497.zip tk-ee1108db075d48eb9926012a05e0d9ee7e905497.tar.gz tk-ee1108db075d48eb9926012a05e0d9ee7e905497.tar.bz2 | |
* macosx/tkMacOSXColor.c (TkSetMacColor, TkpGetColor): use AppearanceMgr
* macosx/tkMacOSXDefault.h: to retrieve platform std colors for text
* macosx/tkMacOSXPort.h: selections, add "systemHighlightSecondary"
color name for standard color of inactive selections.
* library/text.tcl (aqua): change focus bindings to implement platform
standard look for inactive text selections using this new color.
* generic/tkTextBTree.c (TkTextIsElided): on TkAqua, don't show text
* generic/tkTextDisp.c (GetStyle): selection when text widget
* generic/tkText.c (TextEventProc): is in disabled state.
* generic/tkEntry.c (DisplayEntry): change default TkAqua selection
* macosx/tkMacOSXDefault.h: relief to "flat" (platform std).
* generic/tkText.c (Tk_TextCmd): fix bug leading to default text
selection relief string DEF_TEXT_SELECT_RELIEF being ignored.
* macosx/tkMacOSXMouseEvent.c (TkMacOSXProcessMouseEvent): allow mouse
event delivery to background windows with kWindowNoActivatesAttribute
(e.g. overrideredirect windows), as these never come to the foreground
they would not receive any mouse events otherwise. [Bug 1472624]
* macosx/tkMacOSXWindowEvent.c (TkMacOSXGenerateFocusEvent): do not
send focus events to any windows with kWindowNoActivatesAttribute.
* macosx/tkMacOSXXStubs.c (XQueryColor, XQueryColors): implement basic
XColor computation from pixel values, enough to make tkImg's window.c
happy, fixes img::window failures reported on tcl-mac.
* macosx/tkMacOSXMenu.c (DrawMenuEntryLabel): fix leak. [Bug 1554672]
* macosx/Makefile: workaround bug in 'cp -pRH' on Darwin 6 and earlier,
fixes 'make embedded' failure reported on tcl-mac; fix error from 'make
deploy' with same build tree as previous 'make embedded'.
* macosx/tkMacOSXEntry.c (TkpDrawEntryBorderAndFocus): fix typo.
* unix/tcl.m4: sync with tcl/unix/tcl.m4.
Diffstat (limited to 'macosx/Makefile')
| -rw-r--r-- | macosx/Makefile | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/macosx/Makefile b/macosx/Makefile index 0f52d38..5393a04 100644 --- a/macosx/Makefile +++ b/macosx/Makefile @@ -4,7 +4,7 @@ # uses the standard unix build system in tk/unix (which can be used directly instead of this # if you are not using the tk/macosx projects). # -# RCS: @(#) $Id: Makefile,v 1.7.2.14 2006/04/12 00:58:44 das Exp $ +# RCS: @(#) $Id: Makefile,v 1.7.2.15 2006/09/10 17:07:36 das Exp $ # ######################################################################################################## @@ -203,6 +203,11 @@ ifeq (${EMBEDDED_BUILD},1) @rm -rf "${INSTALL_ROOT}/${LIBDIR}/Tk.framework" endif ${DO_MAKE} +ifeq (${EMBEDDED_BUILD}_${TK_X11},1_) +# workaround bug with 'cp -pRH' on Darwin 6 and earlier + @if [ "`uname -r | awk -F. '{print $$1}'`" -lt 7 ]; then \ + mkdir -p ${TOP_DIR}/{"${TCL_FMWK_DIR}","${TK_FMWK_DIR}"}/PrivateHeaders; fi +endif ifeq (${INSTALL_BUILD},1) ifeq (${EMBEDDED_BUILD},1) # if we are embedding frameworks, don't install wish @@ -237,7 +242,7 @@ endif ifeq (${TK_X11},) ifeq (${EMBEDDED_BUILD},) # install Wish.app link in APPLICATION_INSTALL_PATH and setup 'Wish Shell' compatibility links - @cd ${TOP_DIR} && if [ -n "${APP_DIR}" ]; then mkdir -p "./${APP_DIR}" && \ + @cd ${TOP_DIR} && if [ -n "${APP_DIR}" ]; then mkdir -p "./${APP_DIR}" && rm -rf "./${APP_DIR}/Wish.app" && \ ln -fsh "./$$(echo ${APP_DIR} | sed -e 's#/[^/][^/]*#/..#g')/${FMWK_DIR}/${PRODUCT_NAME}.framework/Resources/Wish.app" "./${APP_DIR}" && \ ln -fsh Wish.app "./${APP_DIR}/Wish Shell.app"; fi && \ ln -fsh Wish.app "./${TK_FMWK_DIR}/Resources/Wish Shell.app" && \ |