summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog20
-rw-r--r--generic/tk.decls20
-rw-r--r--macosx/Wish.xcodeproj/project.pbxproj8
3 files changed, 38 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 734a5ae..b77decf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-05-17 Daniel Steffen <das@users.sourceforge.net>
+
+ * generic/tk.decls: workaround 'make checkstubs' failures from
+ tkStubLib.c MODULE_SCOPE revert. [Bug 1716117]
+
+ * macosx/Wish.xcodeproj/project.pbxproj: add tkOldTest.c and remove
+ tkStubImg.c.
+
2007-05-16 Joe English <jenglish@users.sourceforge.net>
* generic/tkStubLib.c: Change Tk_InitStubs(), tkStubsPtr,
@@ -14,16 +22,16 @@
* tests/canvImg.test:
* tests/imgPhoto.test:
- * tests/bind.test: Make test suite more SCIM-tolerant [Bug 1609316]
+ * tests/bind.test: Make test suite more SCIM-tolerant. [Bug 1609316]
2007-05-16 Pat Thoyts <patthoyts@users.sourceforge.net>
- * win/makefile.vc: Test ttk widgets
+ * win/makefile.vc: Test ttk widgets.
2007-05-15 Joe English <jenglish@users.sourceforge.net>
* unix/tkUnixRFont.c: Fix crash introduced by previous fix
- exposed under newer fontconfig libraries [Bug 1717830 again].
+ exposed under newer fontconfig libraries [Bug 1717830] again.
2007-05-15 Don Porter <dgp@users.sourceforge.net>
@@ -31,7 +39,7 @@
2007-05-15 Joe English <jenglish@users.sourceforge.net>
- * unix/tkUnixRFont.c: Fix various memory leaks [Bug 1717830],
+ * unix/tkUnixRFont.c: Fix various memory leaks [Bug 1717830],
[Bug 800149].
2007-05-14 Don Porter <dgp@users.sourceforge.net>
@@ -79,8 +87,8 @@
* tests/winButton.test: Avoid font dependencies in results.
- * generic/tkFont.c: bug #1716613 propagate error from
- TkDeleteNamedFont.
+ * generic/tkFont.c: propagate error from TkDeleteNamedFont
+ [Bug 1716613].
2007-05-09 Daniel Steffen <das@users.sourceforge.net>
diff --git a/generic/tk.decls b/generic/tk.decls
index 5e3763a..5136906 100644
--- a/generic/tk.decls
+++ b/generic/tk.decls
@@ -11,7 +11,7 @@
# See the file "license.terms" for information on usage and redistribution
# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
#
-# RCS: @(#) $Id: tk.decls,v 1.31 2007/05/14 20:58:25 dgp Exp $
+# RCS: @(#) $Id: tk.decls,v 1.32 2007/05/16 21:21:35 das Exp $
library tk
@@ -1378,3 +1378,21 @@ declare 9 aqua {
declare 10 aqua {
int Tk_MacOSXIsAppInFront (void)
}
+
+##############################################################################
+
+# Public functions that are not accessible via the stubs table:
+# (listed here _as comments_ so that the 'checkstubs' make target does not
+# complain about them)
+
+# const char *Tk_InitStubs(Tcl_Interp *interp, const char *version, int exact)
+
+# Global variables that need to be exported from the tcl shared library:
+# (listed here _as comments_ so that the 'checkstubs' make target does not
+# complain about them, c.f. tk bug bug 1716117)
+
+# TkStubs *tkStubsPtr (fool checkstubs)
+# TkPlatStubs *tkPlatStubsPtr (fool checkstubs)
+# TkIntStubs *tkIntStubsPtr (fool checkstubs)
+# TkIntPlatStubs *tkIntPlatStubsPtr (fool checkstubs)
+# TkIntXlibStubs *tkIntXlibStubsPtr (fool checkstubs)
diff --git a/macosx/Wish.xcodeproj/project.pbxproj b/macosx/Wish.xcodeproj/project.pbxproj
index 6da3e9d..cc874bc 100644
--- a/macosx/Wish.xcodeproj/project.pbxproj
+++ b/macosx/Wish.xcodeproj/project.pbxproj
@@ -7,6 +7,7 @@
objects = {
/* Begin PBXBuildFile section */
+ F9067BCD0BFBA2900074F726 /* tkOldTest.c in Sources */ = {isa = PBXBuildFile; fileRef = F966BAFE08F27A39005CB29B /* tkOldTest.c */; };
F9408AF30B195C08009F7CAC /* tclMathOp.c in Sources */ = {isa = PBXBuildFile; fileRef = F9408AF20B195C08009F7CAC /* tclMathOp.c */; };
F966BDCF08F27A3F005CB29B /* tk3d.c in Sources */ = {isa = PBXBuildFile; fileRef = F966BAAC08F27A39005CB29B /* tk3d.c */; };
F966BDD108F27A3F005CB29B /* tkArgv.c in Sources */ = {isa = PBXBuildFile; fileRef = F966BAAE08F27A39005CB29B /* tkArgv.c */; };
@@ -559,7 +560,7 @@
F966BAFB08F27A39005CB29B /* tkSelect.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tkSelect.c; sourceTree = "<group>"; };
F966BAFC08F27A39005CB29B /* tkSelect.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = tkSelect.h; sourceTree = "<group>"; };
F966BAFD08F27A39005CB29B /* tkSquare.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tkSquare.c; sourceTree = "<group>"; };
- F966BAFE08F27A39005CB29B /* tkStubImg.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tkStubImg.c; sourceTree = "<group>"; };
+ F966BAFE08F27A39005CB29B /* tkOldTest.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tkOldTest.c; sourceTree = "<group>"; };
F966BAFF08F27A39005CB29B /* tkStubInit.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tkStubInit.c; sourceTree = "<group>"; };
F966BB0008F27A39005CB29B /* tkStubLib.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tkStubLib.c; sourceTree = "<group>"; };
F966BB0108F27A39005CB29B /* tkStyle.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = tkStyle.c; sourceTree = "<group>"; };
@@ -1786,7 +1787,7 @@
F966C06F08F281DC005CB29B /* Frameworks */,
1AB674ADFE9D54B511CA2CBB /* Products */,
);
- comments = "Copyright (c) 2004-2007 Daniel A. Steffen <das@users.sourceforge.net>\n\nSee the file \"license.terms\" for information on usage and redistribution of\nthis file, and for a DISCLAIMER OF ALL WARRANTIES.\n\nRCS: @(#) $Id: project.pbxproj,v 1.20 2007/05/09 12:55:16 das Exp $\n";
+ comments = "Copyright (c) 2004-2007 Daniel A. Steffen <das@users.sourceforge.net>\n\nSee the file \"license.terms\" for information on usage and redistribution of\nthis file, and for a DISCLAIMER OF ALL WARRANTIES.\n\nRCS: @(#) $Id: project.pbxproj,v 1.21 2007/05/16 21:21:35 das Exp $\n";
name = Wish;
path = .;
sourceTree = SOURCE_ROOT;
@@ -2086,7 +2087,7 @@
F966BAFB08F27A39005CB29B /* tkSelect.c */,
F966BAFC08F27A39005CB29B /* tkSelect.h */,
F966BAFD08F27A39005CB29B /* tkSquare.c */,
- F966BAFE08F27A39005CB29B /* tkStubImg.c */,
+ F966BAFE08F27A39005CB29B /* tkOldTest.c */,
F966BAFF08F27A39005CB29B /* tkStubInit.c */,
F966BB0008F27A39005CB29B /* tkStubLib.c */,
F966BB0108F27A39005CB29B /* tkStyle.c */,
@@ -3878,6 +3879,7 @@
F966BE0F08F27A3F005CB29B /* tkMessage.c in Sources */,
F966BE1008F27A3F005CB29B /* tkObj.c in Sources */,
F966BE1108F27A3F005CB29B /* tkOldConfig.c in Sources */,
+ F9067BCD0BFBA2900074F726 /* tkOldTest.c in Sources */,
F966BE1208F27A3F005CB29B /* tkOption.c in Sources */,
F966BE1308F27A3F005CB29B /* tkPack.c in Sources */,
F966BE1408F27A3F005CB29B /* tkPanedWindow.c in Sources */,