diff options
author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-05-29 12:45:47 (GMT) |
---|---|---|
committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2012-05-29 12:45:47 (GMT) |
commit | 1b8294a6f883fcb1217f9a95b0fe3fcd4c55a272 (patch) | |
tree | 12d4d15c3f59ae70b1113469422fb33b9039d700 /generic/tkInt.decls | |
parent | 9ea605f06bdde8beed71761774f09a632d2fb100 (diff) | |
parent | ba34893472773623c15b6e7b5a6739213d6b4edf (diff) | |
download | tk-1b8294a6f883fcb1217f9a95b0fe3fcd4c55a272.zip tk-1b8294a6f883fcb1217f9a95b0fe3fcd4c55a272.tar.gz tk-1b8294a6f883fcb1217f9a95b0fe3fcd4c55a272.tar.bz2 |
merge core-8-4-branch, still to be tested on Unix
Diffstat (limited to 'generic/tkInt.decls')
-rw-r--r-- | generic/tkInt.decls | 27 |
1 files changed, 9 insertions, 18 deletions
diff --git a/generic/tkInt.decls b/generic/tkInt.decls index 33921ba..20d0dd4 100644 --- a/generic/tkInt.decls +++ b/generic/tkInt.decls @@ -436,7 +436,7 @@ declare 122 aqua { } declare 124 aqua { Pixmap TkpGetNativeAppBitmap(Display *display, - const char *name, int *width, int *height) + const char *name, int *width, int *height) } declare 135 { void TkpDrawHighlightBorder(Tk_Window tkwin, GC fgGC, GC bgGC, @@ -750,42 +750,33 @@ declare 36 win { UINT message, WPARAM wParam, LPARAM lParam) } -# new for 8.4.20+, Cygwin only +# new for 8.4.20+/8.5.12+, Cygwin only declare 37 win { void TkCreateXEventSource(void) } declare 38 win { - void TkFreeWindowId(TkDisplay *dispPtr, Window w) -} -declare 39 win { - void TkInitXId(TkDisplay *dispPtr) -} -declare 40 win { int TkpCmapStressed(Tk_Window tkwin, Colormap colormap) } -declare 41 win { +declare 39 win { void TkpSync(Display *display) } -declare 42 win { +declare 40 win { Window TkUnixContainerId(TkWindow *winPtr) } -declare 43 win { +declare 41 win { int TkUnixDoOneXEvent(Tcl_Time *timePtr) } -declare 44 win { +declare 42 win { void TkUnixSetMenubar(Tk_Window tkwin, Tk_Window menubar) } -declare 45 win { +declare 43 win { void TkWmCleanup(TkDisplay *dispPtr) } -declare 46 win { +declare 44 win { void TkSendCleanup(TkDisplay *dispPtr) } -declare 47 win { - void TkFreeXId(TkDisplay *dispPtr) -} # only needed by tktest: -declare 48 win { +declare 45 win { int TkpTestsendCmd(ClientData clientData, Tcl_Interp *interp, int argc, const char **argv) } |