summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornijtmans <nijtmans>2009-12-02 22:01:05 (GMT)
committernijtmans <nijtmans>2009-12-02 22:01:05 (GMT)
commit2ea44ca4fa427e570ace2c3dfc52af4065960508 (patch)
tree3973c2c5296a7cb1f5c4ea9ed5a5675d5e8f0abc
parent0f304f907117ebdc568f179386932e7aca6eebf7 (diff)
downloadtcl-2ea44ca4fa427e570ace2c3dfc52af4065960508.zip
tcl-2ea44ca4fa427e570ace2c3dfc52af4065960508.tar.gz
tcl-2ea44ca4fa427e570ace2c3dfc52af4065960508.tar.bz2
Add support for win32 CALLBACK functions in genStubs.tcl
(needed for Tk bugfix)
-rw-r--r--ChangeLog5
-rw-r--r--tools/genStubs.tcl9
2 files changed, 11 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index fe73bc7..527f74d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-02 Jan Nijtmans <nijtmans@users.sf.net>
+
+ * tools/genStubs.tcl Add support for win32 CALLBACK functions
+ (needed for Tk bugfix)
+
2009-11-30 Donal K. Fellows <dkf@users.sf.net>
* doc/Tcl.n: [Bug 2901433]: Improved description of expansion to
diff --git a/tools/genStubs.tcl b/tools/genStubs.tcl
index 5390456..5e3eba2 100644
--- a/tools/genStubs.tcl
+++ b/tools/genStubs.tcl
@@ -10,7 +10,7 @@
# See the file "license.terms" for information on usage and redistribution
# of this file, and for a DISCLAIMER OF ALL WARRANTIES.
#
-# RCS: @(#) $Id: genStubs.tcl,v 1.22.2.2 2008/07/21 19:44:37 andreas_kupries Exp $
+# RCS: @(#) $Id: genStubs.tcl,v 1.22.2.3 2009/12/02 22:01:07 nijtmans Exp $
package require Tcl 8.4
@@ -590,8 +590,11 @@ proc genStubs::makeSlot {name decl index} {
append text $rtype " *" $lfname "; /* $index */\n"
return $text
}
- append text $rtype " (*" $lfname ") "
-
+ if {[string range $rtype end-7 end] == "CALLBACK"} {
+ append text [string trim [string range $rtype 0 end-8]] " (CALLBACK *" $lfname ") "
+ } else {
+ append text $rtype " (*" $lfname ") "
+ }
set arg1 [lindex $args 0]
switch -exact $arg1 {
void {