diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-04-29 08:22:32 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-04-29 08:22:32 (GMT) |
| commit | 83dd76da7170a8bb9c59b60508c5df606204709c (patch) | |
| tree | 80e0b58dcbf82e4938b45f818c125a17099d7fc2 /unix | |
| parent | 6543fa41fa55392ee287df3d24888f2662bb7b8d (diff) | |
| parent | 64ac9dba8558f572db2bd2d6f908134796bf92c3 (diff) | |
| download | tk-83dd76da7170a8bb9c59b60508c5df606204709c.zip tk-83dd76da7170a8bb9c59b60508c5df606204709c.tar.gz tk-83dd76da7170a8bb9c59b60508c5df606204709c.tar.bz2 | |
merge trunk
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/Makefile.in | 11 | ||||
| -rw-r--r-- | unix/tkUnixPort.h | 16 |
2 files changed, 9 insertions, 18 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index 2ab5913..0e73871 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -724,8 +724,15 @@ install-binaries: $(TK_LIB_FILE) $(TK_STUB_LIB_FILE) ${WISH_EXE} (\ echo "if {[catch {package present Tcl $(TCLVERSION)$(TCLPATCHL)}]} return";\ relative=`echo | awk '{ORS=" "; split("$(TK_PKG_DIR)",a,"/"); for (f in a) {print ".."}}'`;\ - echo "package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)$(PATCH_LEVEL)\ - [list load [file join \$$dir $${relative}$(TK_LIB_FILE)] Tk]";\ + echo "if {[string match CYGWIN* \$$::tcl_platform(os)]} {";\ + echo " if {([info exists ::env(DISPLAY)] || [lsearch -exact \$$::argv -display] > -1)} {";\ + echo " package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)$(PATCH_LEVEL) [list load [file join \$$dir $${relative}.. bin $(TK_LIB_FILE)] Tk]";\ + echo " } else {";\ + echo " package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)$(PATCH_LEVEL) [list load [file join \$$dir $${relative}.. bin tk${MAJOR_VERSION}${MINOR_VERSION}.dll] Tk]";\ + echo " }";\ + echo "} else {";\ + echo " package ifneeded Tk $(MAJOR_VERSION).$(MINOR_VERSION)$(PATCH_LEVEL) [list load [file join \$$dir $${relative}$(TK_LIB_FILE)] Tk]";\ + echo "}";\ ) > "$(PKG_INDEX)"; \ fi @echo "Installing $(LIB_FILE) to @DLL_INSTALL_DIR@/" diff --git a/unix/tkUnixPort.h b/unix/tkUnixPort.h index 64589be..0076e5d 100644 --- a/unix/tkUnixPort.h +++ b/unix/tkUnixPort.h @@ -114,22 +114,6 @@ #endif /* - * These macros are just wrappers for the equivalent X Region calls. - */ - -#define TkClipBox(rgn, rect) XClipBox((Region) rgn, rect) -#define TkCreateRegion() (TkRegion) XCreateRegion() -#define TkDestroyRegion(rgn) XDestroyRegion((Region) rgn) -#define TkIntersectRegion(a, b, r) XIntersectRegion((Region) a, \ - (Region) b, (Region) r) -#define TkRectInRegion(r, x, y, w, h) XRectInRegion((Region) r, x, y, w, h) -#define TkSetRegion(d, gc, rgn) XSetRegion(d, gc, (Region) rgn) -#define TkSubtractRegion(a, b, r) XSubtractRegion((Region) a, \ - (Region) b, (Region) r) -#define TkUnionRectWithRegion(rect, src, ret) XUnionRectWithRegion(rect, \ - (Region) src, (Region) ret) - -/* * The TkPutImage macro strips off the color table information, which isn't * needed for X. */ |