summaryrefslogtreecommitdiffstats
path: root/generic/tk.decls
diff options
context:
space:
mode:
authornijtmans <nijtmans>2009-02-27 23:23:35 (GMT)
committernijtmans <nijtmans>2009-02-27 23:23:35 (GMT)
commit2bd24991fb1306a2a230549895084b7424845fbe (patch)
tree06a8f93bcc5d7a6ab6a66ff97d59e2b67d7e6ceb /generic/tk.decls
parent0aa2082226c7156d97ae4a66c508d1fd6ee421c4 (diff)
downloadtk-2bd24991fb1306a2a230549895084b7424845fbe.zip
tk-2bd24991fb1306a2a230549895084b7424845fbe.tar.gz
tk-2bd24991fb1306a2a230549895084b7424845fbe.tar.bz2
[Feature Request 2636558] Tk_DefineBitmap
and Tk_GetBitmapFromData signature problem
Diffstat (limited to 'generic/tk.decls')
-rw-r--r--generic/tk.decls17
1 files changed, 14 insertions, 3 deletions
diff --git a/generic/tk.decls b/generic/tk.decls
index 4de7253..2bfcd8c 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.46 2009/01/02 23:20:32 nijtmans Exp $
+# RCS: @(#) $Id: tk.decls,v 1.47 2009/02/27 23:23:35 nijtmans Exp $
library tk
@@ -208,7 +208,7 @@ declare 43 generic {
const char *pathName, const char *screenName)
}
declare 44 generic {
- 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 generic {
@@ -360,7 +360,7 @@ declare 85 generic {
Pixmap Tk_GetBitmap(Tcl_Interp *interp, Tk_Window tkwin, const char * str)
}
declare 86 generic {
- Pixmap Tk_GetBitmapFromData(Tcl_Interp *interp,
+ Pixmap Tk_OldGetBitmapFromData(Tcl_Interp *interp,
Tk_Window tkwin, const char *source, int width, int height)
}
declare 87 generic {
@@ -1074,6 +1074,17 @@ declare 273 generic {
void Tk_CreateOldPhotoImageFormat(const Tk_PhotoImageFormat *formatPtr)
}
+# See [Enhancement request 2636558] Tk_DefineBitmap and
+# Tk_GetBitmapFromData signature problem
+declare 274 generic {
+ int Tk_DefineBitmap(Tcl_Interp *interp, const char *name,
+ const void *source, int width, int height)
+}
+declare 275 generic {
+ 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
# only available on the designated platform.