diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-09-08 12:53:28 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-09-08 12:53:28 (GMT) |
| commit | c15768b7bff4bdebe68c0856c364accbef57cfd3 (patch) | |
| tree | d923dec447d65ac6fc9cd3ddcdb0f32b41a1015f /unix | |
| parent | c2a305b8ed5e188557828ca1fc623f00f180e534 (diff) | |
| parent | 2c80218636b778e62c7c0707c891553b83a79a26 (diff) | |
| download | tk-c15768b7bff4bdebe68c0856c364accbef57cfd3.zip tk-c15768b7bff4bdebe68c0856c364accbef57cfd3.tar.gz tk-c15768b7bff4bdebe68c0856c364accbef57cfd3.tar.bz2 | |
Merge 8.5.
Prevent dummy stub entry before TkpRedrawWidget/TkpWillDrawWidget entries (this is a workaround for an earlier genStubs bug, but those are new stub entries)
Don't use "interp children" in testcases yet (test suite should run against Tcl 8.6.9 in Travis too)
Diffstat (limited to 'unix')
| -rw-r--r-- | unix/Makefile.in | 4 | ||||
| -rw-r--r-- | unix/tkUnixPort.h | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/unix/Makefile.in b/unix/Makefile.in index 74c17bb..0fbfb5d 100644 --- a/unix/Makefile.in +++ b/unix/Makefile.in @@ -634,8 +634,8 @@ $(TKTEST_EXE): $(TKTEST_OBJS) $(TK_LIB_FILE) $(MAKE) tktest-real LIB_RUNTIME_DIR="`pwd`:$(TCL_BIN_DIR)" tktest-real: ${TK_STUB_LIB_FILE} - ${CC} ${CFLAGS} ${LDFLAGS} $(TKTEST_OBJS) ${TK_STUB_LIB_FILE} ${TCL_STUB_LIB_SPEC} @TK_BUILD_LIB_SPEC@ \ - $(WISH_LIBS) $(CC_SEARCH_FLAGS) -o $(TKTEST_EXE) + ${CC} ${CFLAGS} ${LDFLAGS} $(TKTEST_OBJS) @TK_BUILD_LIB_SPEC@ $(WISH_LIBS) \ + ${TK_STUB_LIB_FILE} ${TCL_STUB_LIB_SPEC} $(CC_SEARCH_FLAGS) -o $(TKTEST_EXE) # # FIXME: This xttest rule seems to be broken in a number of ways. It should # # use CC_SEARCH_FLAGS, it does not include the shared lib location logic from diff --git a/unix/tkUnixPort.h b/unix/tkUnixPort.h index 47a0aad..09ff558 100644 --- a/unix/tkUnixPort.h +++ b/unix/tkUnixPort.h @@ -167,8 +167,6 @@ #define TkpButtonSetDefaults() {} #define TkpDestroyButton(butPtr) {} -#define TkpWillDrawWidget(tkwin) 0 -#define TkpRedrawWidget(tkwin) #define TkSelUpdateClipboard(a,b) {} #ifndef __CYGWIN__ #define TkSetPixmapColormap(p,c) {} |