1 files changed, 31 insertions, 41 deletions

diff --git a/generic/tk.decls b/generic/tk.decls
index f08f2ef..e54b804 100644
--- a/generic/tk.decls
+++ b/generic/tk.decls
@@ -20,6 +20,7 @@ library tk
 
 interface tk
 hooks {tkPlat tkInt tkIntPlat tkIntXlib}
+scspec EXTERN
 
 # Declare each of the functions in the public Tk interface.  Note that
 # the an index should never be reused for a different function in order
@@ -104,7 +105,7 @@ declare 18 {
 	    Tk_Window tkwin, const char *value, char *widgRec, int offset)
 }
 declare 19 {
-    char *Tk_CanvasTagsPrintProc(ClientData clientData, Tk_Window tkwin,
+    CONST86 char *Tk_CanvasTagsPrintProc(ClientData clientData, Tk_Window tkwin,
 	    char *widgRec, int offset, Tcl_FreeProc **freeProcPtr)
 }
 declare 20 {
@@ -127,24 +128,24 @@ declare 24 {
 }
 declare 25 {
     int Tk_ClipboardAppend(Tcl_Interp *interp, Tk_Window tkwin,
-	    Atom target, Atom format, char *buffer)
+	    Atom target, Atom format, const char *buffer)
 }
 declare 26 {
     int Tk_ClipboardClear(Tcl_Interp *interp, Tk_Window tkwin)
 }
 declare 27 {
     int Tk_ConfigureInfo(Tcl_Interp *interp,
-	    Tk_Window tkwin, Tk_ConfigSpec *specs,
+	    Tk_Window tkwin, const Tk_ConfigSpec *specs,
 	    char *widgRec, const char *argvName, int flags)
 }
 declare 28 {
     int Tk_ConfigureValue(Tcl_Interp *interp,
-	    Tk_Window tkwin, Tk_ConfigSpec *specs,
+	    Tk_Window tkwin, const Tk_ConfigSpec *specs,
 	    char *widgRec, const char *argvName, int flags)
 }
 declare 29 {
     int Tk_ConfigureWidget(Tcl_Interp *interp,
-	    Tk_Window tkwin, Tk_ConfigSpec *specs,
+	    Tk_Window tkwin, const Tk_ConfigSpec *specs,
 	    int argc, CONST84 char **argv, char *widgRec,
 	    int flags)
 }
@@ -164,7 +165,7 @@ declare 32 {
 declare 33 {
     unsigned long Tk_CreateBinding(Tcl_Interp *interp,
 	    Tk_BindingTable bindingTable, ClientData object,
-	    const char *eventStr, const char *command, int append)
+	    const char *eventStr, const char *script, int append)
 }
 declare 34 {
     Tk_BindingTable Tk_CreateBindingTable(Tcl_Interp *interp)
@@ -183,13 +184,13 @@ declare 37 {
     void Tk_CreateGenericHandler(Tk_GenericProc *proc, ClientData clientData)
 }
 declare 38 {
-    void Tk_CreateImageType(Tk_ImageType *typePtr)
+    void Tk_CreateImageType(const Tk_ImageType *typePtr)
 }
 declare 39 {
     void Tk_CreateItemType(Tk_ItemType *typePtr)
 }
 declare 40 {
-    void Tk_CreatePhotoImageFormat(Tk_PhotoImageFormat *formatPtr)
+    void Tk_CreatePhotoImageFormat(const Tk_PhotoImageFormat *formatPtr)
 }
 declare 41 {
     void Tk_CreateSelHandler(Tk_Window tkwin,
@@ -206,7 +207,7 @@ declare 43 {
 	    const char *pathName, const char *screenName)
 }
 declare 44 {
-    int Tk_DefineBitmap(Tcl_Interp *interp, const char *name,
+    int Tk_OldDefineBitmap(Tcl_Interp *interp, const char *name,
 	    const char *source, int width, int height)
 }
 declare 45 {
@@ -316,7 +317,7 @@ declare 73 {
     void Tk_FreeImage(Tk_Image image)
 }
 declare 74 {
-    void Tk_FreeOptions(Tk_ConfigSpec *specs,
+    void Tk_FreeOptions(const Tk_ConfigSpec *specs,
 	    char *widgRec, Display *display, int needFlags)
 }
 declare 75 {
@@ -358,7 +359,7 @@ declare 85 {
     Pixmap Tk_GetBitmap(Tcl_Interp *interp, Tk_Window tkwin, const char *str)
 }
 declare 86 {
-    Pixmap Tk_GetBitmapFromData(Tcl_Interp *interp,
+    Pixmap Tk_OldGetBitmapFromData(Tcl_Interp *interp,
 	    Tk_Window tkwin, const char *source, int width, int height)
 }
 declare 87 {
@@ -403,7 +404,7 @@ declare 97 {
 }
 declare 98 {
     ClientData Tk_GetImageMasterData(Tcl_Interp *interp,
-	    const char *name, Tk_ImageType **typePtrPtr)
+	    const char *name, CONST86 Tk_ImageType **typePtrPtr)
 }
 declare 99 {
     Tk_ItemType *Tk_GetItemTypes(void)
@@ -561,7 +562,7 @@ declare 142 {
 declare 143 {
     int Tk_ParseArgv(Tcl_Interp *interp,
 	    Tk_Window tkwin, int *argcPtr, CONST84 char **argv,
-	    Tk_ArgvInfo *argTable, int flags)
+	    const Tk_ArgvInfo *argTable, int flags)
 }
 declare 144 {
     void Tk_PhotoPutBlock_NoComposite(Tk_PhotoHandle handle,
@@ -824,7 +825,7 @@ declare 216 {
     int Tk_CreateConsoleWindow(Tcl_Interp *interp)
 }
 declare 217 {
-    void Tk_CreateSmoothMethod(Tcl_Interp *interp, Tk_SmoothMethod *method)
+    void Tk_CreateSmoothMethod(Tcl_Interp *interp, const Tk_SmoothMethod *method)
 }
 #declare 218 {
 #    void Tk_CreateCanvasVisitor(Tcl_Interp *interp, void *typePtr)
@@ -923,7 +924,7 @@ declare 241 {
 }
 declare 242 {
     void Tk_SetClassProcs(Tk_Window tkwin,
-	    Tk_ClassProcs *procs, ClientData instanceData)
+	    const Tk_ClassProcs *procs, ClientData instanceData)
 }
 
 # New in 8.4a4
@@ -1062,10 +1063,21 @@ declare 271 {
 # Developers who need to produce a file [load]able into legacy interps must
 # build against legacy sources.
 declare 272 {
-    void Tk_CreateOldImageType(Tk_ImageType *typePtr)
+    void Tk_CreateOldImageType(const Tk_ImageType *typePtr)
 }
 declare 273 {
-    void Tk_CreateOldPhotoImageFormat(Tk_PhotoImageFormat *formatPtr)
+    void Tk_CreateOldPhotoImageFormat(const Tk_PhotoImageFormat *formatPtr)
+}
+
+# See [Enhancement request 2636558] Tk_DefineBitmap and
+# Tk_GetBitmapFromData signature problem
+declare 274 {
+    int Tk_DefineBitmap(Tcl_Interp *interp, const char *name,
+	    const void *source, int width, int height)
+}
+declare 275 {
+    Pixmap Tk_GetBitmapFromData(Tcl_Interp *interp,
+	    Tk_Window tkwin, const void *source, int width, int height)
 }
 
 # Define the platform specific public Tk interface.  These functions are
@@ -1127,10 +1139,10 @@ declare 6 aqua {
     void TkMacOSXInvalClipRgns(Tk_Window tkwin)
 }
 declare 7 aqua {
-    GWorldPtr TkMacOSXGetDrawablePort(Drawable drawable)
+    void *TkMacOSXGetDrawablePort(Drawable drawable)
 }
 declare 8 aqua {
-    ControlRef TkMacOSXGetRootControl(Drawable drawable)
+    void *TkMacOSXGetRootControl(Drawable drawable)
 }
 declare 9 aqua {
     void Tk_MacOSXSetupTkNotifier(void)
@@ -1144,31 +1156,9 @@ declare 10 aqua {
 # Public functions that are not accessible via the stubs table.
 
 export {
-    const char *Tk_InitStubs(Tcl_Interp *interp, const char *version,
-	    int exact)
-}
-export {
     const char *Tk_PkgInitStubsCheck(Tcl_Interp *interp, const char *version,
 	    int exact)
 }
-
-# Global variables that need to be exported from the tcl shared library.
-
-export {
-    TkStubs *tkStubsPtr                         (fool checkstubs)
-}
-export {
-    TkPlatStubs *tkPlatStubsPtr                 (fool checkstubs)
-}
-export {
-    TkIntStubs *tkIntStubsPtr                   (fool checkstubs)
-}
-export {
-    TkIntPlatStubs *tkIntPlatStubsPtr           (fool checkstubs)
-}
-export {
-    TkIntXlibStubs *tkIntXlibStubsPtr           (fool checkstubs)
-}
 
 # Local Variables:
 # mode: tcl