From 2ea44ca4fa427e570ace2c3dfc52af4065960508 Mon Sep 17 00:00:00 2001
From: nijtmans <nijtmans>
Date: Wed, 2 Dec 2009 22:01:05 +0000
Subject: Add support for win32 CALLBACK functions in genStubs.tcl (needed for
 Tk bugfix)

---
 ChangeLog          | 5 +++++
 tools/genStubs.tcl | 9 ++++++---
 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 {
-- 
cgit v0.12