diff options
| author | dgp <dgp@users.sourceforge.net> | 2007-12-10 18:39:27 (GMT) |
|---|---|---|
| committer | dgp <dgp@users.sourceforge.net> | 2007-12-10 18:39:27 (GMT) |
| commit | 81a1693b1c416801e50d052f141b38c68887ea72 (patch) | |
| tree | 368910e3f161ec5aa997ee0d217a3c85c0ec9a93 | |
| parent | 6ac2ed77001947e07c0ddeb2412d6429c0ca3de4 (diff) | |
| download | tk-81a1693b1c416801e50d052f141b38c68887ea72.zip tk-81a1693b1c416801e50d052f141b38c68887ea72.tar.gz tk-81a1693b1c416801e50d052f141b38c68887ea72.tar.bz2 | |
merge updates from HEAD
37 files changed, 984 insertions, 1074 deletions
@@ -1,7 +1,78 @@ +2007-12-10 Joe English <jenglish@users.sourceforge.net> + + * doc/AddOption.3, doc/CrtImgType.3, doc/CrtPhImgFmt.3, + doc/InternAtom.3, doc/TextLayout.3, doc/chooseColor.n, + doc/chooseDirectory.n, doc/loadTk.n, doc/palette.n, + doc/ttk_combobox.n: Various markup fixes (mostly: missing + quotes on .SH arguments, extraneous .PPs) + + * doc/ttk_entry.n, doc/ttk_scrollbar.n, doc/ttk_treeview.n: + Remove extra .BEs that got added by mistake somewhere. + +2007-12-10 Daniel Steffen <das@users.sourceforge.net> + + * generic/tk.decls: use new genstubs 'export' command to + * generic/tkInt.decls: mark exported symbols not in stubs + table [FR 1716117]; cleanup formatting. + + * generic/tkIntDecls.h: regen with new genStubs.tcl. + * generic/tkIntPlatDecls.h: [Tcl Bug 1834288] + * generic/tkIntXlibDecls.h: + * generic/tkPlatDecls.h: + * generic/tkStubInit.c: + +2007-12-10 Donal K. Fellows <donal.k.fellows@manchester.ac.uk> + + * tests/safe.test: Ensure list of hidden commands is correct. [Bug + 1847925] + +2007-12-10 Pat Thoyts <patthoyts@users.sourceforge.net> + + * win/tkWin.h: We must specify the lowest Windows version we intend to + support. In particular the SystemParametersInfo API doesn't like to + receive structures that are larger than it expects which affects the + font assignements. Set to Win98 support. + + * win/tkWinFont.c: Handle failure to read the system parameters. This + causes ttk/fonts.tcl to set any missing named fonts. + + * win/ttkWinMonitor.c: Only tkWin.h should include windows.h unless + * win/ttkWinTheme.c: we have an explicit override of the WINVER + * tin/ttkWinXPTheme.c: macro. + + * win/rules.vc: Handle MSVC 9 (aka: Visual Studio 2008) + + * tests/safe.test: Update for 'unload' as a safe command (tcl 8.5b3+) + +2007-12-09 Donal K. Fellows <dkf@users.sf.net> + + * win/configure.in: Adjusted code so that running configure does not + generate an error message when the full current directory name + contains a space. + + * win/tkWinWm.c: Added set of #defs to make this file build with my + version of the SDK (i.e. with the msys suite we distribute). + +2007-12-07 Joe English <jenglish@users.sourceforge.net> + + * library/ttk/altTheme.tcl, library/ttk/classicTheme.tcl: + s/style/ttk::style/. + +2007-12-07 Don Porter <dgp@users.sourceforge.net> + + * unix/README: Mention the stub library created by `make` and warn + about the effect of embedded paths in the installed binaries. Thanks + to Larry Virden. [Tcl Bug 1794084] + +2007-12-05 Joe English <jenglish@users.sourceforge.net> + + * macosx/ttkMacOSXTheme.c: Fix TCombobox layout so as not to truncate + long text when combobox is wider than requested. [Bug 1845164] + 2007-12-05 Jeff Hobbs <jeffh@ActiveState.com> - * library/demos/widget: reduce start size to 70% of screenheight - from sh-200 for a more reasonable size. + * library/demos/widget: reduce start size to 70% of screenheight from + sh-200 for a more reasonable size. * win/tkWinButton.c, win/tkWinDialog.c: use SetWindowLongPtr and * win/tkWinScrlbr.c, win/tkWinWm.c: GetWindowLongPtr only. @@ -10,16 +81,16 @@ * win/tkWinInt.h: remove CS_CLASSDC (not recommended for any apps now) * win/tkWinX.c: and simplify WNDCLASS to one style. * win/tkWinWm.c: Reduce wrapper update for exStyle to toolwindow - change only and set WS_EX_LAYERED as sticky (once set on a window, - do not remove it) to reduce alpha transition flicker. + change only and set WS_EX_LAYERED as sticky (once set on a window, do + not remove it) to reduce alpha transition flicker. - * win/configure, win/tcl.m4 (LIBS_GUI): mingw needs -lole32 - -loleaut32 but not msvc for Tk's [send]. [Bug 1844749] + * win/configure, win/tcl.m4 (LIBS_GUI): mingw needs -lole32 -loleaut32 + but not msvc for Tk's [send]. [Bug 1844749] 2007-12-04 Joe English <jenglish@users.sourceforge.net> - * doc/ttk_style.n: Remove nonsense about "this manpage has - not yet been written"; everything supported is documented. + * doc/ttk_style.n: Remove nonsense about "this manpage has not yet + been written"; everything supported is documented. 2007-12-04 Donal K. Fellows <dkf@users.sf.net> diff --git a/doc/AddOption.3 b/doc/AddOption.3 index eccc8f2..d084e08 100644 --- a/doc/AddOption.3 +++ b/doc/AddOption.3 @@ -2,7 +2,7 @@ '\" Copyright (c) 1998-2000 by Scriptics Corporation. '\" All rights reserved. '\" -'\" RCS: @(#) $Id: AddOption.3,v 1.4 2007/01/05 00:00:49 nijtmans Exp $ +'\" RCS: @(#) $Id: AddOption.3,v 1.4.2.1 2007/12/10 18:39:27 dgp Exp $ '\" '\" .so man.macros @@ -39,22 +39,17 @@ this value will be returned in calls to \fBTk_GetOption\fR. queried using \fBTk_GetOption\fR, the value with the highest priority is returned. \fIPriority\fR must be between 0 and \fBTK_MAX_PRIO\fR. Some common priority values are: -.TP -20 +.IP 20 Used for default values hard-coded into widgets. -.TP -40 +.IP 40 Used for options specified in application-specific startup files. -.TP -60 +.IP 60 Used for options specified in user-specific defaults files, such as \fB.Xdefaults\fR, resource databases loaded into the X server, or user-specific startup files. -.TP -80 +.IP 80 Used for options specified interactively after the application starts running. -.PP .SH KEYWORDS class, name, option, add diff --git a/doc/CrtImgType.3 b/doc/CrtImgType.3 index 88b9b82..6cb4363 100644 --- a/doc/CrtImgType.3 +++ b/doc/CrtImgType.3 @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" RCS: @(#) $Id: CrtImgType.3,v 1.11 2007/05/14 20:58:25 dgp Exp $ +'\" RCS: @(#) $Id: CrtImgType.3,v 1.11.2.1 2007/12/10 18:39:27 dgp Exp $ '\" .so man.macros .TH Tk_CreateImageType 3 8.5 Tk "Tk Library Procedures" @@ -250,8 +250,7 @@ and the return value is the ClientData value returned by the pointer to the image master data structure). If no such image exists then NULL is returned and NULL is stored at \fI*typePtrPtr\fR. -.SH LEGACY INTERFACE SUPPORT -.PP +.SH "LEGACY INTERFACE SUPPORT" In Tk 8.2 and earlier, the definition of \fBTk_ImageCreateProc\fR was incompatibly different, with the following prototype: .CS diff --git a/doc/CrtPhImgFmt.3 b/doc/CrtPhImgFmt.3 index d640315..e110f5c 100644 --- a/doc/CrtPhImgFmt.3 +++ b/doc/CrtPhImgFmt.3 @@ -9,7 +9,7 @@ '\" Department of Computer Science, '\" Australian National University. '\" -'\" RCS: @(#) $Id: CrtPhImgFmt.3,v 1.8 2007/05/14 20:58:25 dgp Exp $ +'\" RCS: @(#) $Id: CrtPhImgFmt.3,v 1.8.2.1 2007/12/10 18:39:27 dgp Exp $ '\" .so man.macros .TH Tk_CreatePhotoImageFormat 3 8.5 Tk "Tk Library Procedures" @@ -231,8 +231,7 @@ after the name of the format. If appropriate, the characters to specify further details about the image file. The return value is a standard Tcl return value. -.SH LEGACY INTERFACE SUPPORT -.PP +.SH "LEGACY INTERFACE SUPPORT" In Tk 8.2 and earlier, the definition of all the function pointer types stored in fields of a \fBTk_PhotoImageFormat\fR struct were incompatibly different. Legacy programs and libraries dating from diff --git a/doc/InternAtom.3 b/doc/InternAtom.3 index 3daa073..ba5cc3b 100644 --- a/doc/InternAtom.3 +++ b/doc/InternAtom.3 @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" RCS: @(#) $Id: InternAtom.3,v 1.4.2.1 2007/11/01 16:37:13 dgp Exp $ +'\" RCS: @(#) $Id: InternAtom.3,v 1.4.2.2 2007/12/10 18:39:28 dgp Exp $ '\" .so man.macros .TH Tk_InternAtom 3 "" Tk "Tk Library Procedures" @@ -45,7 +45,7 @@ not free this space when finished with the string, and the caller should not modify the contents of the returned string. If there is no atom \fIatom\fR on \fItkwin\fR's display, then \fBTk_GetAtomName\fR returns the string -.QW ?bad atom? . +.QW "?bad atom?" . .PP Tk caches the information returned by \fBTk_InternAtom\fR and \fBTk_GetAtomName\fR diff --git a/doc/TextLayout.3 b/doc/TextLayout.3 index 3039857..6f4b164 100644 --- a/doc/TextLayout.3 +++ b/doc/TextLayout.3 @@ -4,7 +4,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" RCS: @(#) $Id: TextLayout.3,v 1.7.2.1 2007/11/01 16:37:13 dgp Exp $ +'\" RCS: @(#) $Id: TextLayout.3,v 1.7.2.2 2007/12/10 18:39:28 dgp Exp $ '\" .so man.macros .TH Tk_ComputeTextLayout 3 8.1 Tk "Tk Library Procedures" @@ -234,8 +234,7 @@ is the responsibility of the caller to take the Postscript array of strings and add some Postscript function operate on the array to render each of the lines. The code that represents the Postscript array of strings is appended to \fIinterp->result\fR. -.PP -.SH DISPLAY MODEL +.SH "DISPLAY MODEL" When measuring a text layout, space characters that occur at the end of a line are ignored. The space characters still exist and the insertion point can be positioned amongst them, but their additional width is ignored when diff --git a/doc/chooseColor.n b/doc/chooseColor.n index afff881..56bbb6d 100644 --- a/doc/chooseColor.n +++ b/doc/chooseColor.n @@ -4,7 +4,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" RCS: @(#) $Id: chooseColor.n,v 1.3 2002/10/02 21:12:41 hobbs Exp $ +'\" RCS: @(#) $Id: chooseColor.n,v 1.3.8.1 2007/12/10 18:39:28 dgp Exp $ '\" .so man.macros .TH tk_chooseColor n 4.2 Tk "Tk Built-In Commands" @@ -12,7 +12,6 @@ '\" Note: do not modify the .SH NAME line immediately below! .SH NAME tk_chooseColor \- pops up a dialog box for the user to select a color. -.PP .SH SYNOPSIS \fBtk_chooseColor \fR?\fIoption value ...\fR? .BE diff --git a/doc/chooseDirectory.n b/doc/chooseDirectory.n index e28515e..2f9e39a 100644 --- a/doc/chooseDirectory.n +++ b/doc/chooseDirectory.n @@ -2,7 +2,7 @@ '\" Copyright (c) 1998-2000 by Scriptics Corporation. '\" All rights reserved. '\" -'\" RCS: @(#) $Id: chooseDirectory.n,v 1.4.2.4 2007/11/05 14:24:16 dgp Exp $ +'\" RCS: @(#) $Id: chooseDirectory.n,v 1.4.2.5 2007/12/10 18:39:28 dgp Exp $ '\" .so man.macros .TH tk_chooseDirectory n 8.3 Tk "Tk Built-In Commands" @@ -10,7 +10,6 @@ '\" Note: do not modify the .SH NAME line immediately below! .SH NAME tk_chooseDirectory \- pops up a dialog box for the user to select a directory. -.PP .SH SYNOPSIS \fBtk_chooseDirectory \fR?\fIoption value ...\fR? .BE diff --git a/doc/loadTk.n b/doc/loadTk.n index 5aa29a3..6d6b8cb 100644 --- a/doc/loadTk.n +++ b/doc/loadTk.n @@ -4,7 +4,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" RCS: @(#) $Id: loadTk.n,v 1.7.2.1 2007/11/01 16:37:15 dgp Exp $ +'\" RCS: @(#) $Id: loadTk.n,v 1.7.2.2 2007/12/10 18:39:28 dgp Exp $ '\" .so man.macros .TH "Safe Tk" n 8.0 Tk "Tk Built-In Commands" @@ -15,15 +15,13 @@ loadTk \- Load Tk into a safe interpreter. .SH SYNOPSIS \fB::safe::loadTk \fIslave\fR ?\fB\-use\fR \fIwindowId\fR? ?\fB\-display\fR \fIdisplayName\fR? .BE - +.SH DESCRIPTION Safe Tk is based on Safe Tcl, which provides a mechanism that allows restricted and mediated access to auto-loading and packages for safe interpreters. Safe Tk adds the ability to configure the interpreter for safe Tk operations and load Tk into safe interpreters. - -.SH DESCRIPTION .PP The \fB::safe::loadTk\fR command initializes the required data structures in the named safe interpreter and then loads Tk into it. diff --git a/doc/palette.n b/doc/palette.n index 627735a..205a7de 100644 --- a/doc/palette.n +++ b/doc/palette.n @@ -4,7 +4,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" RCS: @(#) $Id: palette.n,v 1.2.32.2 2007/11/02 14:51:39 dgp Exp $ +'\" RCS: @(#) $Id: palette.n,v 1.2.32.3 2007/12/10 18:39:28 dgp Exp $ '\" .so man.macros .TH tk_setPalette n 4.0 Tk "Tk Built-In Commands" @@ -34,7 +34,7 @@ of \fIname\fR\-\fIvalue\fR pairs, where the first argument of the pair is the name of an option in the Tk option database and the second argument is the new value to use for that option. The following database names are currently supported: -.DS L +.DS .ta 4c 8c \fBactiveBackground\fR \fBforeground\fR \fBselectColor\fR \fBactiveForeground\fR \fBhighlightBackground\fR \fBselectBackground\fR diff --git a/doc/ttk_combobox.n b/doc/ttk_combobox.n index 6cc219a..8a23fab 100644 --- a/doc/ttk_combobox.n +++ b/doc/ttk_combobox.n @@ -4,7 +4,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" RCS: @(#) $Id: ttk_combobox.n,v 1.4.2.5 2007/11/02 14:51:39 dgp Exp $ +'\" RCS: @(#) $Id: ttk_combobox.n,v 1.4.2.6 2007/12/10 18:39:28 dgp Exp $ '\" .so man.macros .TH ttk::combobox n 8.5 Tk "Tk Themed Widget" @@ -53,7 +53,6 @@ Specifies the list of values to display in the drop-down listbox. .OP \-width width Width Specifies an integer value indicating the desired width of the entry window, in average-size characters of the widget's font. -.BE .SH "WIDGET COMMAND" .TP \fIpathName \fBcget\fR \fIoption\fR diff --git a/doc/ttk_entry.n b/doc/ttk_entry.n index e30423e..df60f2c 100644 --- a/doc/ttk_entry.n +++ b/doc/ttk_entry.n @@ -7,7 +7,7 @@ '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" '\" SOURCE: entry.n, r1.12 -'\" RCS: @(#) $Id: ttk_entry.n,v 1.3.2.3 2007/11/01 16:37:16 dgp Exp $ +'\" RCS: @(#) $Id: ttk_entry.n,v 1.3.2.4 2007/12/10 18:39:28 dgp Exp $ '\" .so man.macros .TH ttk::entry n 8.5 Tk "Tk Themed Widget" @@ -87,7 +87,6 @@ Specifies an integer value indicating the desired width of the entry window, in average-size characters of the widget's font. .\" Not in ttk: If the value is less than or equal to zero, the widget picks a .\" Not in ttk: size just large enough to hold its current text. -.BE .SH NOTES A portion of the entry may be selected as described below. If an entry is exporting its selection (see the \fBexportSelection\fR diff --git a/doc/ttk_scrollbar.n b/doc/ttk_scrollbar.n index 76a77ba..57a8cf5 100644 --- a/doc/ttk_scrollbar.n +++ b/doc/ttk_scrollbar.n @@ -6,7 +6,7 @@ '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" '\" SOURCE: tk/doc/scrollbar.n, r1.4 -'\" RCS: @(#) $Id: ttk_scrollbar.n,v 1.3.2.3 2007/11/01 16:37:16 dgp Exp $ +'\" RCS: @(#) $Id: ttk_scrollbar.n,v 1.3.2.4 2007/12/10 18:39:28 dgp Exp $ '\" .so man.macros .TH ttk::scrollbar n 8.5 Tk "Tk Themed Widget" @@ -46,7 +46,6 @@ or \fByview\fR (for vertical scrollbars). .OP \-orient orient Orient One of \fBhorizontal\fR or \fBvertical\fR. Specifies the orientation of the scrollbar. -.BE .SH "WIDGET COMMAND" .TP \fIpathName \fBcget\fR \fIoption\fR diff --git a/doc/ttk_treeview.n b/doc/ttk_treeview.n index be324a4..ad6f924 100644 --- a/doc/ttk_treeview.n +++ b/doc/ttk_treeview.n @@ -4,10 +4,11 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" RCS: @(#) $Id: ttk_treeview.n,v 1.5.2.3 2007/11/01 16:37:16 dgp Exp $ +'\" RCS: @(#) $Id: ttk_treeview.n,v 1.5.2.4 2007/12/10 18:39:28 dgp Exp $ '\" .so man.macros .TH ttk::treeview n 8.5 Tk "Tk Themed Widget" +.BS .SH NAME ttk::treeview \- hierarchical multicolumn data display widget .SH SYNOPSIS @@ -135,9 +136,8 @@ The following options may be set on each column: .TP \fB\-id \fIname\fR The column name. This is a read-only option. -For example, -.QW \fI$pathname \fBcolumn #\fIn \fB\-id\fR] -returns the data column associated with data column #\fIn\fR. +For example, [\fI$pathname \fBcolumn #\fIn \fB\-id\fR] +returns the data column associated with display column #\fIn\fR. .TP \fB\-anchor\fR Specifies how the text in this column should be aligned @@ -5,7 +5,7 @@ '\" See the file "license.terms" for information on usage and redistribution '\" of this file, and for a DISCLAIMER OF ALL WARRANTIES. '\" -'\" RCS: @(#) $Id: wm.n,v 1.29.2.4 2007/11/01 16:37:16 dgp Exp $ +'\" RCS: @(#) $Id: wm.n,v 1.29.2.5 2007/12/10 18:39:28 dgp Exp $ '\" .so man.macros .TH wm n 8.5 Tk "Tk Built-In Commands" @@ -105,6 +105,9 @@ Specifies the modification state of the window (determines whether the window close widget contains the modification indicator and whether the proxy icon is draggable). .TP +\fB\-notify\fR +Specifies process notification state (bouncing of the application dock icon). +.TP \fB\-titlepath\fR Specifies the path of the file referenced as the window proxy icon (which can be dragged and dropped in lieu of the file's finder icon). diff --git a/generic/tk.decls b/generic/tk.decls index 18a74ee..1ef1e7d 100644 --- a/generic/tk.decls +++ b/generic/tk.decls @@ -4,14 +4,14 @@ # functions that are exported by the Tk library via the stubs table. # This file is used to generate the tkDecls.h, tkPlatDecls.h, # tkStub.c, and tkPlatStub.c files. -# # # Copyright (c) 1998-2000 Ajuba Solutions. +# Copyright (c) 2007 Daniel A. Steffen <das@users.sourceforge.net> # # 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.32.2.1 2007/10/02 20:43:53 dgp Exp $ +# RCS: @(#) $Id: tk.decls,v 1.32.2.2 2007/12/10 18:39:29 dgp Exp $ library tk @@ -28,1102 +28,886 @@ hooks {tkPlat tkInt tkIntPlat tkIntXlib} # to preserve backwards compatibility. declare 0 generic { - void Tk_MainLoop (void) + void Tk_MainLoop(void) } - declare 1 generic { - XColor *Tk_3DBorderColor (Tk_3DBorder border) + XColor *Tk_3DBorderColor(Tk_3DBorder border) } - declare 2 generic { - GC Tk_3DBorderGC (Tk_Window tkwin, Tk_3DBorder border, + GC Tk_3DBorderGC(Tk_Window tkwin, Tk_3DBorder border, int which) } - declare 3 generic { - void Tk_3DHorizontalBevel (Tk_Window tkwin, + void Tk_3DHorizontalBevel(Tk_Window tkwin, Drawable drawable, Tk_3DBorder border, int x, int y, int width, int height, int leftIn, int rightIn, int topBevel, int relief) } - declare 4 generic { - void Tk_3DVerticalBevel (Tk_Window tkwin, + void Tk_3DVerticalBevel(Tk_Window tkwin, Drawable drawable, Tk_3DBorder border, int x, int y, int width, int height, int leftBevel, int relief) } - declare 5 generic { - void Tk_AddOption (Tk_Window tkwin, CONST char *name, + void Tk_AddOption(Tk_Window tkwin, CONST char *name, CONST char *value, int priority) } - declare 6 generic { - void Tk_BindEvent (Tk_BindingTable bindingTable, + void Tk_BindEvent(Tk_BindingTable bindingTable, XEvent *eventPtr, Tk_Window tkwin, int numObjects, ClientData *objectPtr) } - declare 7 generic { - void Tk_CanvasDrawableCoords (Tk_Canvas canvas, + void Tk_CanvasDrawableCoords(Tk_Canvas canvas, double x, double y, short *drawableXPtr, short *drawableYPtr) } - declare 8 generic { - void Tk_CanvasEventuallyRedraw (Tk_Canvas canvas, int x1, int y1, + void Tk_CanvasEventuallyRedraw(Tk_Canvas canvas, int x1, int y1, int x2, int y2) } - declare 9 generic { - int Tk_CanvasGetCoord (Tcl_Interp *interp, + int Tk_CanvasGetCoord(Tcl_Interp *interp, Tk_Canvas canvas, CONST char *str, double *doublePtr) } - declare 10 generic { - Tk_CanvasTextInfo *Tk_CanvasGetTextInfo (Tk_Canvas canvas) + Tk_CanvasTextInfo *Tk_CanvasGetTextInfo(Tk_Canvas canvas) } - declare 11 generic { - int Tk_CanvasPsBitmap (Tcl_Interp *interp, + int Tk_CanvasPsBitmap(Tcl_Interp *interp, Tk_Canvas canvas, Pixmap bitmap, int x, int y, int width, int height) } - declare 12 generic { - int Tk_CanvasPsColor (Tcl_Interp *interp, + int Tk_CanvasPsColor(Tcl_Interp *interp, Tk_Canvas canvas, XColor *colorPtr) } - declare 13 generic { - int Tk_CanvasPsFont (Tcl_Interp *interp, + int Tk_CanvasPsFont(Tcl_Interp *interp, Tk_Canvas canvas, Tk_Font font) } - declare 14 generic { - void Tk_CanvasPsPath (Tcl_Interp *interp, + void Tk_CanvasPsPath(Tcl_Interp *interp, Tk_Canvas canvas, double *coordPtr, int numPoints) } - declare 15 generic { - int Tk_CanvasPsStipple (Tcl_Interp *interp, + int Tk_CanvasPsStipple(Tcl_Interp *interp, Tk_Canvas canvas, Pixmap bitmap) } - declare 16 generic { - double Tk_CanvasPsY (Tk_Canvas canvas, double y) + double Tk_CanvasPsY(Tk_Canvas canvas, double y) } - declare 17 generic { - void Tk_CanvasSetStippleOrigin (Tk_Canvas canvas, GC gc) + void Tk_CanvasSetStippleOrigin(Tk_Canvas canvas, GC gc) } - declare 18 generic { - int Tk_CanvasTagsParseProc (ClientData clientData, Tcl_Interp *interp, + int Tk_CanvasTagsParseProc(ClientData clientData, Tcl_Interp *interp, Tk_Window tkwin, CONST char *value, char *widgRec, int offset) } - declare 19 generic { - char * Tk_CanvasTagsPrintProc (ClientData clientData, Tk_Window tkwin, + char * Tk_CanvasTagsPrintProc(ClientData clientData, Tk_Window tkwin, char *widgRec, int offset, Tcl_FreeProc **freeProcPtr) } - declare 20 generic { - Tk_Window Tk_CanvasTkwin (Tk_Canvas canvas) + Tk_Window Tk_CanvasTkwin(Tk_Canvas canvas) } - declare 21 generic { - void Tk_CanvasWindowCoords (Tk_Canvas canvas, double x, double y, + void Tk_CanvasWindowCoords(Tk_Canvas canvas, double x, double y, short *screenXPtr, short *screenYPtr) } - declare 22 generic { - void Tk_ChangeWindowAttributes (Tk_Window tkwin, unsigned long valueMask, + void Tk_ChangeWindowAttributes(Tk_Window tkwin, unsigned long valueMask, XSetWindowAttributes *attsPtr) } - declare 23 generic { - int Tk_CharBbox (Tk_TextLayout layout, int index, int *xPtr, + int Tk_CharBbox(Tk_TextLayout layout, int index, int *xPtr, int *yPtr, int *widthPtr, int *heightPtr) } - declare 24 generic { - void Tk_ClearSelection (Tk_Window tkwin, Atom selection) + void Tk_ClearSelection(Tk_Window tkwin, Atom selection) } - declare 25 generic { - int Tk_ClipboardAppend (Tcl_Interp *interp,Tk_Window tkwin, + int Tk_ClipboardAppend(Tcl_Interp *interp,Tk_Window tkwin, Atom target, Atom format, char* buffer) } - declare 26 generic { - int Tk_ClipboardClear (Tcl_Interp *interp, Tk_Window tkwin) + int Tk_ClipboardClear(Tcl_Interp *interp, Tk_Window tkwin) } - declare 27 generic { - int Tk_ConfigureInfo (Tcl_Interp *interp, + int Tk_ConfigureInfo(Tcl_Interp *interp, Tk_Window tkwin, Tk_ConfigSpec *specs, char *widgRec, CONST char *argvName, int flags) } - declare 28 generic { - int Tk_ConfigureValue (Tcl_Interp *interp, + int Tk_ConfigureValue(Tcl_Interp *interp, Tk_Window tkwin, Tk_ConfigSpec *specs, char *widgRec, CONST char *argvName, int flags) } - declare 29 generic { - int Tk_ConfigureWidget (Tcl_Interp *interp, + int Tk_ConfigureWidget(Tcl_Interp *interp, Tk_Window tkwin, Tk_ConfigSpec *specs, int argc, CONST84 char **argv, char *widgRec, int flags) } - declare 30 generic { - void Tk_ConfigureWindow (Tk_Window tkwin, + void Tk_ConfigureWindow(Tk_Window tkwin, unsigned int valueMask, XWindowChanges *valuePtr) } - declare 31 generic { - Tk_TextLayout Tk_ComputeTextLayout (Tk_Font font, + Tk_TextLayout Tk_ComputeTextLayout(Tk_Font font, CONST char *str, int numChars, int wrapLength, Tk_Justify justify, int flags, int *widthPtr, int *heightPtr) } - declare 32 generic { - Tk_Window Tk_CoordsToWindow (int rootX, int rootY, Tk_Window tkwin) + Tk_Window Tk_CoordsToWindow(int rootX, int rootY, Tk_Window tkwin) } - declare 33 generic { - unsigned long Tk_CreateBinding (Tcl_Interp *interp, + unsigned long Tk_CreateBinding(Tcl_Interp *interp, Tk_BindingTable bindingTable, ClientData object, CONST char *eventStr, CONST char *command, int append) } - declare 34 generic { - Tk_BindingTable Tk_CreateBindingTable (Tcl_Interp *interp) + Tk_BindingTable Tk_CreateBindingTable(Tcl_Interp *interp) } - declare 35 generic { - Tk_ErrorHandler Tk_CreateErrorHandler (Display *display, + Tk_ErrorHandler Tk_CreateErrorHandler(Display *display, int errNum, int request, int minorCode, Tk_ErrorProc *errorProc, ClientData clientData) } - declare 36 generic { - void Tk_CreateEventHandler (Tk_Window token, + void Tk_CreateEventHandler(Tk_Window token, unsigned long mask, Tk_EventProc *proc, ClientData clientData) } - declare 37 generic { - void Tk_CreateGenericHandler (Tk_GenericProc *proc, ClientData clientData) + void Tk_CreateGenericHandler(Tk_GenericProc *proc, ClientData clientData) } - declare 38 generic { - void Tk_CreateImageType (Tk_ImageType *typePtr) + void Tk_CreateImageType(Tk_ImageType *typePtr) } - declare 39 generic { - void Tk_CreateItemType (Tk_ItemType *typePtr) + void Tk_CreateItemType(Tk_ItemType *typePtr) } - declare 40 generic { - void Tk_CreatePhotoImageFormat (Tk_PhotoImageFormat *formatPtr) + void Tk_CreatePhotoImageFormat(Tk_PhotoImageFormat *formatPtr) } - declare 41 generic { - void Tk_CreateSelHandler (Tk_Window tkwin, + void Tk_CreateSelHandler(Tk_Window tkwin, Atom selection, Atom target, Tk_SelectionProc *proc, ClientData clientData, Atom format) } - declare 42 generic { - Tk_Window Tk_CreateWindow (Tcl_Interp *interp, + Tk_Window Tk_CreateWindow(Tcl_Interp *interp, Tk_Window parent, CONST char *name, CONST char *screenName) } - declare 43 generic { - Tk_Window Tk_CreateWindowFromPath (Tcl_Interp *interp, Tk_Window tkwin, + Tk_Window Tk_CreateWindowFromPath(Tcl_Interp *interp, Tk_Window tkwin, CONST char *pathName, CONST char *screenName) } - declare 44 generic { - int Tk_DefineBitmap (Tcl_Interp *interp, CONST char *name, + int Tk_DefineBitmap(Tcl_Interp *interp, CONST char *name, CONST char *source, int width, int height) } - declare 45 generic { - void Tk_DefineCursor (Tk_Window window, Tk_Cursor cursor) + void Tk_DefineCursor(Tk_Window window, Tk_Cursor cursor) } - declare 46 generic { - void Tk_DeleteAllBindings (Tk_BindingTable bindingTable, ClientData object) + void Tk_DeleteAllBindings(Tk_BindingTable bindingTable, ClientData object) } - declare 47 generic { - int Tk_DeleteBinding (Tcl_Interp *interp, + int Tk_DeleteBinding(Tcl_Interp *interp, Tk_BindingTable bindingTable, ClientData object, CONST char *eventStr) } - declare 48 generic { - void Tk_DeleteBindingTable (Tk_BindingTable bindingTable) + void Tk_DeleteBindingTable(Tk_BindingTable bindingTable) } - declare 49 generic { - void Tk_DeleteErrorHandler (Tk_ErrorHandler handler) + void Tk_DeleteErrorHandler(Tk_ErrorHandler handler) } - declare 50 generic { - void Tk_DeleteEventHandler (Tk_Window token, + void Tk_DeleteEventHandler(Tk_Window token, unsigned long mask, Tk_EventProc *proc, ClientData clientData) } - declare 51 generic { - void Tk_DeleteGenericHandler (Tk_GenericProc *proc, ClientData clientData) + void Tk_DeleteGenericHandler(Tk_GenericProc *proc, ClientData clientData) } - declare 52 generic { - void Tk_DeleteImage (Tcl_Interp *interp, CONST char *name) + void Tk_DeleteImage(Tcl_Interp *interp, CONST char *name) } - declare 53 generic { - void Tk_DeleteSelHandler (Tk_Window tkwin, Atom selection, Atom target) + void Tk_DeleteSelHandler(Tk_Window tkwin, Atom selection, Atom target) } - declare 54 generic { - void Tk_DestroyWindow (Tk_Window tkwin) + void Tk_DestroyWindow(Tk_Window tkwin) } - declare 55 generic { - CONST84_RETURN char * Tk_DisplayName (Tk_Window tkwin) + CONST84_RETURN char * Tk_DisplayName(Tk_Window tkwin) } - declare 56 generic { - int Tk_DistanceToTextLayout (Tk_TextLayout layout, int x, int y) + int Tk_DistanceToTextLayout(Tk_TextLayout layout, int x, int y) } - declare 57 generic { - void Tk_Draw3DPolygon (Tk_Window tkwin, + void Tk_Draw3DPolygon(Tk_Window tkwin, Drawable drawable, Tk_3DBorder border, XPoint *pointPtr, int numPoints, int borderWidth, int leftRelief) } - declare 58 generic { - void Tk_Draw3DRectangle (Tk_Window tkwin, Drawable drawable, + void Tk_Draw3DRectangle(Tk_Window tkwin, Drawable drawable, Tk_3DBorder border, int x, int y, int width, int height, int borderWidth, int relief) } - declare 59 generic { - void Tk_DrawChars (Display *display, Drawable drawable, GC gc, + void Tk_DrawChars(Display *display, Drawable drawable, GC gc, Tk_Font tkfont, CONST char *source, int numBytes, int x, int y) } - declare 60 generic { - void Tk_DrawFocusHighlight (Tk_Window tkwin, GC gc, int width, + void Tk_DrawFocusHighlight(Tk_Window tkwin, GC gc, int width, Drawable drawable) } - declare 61 generic { - void Tk_DrawTextLayout (Display *display, + void Tk_DrawTextLayout(Display *display, Drawable drawable, GC gc, Tk_TextLayout layout, int x, int y, int firstChar, int lastChar) } - declare 62 generic { - void Tk_Fill3DPolygon (Tk_Window tkwin, + void Tk_Fill3DPolygon(Tk_Window tkwin, Drawable drawable, Tk_3DBorder border, XPoint *pointPtr, int numPoints, int borderWidth, int leftRelief) } - declare 63 generic { - void Tk_Fill3DRectangle (Tk_Window tkwin, + void Tk_Fill3DRectangle(Tk_Window tkwin, Drawable drawable, Tk_3DBorder border, int x, int y, int width, int height, int borderWidth, int relief) } - declare 64 generic { - Tk_PhotoHandle Tk_FindPhoto (Tcl_Interp *interp, CONST char *imageName) + Tk_PhotoHandle Tk_FindPhoto(Tcl_Interp *interp, CONST char *imageName) } - declare 65 generic { - Font Tk_FontId (Tk_Font font) + Font Tk_FontId(Tk_Font font) } - declare 66 generic { - void Tk_Free3DBorder (Tk_3DBorder border) + void Tk_Free3DBorder(Tk_3DBorder border) } - declare 67 generic { - void Tk_FreeBitmap (Display *display, Pixmap bitmap) + void Tk_FreeBitmap(Display *display, Pixmap bitmap) } - declare 68 generic { - void Tk_FreeColor (XColor *colorPtr) + void Tk_FreeColor(XColor *colorPtr) } - declare 69 generic { - void Tk_FreeColormap (Display *display, Colormap colormap) + void Tk_FreeColormap(Display *display, Colormap colormap) } - declare 70 generic { - void Tk_FreeCursor (Display *display, Tk_Cursor cursor) + void Tk_FreeCursor(Display *display, Tk_Cursor cursor) } - declare 71 generic { - void Tk_FreeFont (Tk_Font f) + void Tk_FreeFont(Tk_Font f) } - declare 72 generic { - void Tk_FreeGC (Display *display, GC gc) + void Tk_FreeGC(Display *display, GC gc) } - declare 73 generic { - void Tk_FreeImage (Tk_Image image) + void Tk_FreeImage(Tk_Image image) } - declare 74 generic { - void Tk_FreeOptions (Tk_ConfigSpec *specs, + void Tk_FreeOptions(Tk_ConfigSpec *specs, char *widgRec, Display *display, int needFlags) } - declare 75 generic { - void Tk_FreePixmap (Display *display, Pixmap pixmap) + void Tk_FreePixmap(Display *display, Pixmap pixmap) } - declare 76 generic { - void Tk_FreeTextLayout (Tk_TextLayout textLayout) + void Tk_FreeTextLayout(Tk_TextLayout textLayout) } - declare 77 generic { - void Tk_FreeXId (Display *display, XID xid) + void Tk_FreeXId(Display *display, XID xid) } - declare 78 generic { - GC Tk_GCForColor (XColor *colorPtr, Drawable drawable) + GC Tk_GCForColor(XColor *colorPtr, Drawable drawable) } - declare 79 generic { - void Tk_GeometryRequest (Tk_Window tkwin, int reqWidth, int reqHeight) + void Tk_GeometryRequest(Tk_Window tkwin, int reqWidth, int reqHeight) } - declare 80 generic { - Tk_3DBorder Tk_Get3DBorder (Tcl_Interp *interp, Tk_Window tkwin, + Tk_3DBorder Tk_Get3DBorder(Tcl_Interp *interp, Tk_Window tkwin, Tk_Uid colorName) } - declare 81 generic { - void Tk_GetAllBindings (Tcl_Interp *interp, + void Tk_GetAllBindings(Tcl_Interp *interp, Tk_BindingTable bindingTable, ClientData object) } - declare 82 generic { - int Tk_GetAnchor (Tcl_Interp *interp, + int Tk_GetAnchor(Tcl_Interp *interp, CONST char *str, Tk_Anchor *anchorPtr) } - declare 83 generic { - CONST84_RETURN char * Tk_GetAtomName (Tk_Window tkwin, Atom atom) + CONST84_RETURN char * Tk_GetAtomName(Tk_Window tkwin, Atom atom) } - declare 84 generic { - CONST84_RETURN char * Tk_GetBinding (Tcl_Interp *interp, + CONST84_RETURN char * Tk_GetBinding(Tcl_Interp *interp, Tk_BindingTable bindingTable, ClientData object, CONST char *eventStr) } - declare 85 generic { - Pixmap Tk_GetBitmap (Tcl_Interp *interp, Tk_Window tkwin, CONST char * str) + Pixmap Tk_GetBitmap(Tcl_Interp *interp, Tk_Window tkwin, CONST char * str) } - declare 86 generic { - Pixmap Tk_GetBitmapFromData (Tcl_Interp *interp, + Pixmap Tk_GetBitmapFromData(Tcl_Interp *interp, Tk_Window tkwin, CONST char *source, int width, int height) } - declare 87 generic { - int Tk_GetCapStyle (Tcl_Interp *interp, CONST char *str, int *capPtr) + int Tk_GetCapStyle(Tcl_Interp *interp, CONST char *str, int *capPtr) } - declare 88 generic { - XColor * Tk_GetColor (Tcl_Interp *interp, Tk_Window tkwin, Tk_Uid name) + XColor * Tk_GetColor(Tcl_Interp *interp, Tk_Window tkwin, Tk_Uid name) } - declare 89 generic { - XColor * Tk_GetColorByValue (Tk_Window tkwin, XColor *colorPtr) + XColor * Tk_GetColorByValue(Tk_Window tkwin, XColor *colorPtr) } - declare 90 generic { - Colormap Tk_GetColormap (Tcl_Interp *interp, Tk_Window tkwin, + Colormap Tk_GetColormap(Tcl_Interp *interp, Tk_Window tkwin, CONST char *str) } - declare 91 generic { - Tk_Cursor Tk_GetCursor (Tcl_Interp *interp, Tk_Window tkwin, + Tk_Cursor Tk_GetCursor(Tcl_Interp *interp, Tk_Window tkwin, Tk_Uid str) } - declare 92 generic { - Tk_Cursor Tk_GetCursorFromData (Tcl_Interp *interp, + Tk_Cursor Tk_GetCursorFromData(Tcl_Interp *interp, Tk_Window tkwin, CONST char *source, CONST char *mask, int width, int height, int xHot, int yHot, Tk_Uid fg, Tk_Uid bg) } - declare 93 generic { - Tk_Font Tk_GetFont (Tcl_Interp *interp, + Tk_Font Tk_GetFont(Tcl_Interp *interp, Tk_Window tkwin, CONST char *str) } - declare 94 generic { - Tk_Font Tk_GetFontFromObj (Tk_Window tkwin, Tcl_Obj *objPtr) + Tk_Font Tk_GetFontFromObj(Tk_Window tkwin, Tcl_Obj *objPtr) } - declare 95 generic { - void Tk_GetFontMetrics (Tk_Font font, Tk_FontMetrics *fmPtr) + void Tk_GetFontMetrics(Tk_Font font, Tk_FontMetrics *fmPtr) } - declare 96 generic { - GC Tk_GetGC (Tk_Window tkwin, unsigned long valueMask, XGCValues *valuePtr) + GC Tk_GetGC(Tk_Window tkwin, unsigned long valueMask, XGCValues *valuePtr) } - declare 97 generic { - Tk_Image Tk_GetImage (Tcl_Interp *interp, Tk_Window tkwin, CONST char *name, + Tk_Image Tk_GetImage(Tcl_Interp *interp, Tk_Window tkwin, CONST char *name, Tk_ImageChangedProc *changeProc, ClientData clientData) } - declare 98 generic { - ClientData Tk_GetImageMasterData (Tcl_Interp *interp, + ClientData Tk_GetImageMasterData(Tcl_Interp *interp, CONST char *name, Tk_ImageType **typePtrPtr) } - declare 99 generic { - Tk_ItemType * Tk_GetItemTypes (void) + Tk_ItemType * Tk_GetItemTypes(void) } - declare 100 generic { - int Tk_GetJoinStyle (Tcl_Interp *interp, CONST char *str, int *joinPtr) + int Tk_GetJoinStyle(Tcl_Interp *interp, CONST char *str, int *joinPtr) } - declare 101 generic { - int Tk_GetJustify (Tcl_Interp *interp, + int Tk_GetJustify(Tcl_Interp *interp, CONST char *str, Tk_Justify *justifyPtr) } - declare 102 generic { - int Tk_GetNumMainWindows (void) + int Tk_GetNumMainWindows(void) } - declare 103 generic { - Tk_Uid Tk_GetOption (Tk_Window tkwin, CONST char *name, + Tk_Uid Tk_GetOption(Tk_Window tkwin, CONST char *name, CONST char *className) } - declare 104 generic { - int Tk_GetPixels (Tcl_Interp *interp, + int Tk_GetPixels(Tcl_Interp *interp, Tk_Window tkwin, CONST char *str, int *intPtr) } - declare 105 generic { - Pixmap Tk_GetPixmap (Display *display, Drawable d, + Pixmap Tk_GetPixmap(Display *display, Drawable d, int width, int height, int depth) } - declare 106 generic { - int Tk_GetRelief (Tcl_Interp *interp, CONST char *name, int *reliefPtr) + int Tk_GetRelief(Tcl_Interp *interp, CONST char *name, int *reliefPtr) } - declare 107 generic { - void Tk_GetRootCoords (Tk_Window tkwin, int *xPtr, int *yPtr) + void Tk_GetRootCoords(Tk_Window tkwin, int *xPtr, int *yPtr) } - declare 108 generic { - int Tk_GetScrollInfo (Tcl_Interp *interp, + int Tk_GetScrollInfo(Tcl_Interp *interp, int argc, CONST84 char **argv, double *dblPtr, int *intPtr) } - declare 109 generic { - int Tk_GetScreenMM (Tcl_Interp *interp, + int Tk_GetScreenMM(Tcl_Interp *interp, Tk_Window tkwin, CONST char *str, double *doublePtr) } - declare 110 generic { - int Tk_GetSelection (Tcl_Interp *interp, + int Tk_GetSelection(Tcl_Interp *interp, Tk_Window tkwin, Atom selection, Atom target, Tk_GetSelProc *proc, ClientData clientData) } - declare 111 generic { - Tk_Uid Tk_GetUid (CONST char *str) + Tk_Uid Tk_GetUid(CONST char *str) } - declare 112 generic { - Visual * Tk_GetVisual (Tcl_Interp *interp, + Visual * Tk_GetVisual(Tcl_Interp *interp, Tk_Window tkwin, CONST char *str, int *depthPtr, Colormap *colormapPtr) } - declare 113 generic { - void Tk_GetVRootGeometry (Tk_Window tkwin, + void Tk_GetVRootGeometry(Tk_Window tkwin, int *xPtr, int *yPtr, int *widthPtr, int *heightPtr) } - declare 114 generic { - int Tk_Grab (Tcl_Interp *interp, Tk_Window tkwin, int grabGlobal) + int Tk_Grab(Tcl_Interp *interp, Tk_Window tkwin, int grabGlobal) } - declare 115 generic { - void Tk_HandleEvent (XEvent *eventPtr) + void Tk_HandleEvent(XEvent *eventPtr) } - declare 116 generic { - Tk_Window Tk_IdToWindow (Display *display, Window window) + Tk_Window Tk_IdToWindow(Display *display, Window window) } - declare 117 generic { - void Tk_ImageChanged (Tk_ImageMaster master, int x, int y, + void Tk_ImageChanged(Tk_ImageMaster master, int x, int y, int width, int height, int imageWidth, int imageHeight) } - declare 118 generic { - int Tk_Init (Tcl_Interp *interp) + int Tk_Init(Tcl_Interp *interp) } - declare 119 generic { - Atom Tk_InternAtom (Tk_Window tkwin, CONST char *name) + Atom Tk_InternAtom(Tk_Window tkwin, CONST char *name) } - declare 120 generic { - int Tk_IntersectTextLayout (Tk_TextLayout layout, int x, int y, + int Tk_IntersectTextLayout(Tk_TextLayout layout, int x, int y, int width, int height) } - declare 121 generic { - void Tk_MaintainGeometry (Tk_Window slave, + void Tk_MaintainGeometry(Tk_Window slave, Tk_Window master, int x, int y, int width, int height) } - declare 122 generic { - Tk_Window Tk_MainWindow (Tcl_Interp *interp) + Tk_Window Tk_MainWindow(Tcl_Interp *interp) } - declare 123 generic { - void Tk_MakeWindowExist (Tk_Window tkwin) + void Tk_MakeWindowExist(Tk_Window tkwin) } - declare 124 generic { - void Tk_ManageGeometry (Tk_Window tkwin, + void Tk_ManageGeometry(Tk_Window tkwin, CONST Tk_GeomMgr *mgrPtr, ClientData clientData) } - declare 125 generic { - void Tk_MapWindow (Tk_Window tkwin) + void Tk_MapWindow(Tk_Window tkwin) } - declare 126 generic { - int Tk_MeasureChars (Tk_Font tkfont, + int Tk_MeasureChars(Tk_Font tkfont, CONST char *source, int numBytes, int maxPixels, int flags, int *lengthPtr) } - declare 127 generic { - void Tk_MoveResizeWindow (Tk_Window tkwin, + void Tk_MoveResizeWindow(Tk_Window tkwin, int x, int y, int width, int height) } - declare 128 generic { - void Tk_MoveWindow (Tk_Window tkwin, int x, int y) + void Tk_MoveWindow(Tk_Window tkwin, int x, int y) } - declare 129 generic { - void Tk_MoveToplevelWindow (Tk_Window tkwin, int x, int y) + void Tk_MoveToplevelWindow(Tk_Window tkwin, int x, int y) } - declare 130 generic { - CONST84_RETURN char * Tk_NameOf3DBorder (Tk_3DBorder border) + CONST84_RETURN char * Tk_NameOf3DBorder(Tk_3DBorder border) } - declare 131 generic { - CONST84_RETURN char * Tk_NameOfAnchor (Tk_Anchor anchor) + CONST84_RETURN char * Tk_NameOfAnchor(Tk_Anchor anchor) } - declare 132 generic { - CONST84_RETURN char * Tk_NameOfBitmap (Display *display, Pixmap bitmap) + CONST84_RETURN char * Tk_NameOfBitmap(Display *display, Pixmap bitmap) } - declare 133 generic { - CONST84_RETURN char * Tk_NameOfCapStyle (int cap) + CONST84_RETURN char * Tk_NameOfCapStyle(int cap) } - declare 134 generic { - CONST84_RETURN char * Tk_NameOfColor (XColor *colorPtr) + CONST84_RETURN char * Tk_NameOfColor(XColor *colorPtr) } - declare 135 generic { - CONST84_RETURN char * Tk_NameOfCursor (Display *display, Tk_Cursor cursor) + CONST84_RETURN char * Tk_NameOfCursor(Display *display, Tk_Cursor cursor) } - declare 136 generic { - CONST84_RETURN char * Tk_NameOfFont (Tk_Font font) + CONST84_RETURN char * Tk_NameOfFont(Tk_Font font) } - declare 137 generic { - CONST84_RETURN char * Tk_NameOfImage (Tk_ImageMaster imageMaster) + CONST84_RETURN char * Tk_NameOfImage(Tk_ImageMaster imageMaster) } - declare 138 generic { - CONST84_RETURN char * Tk_NameOfJoinStyle (int join) + CONST84_RETURN char * Tk_NameOfJoinStyle(int join) } - declare 139 generic { - CONST84_RETURN char * Tk_NameOfJustify (Tk_Justify justify) + CONST84_RETURN char * Tk_NameOfJustify(Tk_Justify justify) } - declare 140 generic { - CONST84_RETURN char * Tk_NameOfRelief (int relief) + CONST84_RETURN char * Tk_NameOfRelief(int relief) } - declare 141 generic { - Tk_Window Tk_NameToWindow (Tcl_Interp *interp, + Tk_Window Tk_NameToWindow(Tcl_Interp *interp, CONST char *pathName, Tk_Window tkwin) } - declare 142 generic { - void Tk_OwnSelection (Tk_Window tkwin, + void Tk_OwnSelection(Tk_Window tkwin, Atom selection, Tk_LostSelProc *proc, ClientData clientData) } - declare 143 generic { - int Tk_ParseArgv (Tcl_Interp *interp, + int Tk_ParseArgv(Tcl_Interp *interp, Tk_Window tkwin, int *argcPtr, CONST84 char **argv, Tk_ArgvInfo *argTable, int flags) } - declare 144 generic { - void Tk_PhotoPutBlock_NoComposite (Tk_PhotoHandle handle, + void Tk_PhotoPutBlock_NoComposite(Tk_PhotoHandle handle, Tk_PhotoImageBlock *blockPtr, int x, int y, int width, int height) } - declare 145 generic { - void Tk_PhotoPutZoomedBlock_NoComposite (Tk_PhotoHandle handle, + void Tk_PhotoPutZoomedBlock_NoComposite(Tk_PhotoHandle handle, Tk_PhotoImageBlock *blockPtr, int x, int y, int width, int height, int zoomX, int zoomY, int subsampleX, int subsampleY) } - declare 146 generic { - int Tk_PhotoGetImage (Tk_PhotoHandle handle, Tk_PhotoImageBlock *blockPtr) + int Tk_PhotoGetImage(Tk_PhotoHandle handle, Tk_PhotoImageBlock *blockPtr) } - declare 147 generic { - void Tk_PhotoBlank (Tk_PhotoHandle handle) + void Tk_PhotoBlank(Tk_PhotoHandle handle) } - declare 148 generic { - void Tk_PhotoExpand_Panic (Tk_PhotoHandle handle, int width, int height ) + void Tk_PhotoExpand_Panic(Tk_PhotoHandle handle, int width, int height ) } - declare 149 generic { - void Tk_PhotoGetSize (Tk_PhotoHandle handle, int *widthPtr, int *heightPtr) + void Tk_PhotoGetSize(Tk_PhotoHandle handle, int *widthPtr, int *heightPtr) } - declare 150 generic { - void Tk_PhotoSetSize_Panic (Tk_PhotoHandle handle, int width, int height) + void Tk_PhotoSetSize_Panic(Tk_PhotoHandle handle, int width, int height) } - declare 151 generic { - int Tk_PointToChar (Tk_TextLayout layout, int x, int y) + int Tk_PointToChar(Tk_TextLayout layout, int x, int y) } - declare 152 generic { - int Tk_PostscriptFontName (Tk_Font tkfont, Tcl_DString *dsPtr) + int Tk_PostscriptFontName(Tk_Font tkfont, Tcl_DString *dsPtr) } - declare 153 generic { - void Tk_PreserveColormap (Display *display, Colormap colormap) + void Tk_PreserveColormap(Display *display, Colormap colormap) } - declare 154 generic { - void Tk_QueueWindowEvent (XEvent *eventPtr, Tcl_QueuePosition position) + void Tk_QueueWindowEvent(XEvent *eventPtr, Tcl_QueuePosition position) } - declare 155 generic { - void Tk_RedrawImage (Tk_Image image, int imageX, + void Tk_RedrawImage(Tk_Image image, int imageX, int imageY, int width, int height, Drawable drawable, int drawableX, int drawableY) } - declare 156 generic { - void Tk_ResizeWindow (Tk_Window tkwin, int width, int height) + void Tk_ResizeWindow(Tk_Window tkwin, int width, int height) } - declare 157 generic { - int Tk_RestackWindow (Tk_Window tkwin, int aboveBelow, Tk_Window other) + int Tk_RestackWindow(Tk_Window tkwin, int aboveBelow, Tk_Window other) } - declare 158 generic { - Tk_RestrictProc *Tk_RestrictEvents (Tk_RestrictProc *proc, + Tk_RestrictProc *Tk_RestrictEvents(Tk_RestrictProc *proc, ClientData arg, ClientData *prevArgPtr) } - declare 159 generic { - int Tk_SafeInit (Tcl_Interp *interp) + int Tk_SafeInit(Tcl_Interp *interp) } - declare 160 generic { - CONST char * Tk_SetAppName (Tk_Window tkwin, CONST char *name) + CONST char * Tk_SetAppName(Tk_Window tkwin, CONST char *name) } - declare 161 generic { - void Tk_SetBackgroundFromBorder (Tk_Window tkwin, Tk_3DBorder border) + void Tk_SetBackgroundFromBorder(Tk_Window tkwin, Tk_3DBorder border) } - declare 162 generic { - void Tk_SetClass (Tk_Window tkwin, CONST char *className) + void Tk_SetClass(Tk_Window tkwin, CONST char *className) } - declare 163 generic { - void Tk_SetGrid (Tk_Window tkwin, int reqWidth, int reqHeight, + void Tk_SetGrid(Tk_Window tkwin, int reqWidth, int reqHeight, int gridWidth, int gridHeight) } - declare 164 generic { - void Tk_SetInternalBorder (Tk_Window tkwin, int width) + void Tk_SetInternalBorder(Tk_Window tkwin, int width) } - declare 165 generic { - void Tk_SetWindowBackground (Tk_Window tkwin, unsigned long pixel) + void Tk_SetWindowBackground(Tk_Window tkwin, unsigned long pixel) } - declare 166 generic { - void Tk_SetWindowBackgroundPixmap (Tk_Window tkwin, Pixmap pixmap) + void Tk_SetWindowBackgroundPixmap(Tk_Window tkwin, Pixmap pixmap) } - declare 167 generic { - void Tk_SetWindowBorder (Tk_Window tkwin, unsigned long pixel) + void Tk_SetWindowBorder(Tk_Window tkwin, unsigned long pixel) } - declare 168 generic { - void Tk_SetWindowBorderWidth (Tk_Window tkwin, int width) + void Tk_SetWindowBorderWidth(Tk_Window tkwin, int width) } - declare 169 generic { - void Tk_SetWindowBorderPixmap (Tk_Window tkwin, Pixmap pixmap) + void Tk_SetWindowBorderPixmap(Tk_Window tkwin, Pixmap pixmap) } - declare 170 generic { - void Tk_SetWindowColormap (Tk_Window tkwin, Colormap colormap) + void Tk_SetWindowColormap(Tk_Window tkwin, Colormap colormap) } - declare 171 generic { - int Tk_SetWindowVisual (Tk_Window tkwin, Visual *visual, int depth, + int Tk_SetWindowVisual(Tk_Window tkwin, Visual *visual, int depth, Colormap colormap) } - declare 172 generic { - void Tk_SizeOfBitmap (Display *display, Pixmap bitmap, int *widthPtr, + void Tk_SizeOfBitmap(Display *display, Pixmap bitmap, int *widthPtr, int *heightPtr) } - declare 173 generic { - void Tk_SizeOfImage (Tk_Image image, int *widthPtr, int *heightPtr) + void Tk_SizeOfImage(Tk_Image image, int *widthPtr, int *heightPtr) } - declare 174 generic { - int Tk_StrictMotif (Tk_Window tkwin) + int Tk_StrictMotif(Tk_Window tkwin) } - declare 175 generic { - void Tk_TextLayoutToPostscript (Tcl_Interp *interp, Tk_TextLayout layout) + void Tk_TextLayoutToPostscript(Tcl_Interp *interp, Tk_TextLayout layout) } - declare 176 generic { - int Tk_TextWidth (Tk_Font font, CONST char *str, int numBytes) + int Tk_TextWidth(Tk_Font font, CONST char *str, int numBytes) } - declare 177 generic { - void Tk_UndefineCursor (Tk_Window window) + void Tk_UndefineCursor(Tk_Window window) } - declare 178 generic { - void Tk_UnderlineChars (Display *display, + void Tk_UnderlineChars(Display *display, Drawable drawable, GC gc, Tk_Font tkfont, CONST char *source, int x, int y, int firstByte, int lastByte) } - declare 179 generic { - void Tk_UnderlineTextLayout (Display *display, Drawable drawable, GC gc, + void Tk_UnderlineTextLayout(Display *display, Drawable drawable, GC gc, Tk_TextLayout layout, int x, int y, int underline) } - declare 180 generic { - void Tk_Ungrab (Tk_Window tkwin) + void Tk_Ungrab(Tk_Window tkwin) } - declare 181 generic { - void Tk_UnmaintainGeometry (Tk_Window slave, Tk_Window master) + void Tk_UnmaintainGeometry(Tk_Window slave, Tk_Window master) } - declare 182 generic { - void Tk_UnmapWindow (Tk_Window tkwin) + void Tk_UnmapWindow(Tk_Window tkwin) } - declare 183 generic { - void Tk_UnsetGrid (Tk_Window tkwin) + void Tk_UnsetGrid(Tk_Window tkwin) } - declare 184 generic { - void Tk_UpdatePointer (Tk_Window tkwin, int x, int y, int state) + void Tk_UpdatePointer(Tk_Window tkwin, int x, int y, int state) } # new functions for 8.1 declare 185 generic { - Pixmap Tk_AllocBitmapFromObj (Tcl_Interp *interp, Tk_Window tkwin, + Pixmap Tk_AllocBitmapFromObj(Tcl_Interp *interp, Tk_Window tkwin, Tcl_Obj *objPtr) } - declare 186 generic { - Tk_3DBorder Tk_Alloc3DBorderFromObj (Tcl_Interp *interp, Tk_Window tkwin, + Tk_3DBorder Tk_Alloc3DBorderFromObj(Tcl_Interp *interp, Tk_Window tkwin, Tcl_Obj *objPtr) } - declare 187 generic { - XColor * Tk_AllocColorFromObj (Tcl_Interp *interp, Tk_Window tkwin, + XColor * Tk_AllocColorFromObj(Tcl_Interp *interp, Tk_Window tkwin, Tcl_Obj *objPtr) } - declare 188 generic { - Tk_Cursor Tk_AllocCursorFromObj (Tcl_Interp *interp, Tk_Window tkwin, + Tk_Cursor Tk_AllocCursorFromObj(Tcl_Interp *interp, Tk_Window tkwin, Tcl_Obj *objPtr) } - declare 189 generic { - Tk_Font Tk_AllocFontFromObj (Tcl_Interp *interp, Tk_Window tkwin, + Tk_Font Tk_AllocFontFromObj(Tcl_Interp *interp, Tk_Window tkwin, Tcl_Obj *objPtr) } - declare 190 generic { - Tk_OptionTable Tk_CreateOptionTable (Tcl_Interp *interp, + Tk_OptionTable Tk_CreateOptionTable(Tcl_Interp *interp, CONST Tk_OptionSpec *templatePtr) } - declare 191 generic { - void Tk_DeleteOptionTable (Tk_OptionTable optionTable) + void Tk_DeleteOptionTable(Tk_OptionTable optionTable) } - declare 192 generic { - void Tk_Free3DBorderFromObj (Tk_Window tkwin, Tcl_Obj *objPtr) + void Tk_Free3DBorderFromObj(Tk_Window tkwin, Tcl_Obj *objPtr) } - declare 193 generic { - void Tk_FreeBitmapFromObj (Tk_Window tkwin, Tcl_Obj *objPtr) + void Tk_FreeBitmapFromObj(Tk_Window tkwin, Tcl_Obj *objPtr) } - declare 194 generic { - void Tk_FreeColorFromObj (Tk_Window tkwin, Tcl_Obj *objPtr) + void Tk_FreeColorFromObj(Tk_Window tkwin, Tcl_Obj *objPtr) } - declare 195 generic { - void Tk_FreeConfigOptions (char *recordPtr, Tk_OptionTable optionToken, + void Tk_FreeConfigOptions(char *recordPtr, Tk_OptionTable optionToken, Tk_Window tkwin) } - declare 196 generic { - void Tk_FreeSavedOptions (Tk_SavedOptions *savePtr) + void Tk_FreeSavedOptions(Tk_SavedOptions *savePtr) } - declare 197 generic { - void Tk_FreeCursorFromObj (Tk_Window tkwin, Tcl_Obj *objPtr) + void Tk_FreeCursorFromObj(Tk_Window tkwin, Tcl_Obj *objPtr) } - declare 198 generic { - void Tk_FreeFontFromObj (Tk_Window tkwin, Tcl_Obj *objPtr) + void Tk_FreeFontFromObj(Tk_Window tkwin, Tcl_Obj *objPtr) } - declare 199 generic { - Tk_3DBorder Tk_Get3DBorderFromObj (Tk_Window tkwin, Tcl_Obj *objPtr) + Tk_3DBorder Tk_Get3DBorderFromObj(Tk_Window tkwin, Tcl_Obj *objPtr) } - declare 200 generic { - int Tk_GetAnchorFromObj (Tcl_Interp *interp, Tcl_Obj *objPtr, + int Tk_GetAnchorFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, Tk_Anchor *anchorPtr) } - declare 201 generic { - Pixmap Tk_GetBitmapFromObj (Tk_Window tkwin, Tcl_Obj *objPtr) + Pixmap Tk_GetBitmapFromObj(Tk_Window tkwin, Tcl_Obj *objPtr) } - declare 202 generic { - XColor * Tk_GetColorFromObj (Tk_Window tkwin, Tcl_Obj *objPtr) + XColor * Tk_GetColorFromObj(Tk_Window tkwin, Tcl_Obj *objPtr) } - declare 203 generic { - Tk_Cursor Tk_GetCursorFromObj (Tk_Window tkwin, Tcl_Obj *objPtr) + Tk_Cursor Tk_GetCursorFromObj(Tk_Window tkwin, Tcl_Obj *objPtr) } - declare 204 generic { - Tcl_Obj * Tk_GetOptionInfo (Tcl_Interp *interp, + Tcl_Obj * Tk_GetOptionInfo(Tcl_Interp *interp, char *recordPtr, Tk_OptionTable optionTable, Tcl_Obj *namePtr, Tk_Window tkwin) } - declare 205 generic { - Tcl_Obj * Tk_GetOptionValue (Tcl_Interp *interp, char *recordPtr, + Tcl_Obj * Tk_GetOptionValue(Tcl_Interp *interp, char *recordPtr, Tk_OptionTable optionTable, Tcl_Obj *namePtr, Tk_Window tkwin) } - declare 206 generic { - int Tk_GetJustifyFromObj (Tcl_Interp *interp, + int Tk_GetJustifyFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, Tk_Justify *justifyPtr) } - declare 207 generic { - int Tk_GetMMFromObj (Tcl_Interp *interp, + int Tk_GetMMFromObj(Tcl_Interp *interp, Tk_Window tkwin, Tcl_Obj *objPtr, double *doublePtr) } - declare 208 generic { - int Tk_GetPixelsFromObj (Tcl_Interp *interp, + int Tk_GetPixelsFromObj(Tcl_Interp *interp, Tk_Window tkwin, Tcl_Obj *objPtr, int *intPtr) } - declare 209 generic { - int Tk_GetReliefFromObj (Tcl_Interp *interp, + int Tk_GetReliefFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr, int *resultPtr) } - declare 210 generic { - int Tk_GetScrollInfoObj (Tcl_Interp *interp, + int Tk_GetScrollInfoObj(Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[], double *dblPtr, int *intPtr) } - declare 211 generic { - int Tk_InitOptions (Tcl_Interp *interp, char *recordPtr, + int Tk_InitOptions(Tcl_Interp *interp, char *recordPtr, Tk_OptionTable optionToken, Tk_Window tkwin) } - declare 212 generic { - void Tk_MainEx (int argc, char **argv, Tcl_AppInitProc *appInitProc, + void Tk_MainEx(int argc, char **argv, Tcl_AppInitProc *appInitProc, Tcl_Interp *interp) } - declare 213 generic { - void Tk_RestoreSavedOptions (Tk_SavedOptions *savePtr) + void Tk_RestoreSavedOptions(Tk_SavedOptions *savePtr) } - declare 214 generic { - int Tk_SetOptions (Tcl_Interp *interp, char *recordPtr, + int Tk_SetOptions(Tcl_Interp *interp, char *recordPtr, Tk_OptionTable optionTable, int objc, Tcl_Obj *CONST objv[], Tk_Window tkwin, Tk_SavedOptions *savePtr, int *maskPtr) } - declare 215 generic { - void Tk_InitConsoleChannels (Tcl_Interp *interp) + void Tk_InitConsoleChannels(Tcl_Interp *interp) } - declare 216 generic { - int Tk_CreateConsoleWindow (Tcl_Interp *interp) + int Tk_CreateConsoleWindow(Tcl_Interp *interp) } - declare 217 generic { - void Tk_CreateSmoothMethod (Tcl_Interp *interp, Tk_SmoothMethod *method) + void Tk_CreateSmoothMethod(Tcl_Interp *interp, Tk_SmoothMethod *method) } #declare 218 generic { -# void Tk_CreateCanvasVisitor (Tcl_Interp *interp, VOID *typePtr) +# void Tk_CreateCanvasVisitor(Tcl_Interp *interp, VOID *typePtr) #} #declare 219 generic { -# VOID *Tk_GetCanvasVisitor (Tcl_Interp *interp, CONST char *name) +# VOID *Tk_GetCanvasVisitor(Tcl_Interp *interp, CONST char *name) #} declare 220 generic { - int Tk_GetDash (Tcl_Interp *interp, CONST char *value, Tk_Dash *dash) + int Tk_GetDash(Tcl_Interp *interp, CONST char *value, Tk_Dash *dash) } declare 221 generic { - void Tk_CreateOutline (Tk_Outline *outline) + void Tk_CreateOutline(Tk_Outline *outline) } declare 222 generic { - void Tk_DeleteOutline (Display *display, Tk_Outline *outline) + void Tk_DeleteOutline(Display *display, Tk_Outline *outline) } declare 223 generic { - int Tk_ConfigOutlineGC (XGCValues *gcValues, Tk_Canvas canvas, + int Tk_ConfigOutlineGC(XGCValues *gcValues, Tk_Canvas canvas, Tk_Item *item, Tk_Outline *outline) } declare 224 generic { - int Tk_ChangeOutlineGC (Tk_Canvas canvas, Tk_Item *item, + int Tk_ChangeOutlineGC(Tk_Canvas canvas, Tk_Item *item, Tk_Outline *outline) } declare 225 generic { - int Tk_ResetOutlineGC (Tk_Canvas canvas, Tk_Item *item, + int Tk_ResetOutlineGC(Tk_Canvas canvas, Tk_Item *item, Tk_Outline *outline) } declare 226 generic { - int Tk_CanvasPsOutline (Tk_Canvas canvas, Tk_Item *item, + int Tk_CanvasPsOutline(Tk_Canvas canvas, Tk_Item *item, Tk_Outline *outline) } declare 227 generic { - void Tk_SetTSOrigin (Tk_Window tkwin, GC gc, int x, int y) + void Tk_SetTSOrigin(Tk_Window tkwin, GC gc, int x, int y) } declare 228 generic { - int Tk_CanvasGetCoordFromObj (Tcl_Interp *interp, Tk_Canvas canvas, + int Tk_CanvasGetCoordFromObj(Tcl_Interp *interp, Tk_Canvas canvas, Tcl_Obj *obj, double *doublePtr) } declare 229 generic { - void Tk_CanvasSetOffset (Tk_Canvas canvas, GC gc, Tk_TSOffset *offset) + void Tk_CanvasSetOffset(Tk_Canvas canvas, GC gc, Tk_TSOffset *offset) } declare 230 generic { - void Tk_DitherPhoto (Tk_PhotoHandle handle, int x, int y, int width, + void Tk_DitherPhoto(Tk_PhotoHandle handle, int x, int y, int width, int height) } declare 231 generic { - int Tk_PostscriptBitmap (Tcl_Interp *interp, Tk_Window tkwin, + int Tk_PostscriptBitmap(Tcl_Interp *interp, Tk_Window tkwin, Tk_PostscriptInfo psInfo, Pixmap bitmap, int startX, int startY, int width, int height) } declare 232 generic { - int Tk_PostscriptColor (Tcl_Interp *interp, Tk_PostscriptInfo psInfo, + int Tk_PostscriptColor(Tcl_Interp *interp, Tk_PostscriptInfo psInfo, XColor *colorPtr) } declare 233 generic { - int Tk_PostscriptFont (Tcl_Interp *interp, Tk_PostscriptInfo psInfo, + int Tk_PostscriptFont(Tcl_Interp *interp, Tk_PostscriptInfo psInfo, Tk_Font font) } declare 234 generic { - int Tk_PostscriptImage (Tk_Image image, Tcl_Interp *interp, + int Tk_PostscriptImage(Tk_Image image, Tcl_Interp *interp, Tk_Window tkwin, Tk_PostscriptInfo psinfo, int x, int y, int width, int height, int prepass) } declare 235 generic { - void Tk_PostscriptPath (Tcl_Interp *interp, Tk_PostscriptInfo psInfo, + void Tk_PostscriptPath(Tcl_Interp *interp, Tk_PostscriptInfo psInfo, double *coordPtr, int numPoints) } declare 236 generic { - int Tk_PostscriptStipple (Tcl_Interp *interp, Tk_Window tkwin, + int Tk_PostscriptStipple(Tcl_Interp *interp, Tk_Window tkwin, Tk_PostscriptInfo psInfo, Pixmap bitmap) } declare 237 generic { - double Tk_PostscriptY (double y, Tk_PostscriptInfo psInfo) + double Tk_PostscriptY(double y, Tk_PostscriptInfo psInfo) } declare 238 generic { - int Tk_PostscriptPhoto (Tcl_Interp *interp, + int Tk_PostscriptPhoto(Tcl_Interp *interp, Tk_PhotoImageBlock *blockPtr, Tk_PostscriptInfo psInfo, int width, int height) } @@ -1131,114 +915,112 @@ declare 238 generic { # New in 8.4a1 # declare 239 generic { - void Tk_CreateClientMessageHandler (Tk_ClientMessageProc *proc) + void Tk_CreateClientMessageHandler(Tk_ClientMessageProc *proc) } declare 240 generic { - void Tk_DeleteClientMessageHandler (Tk_ClientMessageProc *proc) + void Tk_DeleteClientMessageHandler(Tk_ClientMessageProc *proc) } # New in 8.4a2 # declare 241 generic { - Tk_Window Tk_CreateAnonymousWindow (Tcl_Interp *interp, + Tk_Window Tk_CreateAnonymousWindow(Tcl_Interp *interp, Tk_Window parent, CONST char *screenName) } declare 242 generic { - void Tk_SetClassProcs (Tk_Window tkwin, + void Tk_SetClassProcs(Tk_Window tkwin, Tk_ClassProcs *procs, ClientData instanceData) } # New in 8.4a4 # declare 243 generic { - void Tk_SetInternalBorderEx (Tk_Window tkwin, int left, int right, + void Tk_SetInternalBorderEx(Tk_Window tkwin, int left, int right, int top, int bottom) } declare 244 generic { - void Tk_SetMinimumRequestSize (Tk_Window tkwin, + void Tk_SetMinimumRequestSize(Tk_Window tkwin, int minWidth, int minHeight) } # New in 8.4a5 # declare 245 generic { - void Tk_SetCaretPos (Tk_Window tkwin, int x, int y, int height) + void Tk_SetCaretPos(Tk_Window tkwin, int x, int y, int height) } - declare 246 generic { - void Tk_PhotoPutBlock_Panic (Tk_PhotoHandle handle, + void Tk_PhotoPutBlock_Panic(Tk_PhotoHandle handle, Tk_PhotoImageBlock *blockPtr, int x, int y, int width, int height, int compRule) } declare 247 generic { - void Tk_PhotoPutZoomedBlock_Panic (Tk_PhotoHandle handle, + void Tk_PhotoPutZoomedBlock_Panic(Tk_PhotoHandle handle, Tk_PhotoImageBlock *blockPtr, int x, int y, int width, int height, int zoomX, int zoomY, int subsampleX, int subsampleY, int compRule) } - declare 248 generic { - int Tk_CollapseMotionEvents (Display *display, int collapse) + int Tk_CollapseMotionEvents(Display *display, int collapse) } # Style engine declare 249 generic { - Tk_StyleEngine Tk_RegisterStyleEngine (CONST char *name, + Tk_StyleEngine Tk_RegisterStyleEngine(CONST char *name, Tk_StyleEngine parent) } declare 250 generic { - Tk_StyleEngine Tk_GetStyleEngine (CONST char *name) + Tk_StyleEngine Tk_GetStyleEngine(CONST char *name) } declare 251 generic { - int Tk_RegisterStyledElement (Tk_StyleEngine engine, + int Tk_RegisterStyledElement(Tk_StyleEngine engine, Tk_ElementSpec *templatePtr) } declare 252 generic { - int Tk_GetElementId (CONST char *name) + int Tk_GetElementId(CONST char *name) } declare 253 generic { - Tk_Style Tk_CreateStyle (CONST char *name, Tk_StyleEngine engine, + Tk_Style Tk_CreateStyle(CONST char *name, Tk_StyleEngine engine, ClientData clientData) } declare 254 generic { - Tk_Style Tk_GetStyle (Tcl_Interp *interp, CONST char *name) + Tk_Style Tk_GetStyle(Tcl_Interp *interp, CONST char *name) } declare 255 generic { - void Tk_FreeStyle (Tk_Style style) + void Tk_FreeStyle(Tk_Style style) } declare 256 generic { - CONST char * Tk_NameOfStyle (Tk_Style style) + CONST char * Tk_NameOfStyle(Tk_Style style) } declare 257 generic { - Tk_Style Tk_AllocStyleFromObj (Tcl_Interp *interp, Tcl_Obj *objPtr) + Tk_Style Tk_AllocStyleFromObj(Tcl_Interp *interp, Tcl_Obj *objPtr) } declare 258 generic { - Tk_Style Tk_GetStyleFromObj (Tcl_Obj *objPtr) + Tk_Style Tk_GetStyleFromObj(Tcl_Obj *objPtr) } declare 259 generic { - void Tk_FreeStyleFromObj (Tcl_Obj *objPtr) + void Tk_FreeStyleFromObj(Tcl_Obj *objPtr) } declare 260 generic { - Tk_StyledElement Tk_GetStyledElement (Tk_Style style, int elementId, + Tk_StyledElement Tk_GetStyledElement(Tk_Style style, int elementId, Tk_OptionTable optionTable) } declare 261 generic { - void Tk_GetElementSize (Tk_Style style, Tk_StyledElement element, + void Tk_GetElementSize(Tk_Style style, Tk_StyledElement element, char *recordPtr, Tk_Window tkwin, int width, int height, int inner, int *widthPtr, int *heightPtr) } declare 262 generic { - void Tk_GetElementBox (Tk_Style style, Tk_StyledElement element, + void Tk_GetElementBox(Tk_Style style, Tk_StyledElement element, char *recordPtr, Tk_Window tkwin, int x, int y, int width, int height, int inner, int *xPtr, int *yPtr, int *widthPtr, int *heightPtr) } declare 263 generic { - int Tk_GetElementBorderWidth (Tk_Style style, Tk_StyledElement element, + int Tk_GetElementBorderWidth(Tk_Style style, Tk_StyledElement element, char *recordPtr, Tk_Window tkwin) } declare 264 generic { - void Tk_DrawElement (Tk_Style style, Tk_StyledElement element, + void Tk_DrawElement(Tk_Style style, Tk_StyledElement element, char *recordPtr, Tk_Window tkwin, Drawable d, int x, int y, int width, int height, int state) } @@ -1272,11 +1054,11 @@ declare 270 generic { # TIP #264 declare 271 generic { - Tcl_Interp * Tk_Interp (Tk_Window tkwin) + Tcl_Interp * Tk_Interp(Tk_Window tkwin) } # Now that the Tk 8.2 -> 8.3 transition is long past, use more conventional -# means to continue support for extensions using the USE_OLD_IMAGE to +# means to continue support for extensions using the USE_OLD_IMAGE to # continue use of their string-based Tcl_ImageTypes and Tcl_PhotoImageFormats. # # Note that this restores the usual rules for stub compatibility. Stub-enabled @@ -1297,104 +1079,103 @@ declare 273 generic { interface tkPlat +################################ # Unix specific functions # (none) +################################ # Windows specific functions declare 0 win { - Window Tk_AttachHWND (Tk_Window tkwin, HWND hwnd) + Window Tk_AttachHWND(Tk_Window tkwin, HWND hwnd) } - declare 1 win { - HINSTANCE Tk_GetHINSTANCE (void) + HINSTANCE Tk_GetHINSTANCE(void) } - declare 2 win { - HWND Tk_GetHWND (Window window) + HWND Tk_GetHWND(Window window) } - declare 3 win { - Tk_Window Tk_HWNDToWindow (HWND hwnd) + Tk_Window Tk_HWNDToWindow(HWND hwnd) } - declare 4 win { - void Tk_PointerEvent (HWND hwnd, int x, int y) + void Tk_PointerEvent(HWND hwnd, int x, int y) } - declare 5 win { - int Tk_TranslateWinEvent (HWND hwnd, + int Tk_TranslateWinEvent(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam, LRESULT *result) } -# Mac OS X specific functions +################################ +# Aqua specific functions declare 0 aqua { - void Tk_MacOSXSetEmbedHandler ( \ - Tk_MacOSXEmbedRegisterWinProc *registerWinProcPtr, \ - Tk_MacOSXEmbedGetGrafPortProc *getPortProcPtr, \ - Tk_MacOSXEmbedMakeContainerExistProc *containerExistProcPtr, \ - Tk_MacOSXEmbedGetClipProc *getClipProc, \ + void Tk_MacOSXSetEmbedHandler( + Tk_MacOSXEmbedRegisterWinProc *registerWinProcPtr, + Tk_MacOSXEmbedGetGrafPortProc *getPortProcPtr, + Tk_MacOSXEmbedMakeContainerExistProc *containerExistProcPtr, + Tk_MacOSXEmbedGetClipProc *getClipProc, Tk_MacOSXEmbedGetOffsetInParentProc *getOffsetProc) } - declare 1 aqua { - void Tk_MacOSXTurnOffMenus (void) + void Tk_MacOSXTurnOffMenus(void) } - declare 2 aqua { - void Tk_MacOSXTkOwnsCursor (int tkOwnsIt) + void Tk_MacOSXTkOwnsCursor(int tkOwnsIt) } - declare 3 aqua { - void TkMacOSXInitMenus (Tcl_Interp *interp) + void TkMacOSXInitMenus(Tcl_Interp *interp) } - declare 4 aqua { - void TkMacOSXInitAppleEvents (Tcl_Interp *interp) + void TkMacOSXInitAppleEvents(Tcl_Interp *interp) } - declare 5 aqua { - void TkGenWMConfigureEvent (Tk_Window tkwin, \ - int x, int y, int width, int height, int flags) + void TkGenWMConfigureEvent(Tk_Window tkwin, int x, int y, int width, + int height, int flags) } - declare 6 aqua { - void TkMacOSXInvalClipRgns (Tk_Window tkwin) + void TkMacOSXInvalClipRgns(Tk_Window tkwin) } - declare 7 aqua { - GWorldPtr TkMacOSXGetDrawablePort (Drawable drawable) + GWorldPtr TkMacOSXGetDrawablePort(Drawable drawable) } - declare 8 aqua { - ControlRef TkMacOSXGetRootControl (Drawable drawable) + ControlRef TkMacOSXGetRootControl(Drawable drawable) } - declare 9 aqua { - void Tk_MacOSXSetupTkNotifier (void) + void Tk_MacOSXSetupTkNotifier(void) } - declare 10 aqua { - int Tk_MacOSXIsAppInFront (void) + int Tk_MacOSXIsAppInFront(void) } ############################################################################## -# Public functions that are not accessible via the stubs table: -# (listed here _as comments_ so that the 'checkstubs' make target does not -# complain about them) +# Public functions that are not accessible via the stubs table. -# const char *Tk_InitStubs(Tcl_Interp *interp, const char *version, int exact) -# const char *Tk_PkgInitStubsCheck(Tcl_Interp *interp, const char *version, -# int exact); +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: -# (listed here _as comments_ so that the 'checkstubs' make target does not -# complain about them, c.f. tk bug bug 1716117) +# Global variables that need to be exported from the tcl shared library. -# TkStubs *tkStubsPtr (fool checkstubs) -# TkPlatStubs *tkPlatStubsPtr (fool checkstubs) -# TkIntStubs *tkIntStubsPtr (fool checkstubs) -# TkIntPlatStubs *tkIntPlatStubsPtr (fool checkstubs) -# TkIntXlibStubs *tkIntXlibStubsPtr (fool checkstubs) +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) +} diff --git a/generic/tkInt.decls b/generic/tkInt.decls index 5bd1a4c..2f92aaa 100644 --- a/generic/tkInt.decls +++ b/generic/tkInt.decls @@ -5,11 +5,12 @@ # tkIntDecls.h, tkIntPlatDecls.h, tkIntStub.c, and tkPlatStub.c files. # # Copyright (c) 1998-1999 by Scriptics Corporation. +# Copyright (c) 2007 Daniel A. Steffen <das@users.sourceforge.net> # # See the file "license.terms" for information on usage and redistribution # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # -# RCS: @(#) $Id: tkInt.decls,v 1.42 2005/12/09 00:48:52 das Exp $ +# RCS: @(#) $Id: tkInt.decls,v 1.42.2.1 2007/12/10 18:39:29 dgp Exp $ library tk @@ -127,7 +128,6 @@ declare 28 generic { declare 29 generic { void TkpFreeCursor(TkCursor *cursorPtr) } - declare 30 generic { char *TkGetBitmapData(Tcl_Interp *interp, char *string, char *fileName, int *widthPtr, int *heightPtr, int *hotXPtr, int *hotYPtr) @@ -428,13 +428,13 @@ declare 119 {aqua win} { void TkUnionRectWithRegion(XRectangle *rect, TkRegion src, TkRegion dr_return) } -declare 121 {aqua} { +declare 121 aqua { Pixmap TkpCreateNativeBitmap(Display *display, CONST char *source) } -declare 122 {aqua} { +declare 122 aqua { void TkpDefineNativeBitmaps(void) } -declare 124 {aqua} { +declare 124 aqua { Pixmap TkpGetNativeAppBitmap(Display *display, CONST char *name, int *width, int *height) } @@ -497,12 +497,10 @@ declare 151 generic { void TkMakeRawCurvePostscript(Tcl_Interp *interp, Tk_Canvas canvas, double *pointPtr, int numPoints) } - declare 152 generic { void TkpDrawFrame(Tk_Window tkwin, Tk_3DBorder border, int highlightWidth, int borderWidth, int relief) } - declare 153 generic { void TkCreateThreadExitHandler(Tcl_ExitProc *proc, ClientData clientData) } @@ -527,7 +525,7 @@ declare 157 generic { interface tkIntPlat -######################### +################################ # Unix specific functions declare 0 x11 { @@ -575,7 +573,7 @@ declare 13 x11 { CONST char **argv) } -############################ +################################ # Windows specific functions declare 0 win { @@ -694,8 +692,8 @@ declare 35 win { int TkWinGetPlatformTheme(void) } -######################## -# Mac OS X specific functions +################################ +# Aqua specific functions declare 0 aqua { void TkGenerateActivateEvents(TkWindow *winPtr, int active) @@ -762,7 +760,8 @@ declare 17 aqua { int TkMacOSXGrowToplevel(WindowRef whichWindow, Point start) } declare 18 aqua { - void TkMacOSXHandleMenuSelect(MenuID theMenu, MenuItemIndex theItem, int optionKeyPressed) + void TkMacOSXHandleMenuSelect(MenuID theMenu, MenuItemIndex theItem, + int optionKeyPressed) } # removed duplicates from tkPlat table(tk.decls) @@ -883,6 +882,7 @@ declare 53 aqua { interface tkIntXlib +################################ # X functions for Windows declare 0 win { @@ -929,7 +929,6 @@ declare 10 win { declare 11 win { KeySym XKeycodeToKeysym(Display *d, unsigned int k, int i) } - declare 12 win { KeySym XStringToKeysym(_Xconst char *c) } @@ -1257,325 +1256,326 @@ declare 105 win { unsigned int sw, unsigned int sh, int dx, int dy) } +################################ # X functions for Aqua -declare 0 {aqua} { +declare 0 aqua { void XSetDashes(Display *display, GC gc, int dash_offset, _Xconst char *dash_list, int n) } -declare 1 {aqua} { +declare 1 aqua { XModifierKeymap *XGetModifierMapping(Display *d) } -declare 2 {aqua} { +declare 2 aqua { XImage *XCreateImage(Display *d, Visual *v, unsigned int ui1, int i1, int i2, char *cp, unsigned int ui2, unsigned int ui3, int i3, int i4) } -declare 3 {aqua} { +declare 3 aqua { XImage *XGetImage(Display *d, Drawable dr, int i1, int i2, unsigned int ui1, unsigned int ui2, unsigned long ul, int i3) } -declare 4 {aqua} { +declare 4 aqua { char *XGetAtomName(Display *d, Atom a) } -declare 5 {aqua} { +declare 5 aqua { char *XKeysymToString(KeySym k) } -declare 6 {aqua} { +declare 6 aqua { Colormap XCreateColormap(Display *d, Window w, Visual *v, int i) } -declare 7 {aqua} { +declare 7 aqua { GContext XGContextFromGC(GC g) } -declare 8 {aqua} { +declare 8 aqua { KeySym XKeycodeToKeysym(Display *d, KeyCode k, int i) } -declare 9 {aqua} { +declare 9 aqua { KeySym XStringToKeysym(_Xconst char *c) } -declare 10 {aqua} { +declare 10 aqua { Window XRootWindow(Display *d, int i) } -declare 11 {aqua} { +declare 11 aqua { XErrorHandler XSetErrorHandler(XErrorHandler x) } -declare 12 {aqua} { +declare 12 aqua { Status XAllocColor(Display *d, Colormap c, XColor *xp) } -declare 13 {aqua} { +declare 13 aqua { void XBell(Display *d, int i) } -declare 14 {aqua} { +declare 14 aqua { void XChangeProperty(Display *d, Window w, Atom a1, Atom a2, int i1, int i2, _Xconst unsigned char *c, int i3) } -declare 15 {aqua} { +declare 15 aqua { void XChangeWindowAttributes(Display *d, Window w, unsigned long ul, XSetWindowAttributes *x) } -declare 16 {aqua} { +declare 16 aqua { void XConfigureWindow(Display *d, Window w, unsigned int i, XWindowChanges *x) } -declare 17 {aqua} { +declare 17 aqua { void XCopyArea(Display *d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4) } -declare 18 {aqua} { +declare 18 aqua { void XCopyPlane(Display *d, Drawable dr1, Drawable dr2, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4, unsigned long ul) } -declare 19 {aqua} { +declare 19 aqua { Pixmap XCreateBitmapFromData(Display *display, Drawable d, _Xconst char *data, unsigned int width, unsigned int height) } -declare 20 {aqua} { +declare 20 aqua { void XDefineCursor(Display *d, Window w, Cursor c) } -declare 21 {aqua} { +declare 21 aqua { void XDestroyWindow(Display *d, Window w) } -declare 22 {aqua} { +declare 22 aqua { void XDrawArc(Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4) } -declare 23 {aqua} { +declare 23 aqua { void XDrawLines(Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2) } -declare 24 {aqua} { +declare 24 aqua { void XDrawRectangle(Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2) } -declare 25 {aqua} { +declare 25 aqua { void XFillArc(Display *d, Drawable dr, GC g, int i1, int i2, unsigned int ui1, unsigned int ui2, int i3, int i4) } -declare 26 {aqua} { +declare 26 aqua { void XFillPolygon(Display *d, Drawable dr, GC g, XPoint *x, int i1, int i2, int i3) } -declare 27 {aqua} { +declare 27 aqua { void XFillRectangles(Display *d, Drawable dr, GC g, XRectangle *x, int i) } -declare 28 {aqua} { +declare 28 aqua { void XFreeColormap(Display *d, Colormap c) } -declare 29 {aqua} { +declare 29 aqua { void XFreeColors(Display *d, Colormap c, unsigned long *ulp, int i, unsigned long ul) } -declare 30 {aqua} { +declare 30 aqua { void XFreeModifiermap(XModifierKeymap *x) } -declare 31 {aqua} { +declare 31 aqua { Status XGetGeometry(Display *d, Drawable dr, Window *w, int *i1, int *i2, unsigned int *ui1, unsigned int *ui2, unsigned int *ui3, unsigned int *ui4) } -declare 32 {aqua} { +declare 32 aqua { int XGetWindowProperty(Display *d, Window w, Atom a1, long l1, long l2, Bool b, Atom a2, Atom *ap, int *ip, unsigned long *ulp1, unsigned long *ulp2, unsigned char **cpp) } -declare 33 {aqua} { +declare 33 aqua { int XGrabKeyboard(Display *d, Window w, Bool b, int i1, int i2, Time t) } -declare 34 {aqua} { +declare 34 aqua { int XGrabPointer(Display *d, Window w1, Bool b, unsigned int ui, int i1, int i2, Window w2, Cursor c, Time t) } -declare 35 {aqua} { +declare 35 aqua { KeyCode XKeysymToKeycode(Display *d, KeySym k) } -declare 36 {aqua} { +declare 36 aqua { void XMapWindow(Display *d, Window w) } -declare 37 {aqua} { +declare 37 aqua { void XMoveResizeWindow(Display *d, Window w, int i1, int i2, unsigned int ui1, unsigned int ui2) } -declare 38 {aqua} { +declare 38 aqua { void XMoveWindow(Display *d, Window w, int i1, int i2) } -declare 39 {aqua} { +declare 39 aqua { Bool XQueryPointer(Display *d, Window w1, Window *w2, Window *w3, int *i1, int *i2, int *i3, int *i4, unsigned int *ui) } -declare 40 {aqua} { +declare 40 aqua { void XRaiseWindow(Display *d, Window w) } -declare 41 {aqua} { +declare 41 aqua { void XRefreshKeyboardMapping(XMappingEvent *x) } -declare 42 {aqua} { +declare 42 aqua { void XResizeWindow(Display *d, Window w, unsigned int ui1, unsigned int ui2) } -declare 43 {aqua} { +declare 43 aqua { void XSelectInput(Display *d, Window w, long l) } -declare 44 {aqua} { +declare 44 aqua { Status XSendEvent(Display *d, Window w, Bool b, long l, XEvent *x) } -declare 45 {aqua} { +declare 45 aqua { void XSetIconName(Display *d, Window w, _Xconst char *c) } -declare 46 {aqua} { +declare 46 aqua { void XSetInputFocus(Display *d, Window w, int i, Time t) } -declare 47 {aqua} { +declare 47 aqua { void XSetSelectionOwner(Display *d, Atom a, Window w, Time t) } -declare 48 {aqua} { +declare 48 aqua { void XSetWindowBackground(Display *d, Window w, unsigned long ul) } -declare 49 {aqua} { +declare 49 aqua { void XSetWindowBackgroundPixmap(Display *d, Window w, Pixmap p) } -declare 50 {aqua} { +declare 50 aqua { void XSetWindowBorder(Display *d, Window w, unsigned long ul) } -declare 51 {aqua} { +declare 51 aqua { void XSetWindowBorderPixmap(Display *d, Window w, Pixmap p) } -declare 52 {aqua} { +declare 52 aqua { void XSetWindowBorderWidth(Display *d, Window w, unsigned int ui) } -declare 53 {aqua} { +declare 53 aqua { void XSetWindowColormap(Display *d, Window w, Colormap c) } -declare 54 {aqua} { +declare 54 aqua { void XUngrabKeyboard(Display *d, Time t) } -declare 55 {aqua} { +declare 55 aqua { void XUngrabPointer(Display *d, Time t) } -declare 56 {aqua} { +declare 56 aqua { void XUnmapWindow(Display *d, Window w) } -declare 57 {aqua} { +declare 57 aqua { void TkPutImage(unsigned long *colors, int ncolors, Display *display, Drawable d, GC gc, XImage *image, int src_x, int src_y, int dest_x, int dest_y, unsigned int width, unsigned int height) } -declare 58 {aqua} { +declare 58 aqua { Status XParseColor(Display *display, Colormap map, _Xconst char *spec, XColor *colorPtr) } -declare 59 {aqua} { +declare 59 aqua { GC XCreateGC(Display *display, Drawable d, unsigned long valuemask, XGCValues *values) } -declare 60 {aqua} { +declare 60 aqua { void XFreeGC(Display *display, GC gc) } -declare 61 {aqua} { +declare 61 aqua { Atom XInternAtom(Display *display, _Xconst char *atom_name, Bool only_if_exists) } -declare 62 {aqua} { +declare 62 aqua { void XSetBackground(Display *display, GC gc, unsigned long foreground) } -declare 63 {aqua} { +declare 63 aqua { void XSetForeground(Display *display, GC gc, unsigned long foreground) } -declare 64 {aqua} { +declare 64 aqua { void XSetClipMask(Display *display, GC gc, Pixmap pixmap) } -declare 65 {aqua} { +declare 65 aqua { void XSetClipOrigin(Display *display, GC gc, int clip_x_origin, int clip_y_origin) } -declare 66 {aqua} { +declare 66 aqua { void XSetTSOrigin(Display *display, GC gc, int ts_x_origin, int ts_y_origin) } -declare 67 {aqua} { +declare 67 aqua { void XChangeGC(Display *d, GC gc, unsigned long mask, XGCValues *values) } -declare 68 {aqua} { +declare 68 aqua { void XSetFont(Display *display, GC gc, Font font) } -declare 69 {aqua} { +declare 69 aqua { void XSetArcMode(Display *display, GC gc, int arc_mode) } -declare 70 {aqua} { +declare 70 aqua { void XSetStipple(Display *display, GC gc, Pixmap stipple) } -declare 71 {aqua} { +declare 71 aqua { void XSetFillRule(Display *display, GC gc, int fill_rule) } -declare 72 {aqua} { +declare 72 aqua { void XSetFillStyle(Display *display, GC gc, int fill_style) } -declare 73 {aqua} { +declare 73 aqua { void XSetFunction(Display *display, GC gc, int function) } -declare 74 {aqua} { +declare 74 aqua { void XSetLineAttributes(Display *display, GC gc, unsigned int line_width, int line_style, int cap_style, int join_style) } -declare 75 {aqua} { +declare 75 aqua { int _XInitImageFuncPtrs(XImage *image) } -declare 76 {aqua} { +declare 76 aqua { XIC XCreateIC(void) } -declare 77 {aqua} { +declare 77 aqua { XVisualInfo *XGetVisualInfo(Display *display, long vinfo_mask, XVisualInfo *vinfo_template, int *nitems_return) } -declare 78 {aqua} { +declare 78 aqua { void XSetWMClientMachine(Display *display, Window w, XTextProperty *text_prop) } -declare 79 {aqua} { +declare 79 aqua { Status XStringListToTextProperty(char **list, int count, XTextProperty *text_prop_return) } -declare 80 {aqua} { +declare 80 aqua { void XDrawSegments(Display *display, Drawable d, GC gc, XSegment *segments, int nsegments) } -declare 81 {aqua} { +declare 81 aqua { void XForceScreenSaver(Display *display, int mode) } -declare 82 {aqua} { +declare 82 aqua { void XDrawLine(Display *d, Drawable dr, GC g, int x1, int y1, int x2, int y2) } -declare 83 {aqua} { +declare 83 aqua { void XFillRectangle(Display *display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height) } -declare 84 {aqua} { +declare 84 aqua { void XClearWindow(Display *d, Window w) } -declare 85 {aqua} { +declare 85 aqua { void XDrawPoint(Display *display, Drawable d, GC gc, int x, int y) } -declare 86 {aqua} { +declare 86 aqua { void XDrawPoints(Display *display, Drawable d, GC gc, XPoint *points, int npoints, int mode) } -declare 87 {aqua} { +declare 87 aqua { void XWarpPointer(Display *display, Window src_w, Window dest_w, int src_x, int src_y, unsigned int src_width, unsigned int src_height, int dest_x, int dest_y) } -declare 88 {aqua} { +declare 88 aqua { void XQueryColor(Display *display, Colormap colormap, XColor *def_in_out) } -declare 89 {aqua} { +declare 89 aqua { void XQueryColors(Display *display, Colormap colormap, XColor *defs_in_out, int ncolors) } -declare 90 {aqua} { +declare 90 aqua { Status XQueryTree(Display *d, Window w1, Window *w2, Window *w3, Window **w4, unsigned int *ui) } -declare 91 {aqua} { +declare 91 aqua { int XSync(Display *display, Bool flag) } diff --git a/generic/tkIntDecls.h b/generic/tkIntDecls.h index c0f082b..cfd52c0 100644 --- a/generic/tkIntDecls.h +++ b/generic/tkIntDecls.h @@ -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: tkIntDecls.h,v 1.29 2006/12/18 16:42:46 dgp Exp $ + * RCS: @(#) $Id: tkIntDecls.h,v 1.29.2.1 2007/12/10 18:39:29 dgp Exp $ */ #ifndef _TKINTDECLS @@ -680,135 +680,135 @@ EXTERN Tcl_Obj * TkpGetSystemDefault (Tk_Window tkwin, /* 112 */ EXTERN void TkpMenuThreadInit (void); #endif -#ifdef __WIN32__ +#ifdef __WIN32__ /* WIN */ #ifndef TkClipBox_TCL_DECLARED #define TkClipBox_TCL_DECLARED /* 113 */ EXTERN void TkClipBox (TkRegion rgn, XRectangle * rect_return); #endif -#endif /* __WIN32__ */ -#ifdef MAC_OSX_TK +#endif /* WIN */ +#ifdef MAC_OSX_TK /* AQUA */ #ifndef TkClipBox_TCL_DECLARED #define TkClipBox_TCL_DECLARED /* 113 */ EXTERN void TkClipBox (TkRegion rgn, XRectangle * rect_return); #endif -#endif /* MAC_OSX_TK */ -#ifdef __WIN32__ +#endif /* AQUA */ +#ifdef __WIN32__ /* WIN */ #ifndef TkCreateRegion_TCL_DECLARED #define TkCreateRegion_TCL_DECLARED /* 114 */ EXTERN TkRegion TkCreateRegion (void); #endif -#endif /* __WIN32__ */ -#ifdef MAC_OSX_TK +#endif /* WIN */ +#ifdef MAC_OSX_TK /* AQUA */ #ifndef TkCreateRegion_TCL_DECLARED #define TkCreateRegion_TCL_DECLARED /* 114 */ EXTERN TkRegion TkCreateRegion (void); #endif -#endif /* MAC_OSX_TK */ -#ifdef __WIN32__ +#endif /* AQUA */ +#ifdef __WIN32__ /* WIN */ #ifndef TkDestroyRegion_TCL_DECLARED #define TkDestroyRegion_TCL_DECLARED /* 115 */ EXTERN void TkDestroyRegion (TkRegion rgn); #endif -#endif /* __WIN32__ */ -#ifdef MAC_OSX_TK +#endif /* WIN */ +#ifdef MAC_OSX_TK /* AQUA */ #ifndef TkDestroyRegion_TCL_DECLARED #define TkDestroyRegion_TCL_DECLARED /* 115 */ EXTERN void TkDestroyRegion (TkRegion rgn); #endif -#endif /* MAC_OSX_TK */ -#ifdef __WIN32__ +#endif /* AQUA */ +#ifdef __WIN32__ /* WIN */ #ifndef TkIntersectRegion_TCL_DECLARED #define TkIntersectRegion_TCL_DECLARED /* 116 */ EXTERN void TkIntersectRegion (TkRegion sra, TkRegion srcb, TkRegion dr_return); #endif -#endif /* __WIN32__ */ -#ifdef MAC_OSX_TK +#endif /* WIN */ +#ifdef MAC_OSX_TK /* AQUA */ #ifndef TkIntersectRegion_TCL_DECLARED #define TkIntersectRegion_TCL_DECLARED /* 116 */ EXTERN void TkIntersectRegion (TkRegion sra, TkRegion srcb, TkRegion dr_return); #endif -#endif /* MAC_OSX_TK */ -#ifdef __WIN32__ +#endif /* AQUA */ +#ifdef __WIN32__ /* WIN */ #ifndef TkRectInRegion_TCL_DECLARED #define TkRectInRegion_TCL_DECLARED /* 117 */ EXTERN int TkRectInRegion (TkRegion rgn, int x, int y, unsigned int width, unsigned int height); #endif -#endif /* __WIN32__ */ -#ifdef MAC_OSX_TK +#endif /* WIN */ +#ifdef MAC_OSX_TK /* AQUA */ #ifndef TkRectInRegion_TCL_DECLARED #define TkRectInRegion_TCL_DECLARED /* 117 */ EXTERN int TkRectInRegion (TkRegion rgn, int x, int y, unsigned int width, unsigned int height); #endif -#endif /* MAC_OSX_TK */ -#ifdef __WIN32__ +#endif /* AQUA */ +#ifdef __WIN32__ /* WIN */ #ifndef TkSetRegion_TCL_DECLARED #define TkSetRegion_TCL_DECLARED /* 118 */ EXTERN void TkSetRegion (Display * display, GC gc, TkRegion rgn); #endif -#endif /* __WIN32__ */ -#ifdef MAC_OSX_TK +#endif /* WIN */ +#ifdef MAC_OSX_TK /* AQUA */ #ifndef TkSetRegion_TCL_DECLARED #define TkSetRegion_TCL_DECLARED /* 118 */ EXTERN void TkSetRegion (Display * display, GC gc, TkRegion rgn); #endif -#endif /* MAC_OSX_TK */ -#ifdef __WIN32__ +#endif /* AQUA */ +#ifdef __WIN32__ /* WIN */ #ifndef TkUnionRectWithRegion_TCL_DECLARED #define TkUnionRectWithRegion_TCL_DECLARED /* 119 */ EXTERN void TkUnionRectWithRegion (XRectangle * rect, TkRegion src, TkRegion dr_return); #endif -#endif /* __WIN32__ */ -#ifdef MAC_OSX_TK +#endif /* WIN */ +#ifdef MAC_OSX_TK /* AQUA */ #ifndef TkUnionRectWithRegion_TCL_DECLARED #define TkUnionRectWithRegion_TCL_DECLARED /* 119 */ EXTERN void TkUnionRectWithRegion (XRectangle * rect, TkRegion src, TkRegion dr_return); #endif -#endif /* MAC_OSX_TK */ +#endif /* AQUA */ /* Slot 120 is reserved */ -#ifdef MAC_OSX_TK +#ifdef MAC_OSX_TK /* AQUA */ #ifndef TkpCreateNativeBitmap_TCL_DECLARED #define TkpCreateNativeBitmap_TCL_DECLARED /* 121 */ EXTERN Pixmap TkpCreateNativeBitmap (Display * display, CONST char * source); #endif -#endif /* MAC_OSX_TK */ -#ifdef MAC_OSX_TK +#endif /* AQUA */ +#ifdef MAC_OSX_TK /* AQUA */ #ifndef TkpDefineNativeBitmaps_TCL_DECLARED #define TkpDefineNativeBitmaps_TCL_DECLARED /* 122 */ EXTERN void TkpDefineNativeBitmaps (void); #endif -#endif /* MAC_OSX_TK */ +#endif /* AQUA */ /* Slot 123 is reserved */ -#ifdef MAC_OSX_TK +#ifdef MAC_OSX_TK /* AQUA */ #ifndef TkpGetNativeAppBitmap_TCL_DECLARED #define TkpGetNativeAppBitmap_TCL_DECLARED /* 124 */ EXTERN Pixmap TkpGetNativeAppBitmap (Display * display, CONST char * name, int * width, int * height); #endif -#endif /* MAC_OSX_TK */ +#endif /* AQUA */ /* Slot 125 is reserved */ /* Slot 126 is reserved */ /* Slot 127 is reserved */ @@ -872,22 +872,22 @@ EXTERN void TkClipCleanup (TkDisplay * dispPtr); /* 144 */ EXTERN void TkGCCleanup (TkDisplay * dispPtr); #endif -#ifdef __WIN32__ +#ifdef __WIN32__ /* WIN */ #ifndef TkSubtractRegion_TCL_DECLARED #define TkSubtractRegion_TCL_DECLARED /* 145 */ EXTERN void TkSubtractRegion (TkRegion sra, TkRegion srcb, TkRegion dr_return); #endif -#endif /* __WIN32__ */ -#ifdef MAC_OSX_TK +#endif /* WIN */ +#ifdef MAC_OSX_TK /* AQUA */ #ifndef TkSubtractRegion_TCL_DECLARED #define TkSubtractRegion_TCL_DECLARED /* 145 */ EXTERN void TkSubtractRegion (TkRegion sra, TkRegion srcb, TkRegion dr_return); #endif -#endif /* MAC_OSX_TK */ +#endif /* AQUA */ #ifndef TkStylePkgInit_TCL_DECLARED #define TkStylePkgInit_TCL_DECLARED /* 146 */ @@ -1076,98 +1076,108 @@ typedef struct TkIntStubs { void (*tkpGetSubFonts) (Tcl_Interp * interp, Tk_Font tkfont); /* 110 */ Tcl_Obj * (*tkpGetSystemDefault) (Tk_Window tkwin, CONST char * dbName, CONST char * className); /* 111 */ void (*tkpMenuThreadInit) (void); /* 112 */ -#if !defined(__WIN32__) /* UNIX */ +#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */ void *reserved113; -#endif /* UNIX */ -#ifdef __WIN32__ +#endif /* X11 */ +#ifdef __WIN32__ /* WIN */ void (*tkClipBox) (TkRegion rgn, XRectangle * rect_return); /* 113 */ -#endif /* __WIN32__ */ -#ifdef MAC_OSX_TK +#endif /* WIN */ +#ifdef MAC_OSX_TK /* AQUA */ + void *reserved113; /* Dummy entry for stubs table backwards compatibility */ void (*tkClipBox) (TkRegion rgn, XRectangle * rect_return); /* 113 */ -#endif /* MAC_OSX_TK */ -#if !defined(__WIN32__) /* UNIX */ +#endif /* AQUA */ +#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */ void *reserved114; -#endif /* UNIX */ -#ifdef __WIN32__ +#endif /* X11 */ +#ifdef __WIN32__ /* WIN */ TkRegion (*tkCreateRegion) (void); /* 114 */ -#endif /* __WIN32__ */ -#ifdef MAC_OSX_TK +#endif /* WIN */ +#ifdef MAC_OSX_TK /* AQUA */ + void *reserved114; /* Dummy entry for stubs table backwards compatibility */ TkRegion (*tkCreateRegion) (void); /* 114 */ -#endif /* MAC_OSX_TK */ -#if !defined(__WIN32__) /* UNIX */ +#endif /* AQUA */ +#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */ void *reserved115; -#endif /* UNIX */ -#ifdef __WIN32__ +#endif /* X11 */ +#ifdef __WIN32__ /* WIN */ void (*tkDestroyRegion) (TkRegion rgn); /* 115 */ -#endif /* __WIN32__ */ -#ifdef MAC_OSX_TK +#endif /* WIN */ +#ifdef MAC_OSX_TK /* AQUA */ + void *reserved115; /* Dummy entry for stubs table backwards compatibility */ void (*tkDestroyRegion) (TkRegion rgn); /* 115 */ -#endif /* MAC_OSX_TK */ -#if !defined(__WIN32__) /* UNIX */ +#endif /* AQUA */ +#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */ void *reserved116; -#endif /* UNIX */ -#ifdef __WIN32__ +#endif /* X11 */ +#ifdef __WIN32__ /* WIN */ void (*tkIntersectRegion) (TkRegion sra, TkRegion srcb, TkRegion dr_return); /* 116 */ -#endif /* __WIN32__ */ -#ifdef MAC_OSX_TK +#endif /* WIN */ +#ifdef MAC_OSX_TK /* AQUA */ + void *reserved116; /* Dummy entry for stubs table backwards compatibility */ void (*tkIntersectRegion) (TkRegion sra, TkRegion srcb, TkRegion dr_return); /* 116 */ -#endif /* MAC_OSX_TK */ -#if !defined(__WIN32__) /* UNIX */ +#endif /* AQUA */ +#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */ void *reserved117; -#endif /* UNIX */ -#ifdef __WIN32__ +#endif /* X11 */ +#ifdef __WIN32__ /* WIN */ int (*tkRectInRegion) (TkRegion rgn, int x, int y, unsigned int width, unsigned int height); /* 117 */ -#endif /* __WIN32__ */ -#ifdef MAC_OSX_TK +#endif /* WIN */ +#ifdef MAC_OSX_TK /* AQUA */ + void *reserved117; /* Dummy entry for stubs table backwards compatibility */ int (*tkRectInRegion) (TkRegion rgn, int x, int y, unsigned int width, unsigned int height); /* 117 */ -#endif /* MAC_OSX_TK */ -#if !defined(__WIN32__) /* UNIX */ +#endif /* AQUA */ +#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */ void *reserved118; -#endif /* UNIX */ -#ifdef __WIN32__ +#endif /* X11 */ +#ifdef __WIN32__ /* WIN */ void (*tkSetRegion) (Display * display, GC gc, TkRegion rgn); /* 118 */ -#endif /* __WIN32__ */ -#ifdef MAC_OSX_TK +#endif /* WIN */ +#ifdef MAC_OSX_TK /* AQUA */ + void *reserved118; /* Dummy entry for stubs table backwards compatibility */ void (*tkSetRegion) (Display * display, GC gc, TkRegion rgn); /* 118 */ -#endif /* MAC_OSX_TK */ -#if !defined(__WIN32__) /* UNIX */ +#endif /* AQUA */ +#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */ void *reserved119; -#endif /* UNIX */ -#ifdef __WIN32__ +#endif /* X11 */ +#ifdef __WIN32__ /* WIN */ void (*tkUnionRectWithRegion) (XRectangle * rect, TkRegion src, TkRegion dr_return); /* 119 */ -#endif /* __WIN32__ */ -#ifdef MAC_OSX_TK +#endif /* WIN */ +#ifdef MAC_OSX_TK /* AQUA */ + void *reserved119; /* Dummy entry for stubs table backwards compatibility */ void (*tkUnionRectWithRegion) (XRectangle * rect, TkRegion src, TkRegion dr_return); /* 119 */ -#endif /* MAC_OSX_TK */ +#endif /* AQUA */ void *reserved120; -#if !defined(__WIN32__) /* UNIX */ +#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */ void *reserved121; -#endif /* UNIX */ -#ifdef __WIN32__ +#endif /* X11 */ +#ifdef __WIN32__ /* WIN */ void *reserved121; -#endif /* __WIN32__ */ -#ifdef MAC_OSX_TK +#endif /* WIN */ +#ifdef MAC_OSX_TK /* AQUA */ + void *reserved121; /* Dummy entry for stubs table backwards compatibility */ Pixmap (*tkpCreateNativeBitmap) (Display * display, CONST char * source); /* 121 */ -#endif /* MAC_OSX_TK */ -#if !defined(__WIN32__) /* UNIX */ +#endif /* AQUA */ +#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */ void *reserved122; -#endif /* UNIX */ -#ifdef __WIN32__ +#endif /* X11 */ +#ifdef __WIN32__ /* WIN */ void *reserved122; -#endif /* __WIN32__ */ -#ifdef MAC_OSX_TK +#endif /* WIN */ +#ifdef MAC_OSX_TK /* AQUA */ + void *reserved122; /* Dummy entry for stubs table backwards compatibility */ void (*tkpDefineNativeBitmaps) (void); /* 122 */ -#endif /* MAC_OSX_TK */ +#endif /* AQUA */ void *reserved123; -#if !defined(__WIN32__) /* UNIX */ +#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */ void *reserved124; -#endif /* UNIX */ -#ifdef __WIN32__ +#endif /* X11 */ +#ifdef __WIN32__ /* WIN */ void *reserved124; -#endif /* __WIN32__ */ -#ifdef MAC_OSX_TK +#endif /* WIN */ +#ifdef MAC_OSX_TK /* AQUA */ + void *reserved124; /* Dummy entry for stubs table backwards compatibility */ Pixmap (*tkpGetNativeAppBitmap) (Display * display, CONST char * name, int * width, int * height); /* 124 */ -#endif /* MAC_OSX_TK */ +#endif /* AQUA */ void *reserved125; void *reserved126; void *reserved127; @@ -1188,15 +1198,16 @@ typedef struct TkIntStubs { void (*tkFocusFree) (TkMainInfo * mainPtr); /* 142 */ void (*tkClipCleanup) (TkDisplay * dispPtr); /* 143 */ void (*tkGCCleanup) (TkDisplay * dispPtr); /* 144 */ -#if !defined(__WIN32__) /* UNIX */ +#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */ void *reserved145; -#endif /* UNIX */ -#ifdef __WIN32__ +#endif /* X11 */ +#ifdef __WIN32__ /* WIN */ void (*tkSubtractRegion) (TkRegion sra, TkRegion srcb, TkRegion dr_return); /* 145 */ -#endif /* __WIN32__ */ -#ifdef MAC_OSX_TK +#endif /* WIN */ +#ifdef MAC_OSX_TK /* AQUA */ + void *reserved145; /* Dummy entry for stubs table backwards compatibility */ void (*tkSubtractRegion) (TkRegion sra, TkRegion srcb, TkRegion dr_return); /* 145 */ -#endif /* MAC_OSX_TK */ +#endif /* AQUA */ void (*tkStylePkgInit) (TkMainInfo * mainPtr); /* 146 */ void (*tkStylePkgFree) (TkMainInfo * mainPtr); /* 147 */ Tk_Window (*tkToplevelWindowForCommand) (Tcl_Interp * interp, CONST char * cmdName); /* 148 */ @@ -1674,110 +1685,110 @@ extern TkIntStubs *tkIntStubsPtr; #define TkpMenuThreadInit \ (tkIntStubsPtr->tkpMenuThreadInit) /* 112 */ #endif -#ifdef __WIN32__ +#ifdef __WIN32__ /* WIN */ #ifndef TkClipBox #define TkClipBox \ (tkIntStubsPtr->tkClipBox) /* 113 */ #endif -#endif /* __WIN32__ */ -#ifdef MAC_OSX_TK +#endif /* WIN */ +#ifdef MAC_OSX_TK /* AQUA */ #ifndef TkClipBox #define TkClipBox \ (tkIntStubsPtr->tkClipBox) /* 113 */ #endif -#endif /* MAC_OSX_TK */ -#ifdef __WIN32__ +#endif /* AQUA */ +#ifdef __WIN32__ /* WIN */ #ifndef TkCreateRegion #define TkCreateRegion \ (tkIntStubsPtr->tkCreateRegion) /* 114 */ #endif -#endif /* __WIN32__ */ -#ifdef MAC_OSX_TK +#endif /* WIN */ +#ifdef MAC_OSX_TK /* AQUA */ #ifndef TkCreateRegion #define TkCreateRegion \ (tkIntStubsPtr->tkCreateRegion) /* 114 */ #endif -#endif /* MAC_OSX_TK */ -#ifdef __WIN32__ +#endif /* AQUA */ +#ifdef __WIN32__ /* WIN */ #ifndef TkDestroyRegion #define TkDestroyRegion \ (tkIntStubsPtr->tkDestroyRegion) /* 115 */ #endif -#endif /* __WIN32__ */ -#ifdef MAC_OSX_TK +#endif /* WIN */ +#ifdef MAC_OSX_TK /* AQUA */ #ifndef TkDestroyRegion #define TkDestroyRegion \ (tkIntStubsPtr->tkDestroyRegion) /* 115 */ #endif -#endif /* MAC_OSX_TK */ -#ifdef __WIN32__ +#endif /* AQUA */ +#ifdef __WIN32__ /* WIN */ #ifndef TkIntersectRegion #define TkIntersectRegion \ (tkIntStubsPtr->tkIntersectRegion) /* 116 */ #endif -#endif /* __WIN32__ */ -#ifdef MAC_OSX_TK +#endif /* WIN */ +#ifdef MAC_OSX_TK /* AQUA */ #ifndef TkIntersectRegion #define TkIntersectRegion \ (tkIntStubsPtr->tkIntersectRegion) /* 116 */ #endif -#endif /* MAC_OSX_TK */ -#ifdef __WIN32__ +#endif /* AQUA */ +#ifdef __WIN32__ /* WIN */ #ifndef TkRectInRegion #define TkRectInRegion \ (tkIntStubsPtr->tkRectInRegion) /* 117 */ #endif -#endif /* __WIN32__ */ -#ifdef MAC_OSX_TK +#endif /* WIN */ +#ifdef MAC_OSX_TK /* AQUA */ #ifndef TkRectInRegion #define TkRectInRegion \ (tkIntStubsPtr->tkRectInRegion) /* 117 */ #endif -#endif /* MAC_OSX_TK */ -#ifdef __WIN32__ +#endif /* AQUA */ +#ifdef __WIN32__ /* WIN */ #ifndef TkSetRegion #define TkSetRegion \ (tkIntStubsPtr->tkSetRegion) /* 118 */ #endif -#endif /* __WIN32__ */ -#ifdef MAC_OSX_TK +#endif /* WIN */ +#ifdef MAC_OSX_TK /* AQUA */ #ifndef TkSetRegion #define TkSetRegion \ (tkIntStubsPtr->tkSetRegion) /* 118 */ #endif -#endif /* MAC_OSX_TK */ -#ifdef __WIN32__ +#endif /* AQUA */ +#ifdef __WIN32__ /* WIN */ #ifndef TkUnionRectWithRegion #define TkUnionRectWithRegion \ (tkIntStubsPtr->tkUnionRectWithRegion) /* 119 */ #endif -#endif /* __WIN32__ */ -#ifdef MAC_OSX_TK +#endif /* WIN */ +#ifdef MAC_OSX_TK /* AQUA */ #ifndef TkUnionRectWithRegion #define TkUnionRectWithRegion \ (tkIntStubsPtr->tkUnionRectWithRegion) /* 119 */ #endif -#endif /* MAC_OSX_TK */ +#endif /* AQUA */ /* Slot 120 is reserved */ -#ifdef MAC_OSX_TK +#ifdef MAC_OSX_TK /* AQUA */ #ifndef TkpCreateNativeBitmap #define TkpCreateNativeBitmap \ (tkIntStubsPtr->tkpCreateNativeBitmap) /* 121 */ #endif -#endif /* MAC_OSX_TK */ -#ifdef MAC_OSX_TK +#endif /* AQUA */ +#ifdef MAC_OSX_TK /* AQUA */ #ifndef TkpDefineNativeBitmaps #define TkpDefineNativeBitmaps \ (tkIntStubsPtr->tkpDefineNativeBitmaps) /* 122 */ #endif -#endif /* MAC_OSX_TK */ +#endif /* AQUA */ /* Slot 123 is reserved */ -#ifdef MAC_OSX_TK +#ifdef MAC_OSX_TK /* AQUA */ #ifndef TkpGetNativeAppBitmap #define TkpGetNativeAppBitmap \ (tkIntStubsPtr->tkpGetNativeAppBitmap) /* 124 */ #endif -#endif /* MAC_OSX_TK */ +#endif /* AQUA */ /* Slot 125 is reserved */ /* Slot 126 is reserved */ /* Slot 127 is reserved */ @@ -1828,18 +1839,18 @@ extern TkIntStubs *tkIntStubsPtr; #define TkGCCleanup \ (tkIntStubsPtr->tkGCCleanup) /* 144 */ #endif -#ifdef __WIN32__ +#ifdef __WIN32__ /* WIN */ #ifndef TkSubtractRegion #define TkSubtractRegion \ (tkIntStubsPtr->tkSubtractRegion) /* 145 */ #endif -#endif /* __WIN32__ */ -#ifdef MAC_OSX_TK +#endif /* WIN */ +#ifdef MAC_OSX_TK /* AQUA */ #ifndef TkSubtractRegion #define TkSubtractRegion \ (tkIntStubsPtr->tkSubtractRegion) /* 145 */ #endif -#endif /* MAC_OSX_TK */ +#endif /* AQUA */ #ifndef TkStylePkgInit #define TkStylePkgInit \ (tkIntStubsPtr->tkStylePkgInit) /* 146 */ diff --git a/generic/tkIntPlatDecls.h b/generic/tkIntPlatDecls.h index f95c3aa..8eb9739 100644 --- a/generic/tkIntPlatDecls.h +++ b/generic/tkIntPlatDecls.h @@ -9,7 +9,7 @@ * Copyright (c) 1998-1999 by Scriptics Corporation. * All rights reserved. * - * RCS: @(#) $Id: tkIntPlatDecls.h,v 1.27 2006/12/18 16:42:46 dgp Exp $ + * RCS: @(#) $Id: tkIntPlatDecls.h,v 1.27.2.1 2007/12/10 18:39:29 dgp Exp $ */ #ifndef _TKINTPLATDECLS @@ -32,7 +32,7 @@ * Exported function declarations: */ -#ifdef __WIN32__ +#ifdef __WIN32__ /* WIN */ #ifndef TkAlignImageData_TCL_DECLARED #define TkAlignImageData_TCL_DECLARED /* 0 */ @@ -224,8 +224,8 @@ EXTERN void TkWinSetHINSTANCE (HINSTANCE hInstance); /* 35 */ EXTERN int TkWinGetPlatformTheme (void); #endif -#endif /* __WIN32__ */ -#ifdef MAC_OSX_TK +#endif /* WIN */ +#ifdef MAC_OSX_TK /* AQUA */ #ifndef TkGenerateActivateEvents_TCL_DECLARED #define TkGenerateActivateEvents_TCL_DECLARED /* 0 */ @@ -477,7 +477,7 @@ EXTERN void TkGenWMDestroyEvent (Tk_Window tkwin); /* 53 */ EXTERN unsigned long TkpGetMS (void); #endif -#endif /* MAC_OSX_TK */ +#endif /* AQUA */ #if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */ #ifndef TkCreateXEventSource_TCL_DECLARED #define TkCreateXEventSource_TCL_DECLARED @@ -558,7 +558,7 @@ typedef struct TkIntPlatStubs { int magic; struct TkIntPlatStubHooks *hooks; -#ifdef __WIN32__ +#ifdef __WIN32__ /* WIN */ char * (*tkAlignImageData) (XImage * image, int alignment, int bitOrder); /* 0 */ void *reserved1; void (*tkGenerateActivateEvents) (TkWindow * winPtr, int active); /* 2 */ @@ -595,8 +595,8 @@ typedef struct TkIntPlatStubs { int (*tkWinGetPlatformId) (void); /* 33 */ void (*tkWinSetHINSTANCE) (HINSTANCE hInstance); /* 34 */ int (*tkWinGetPlatformTheme) (void); /* 35 */ -#endif /* __WIN32__ */ -#ifdef MAC_OSX_TK +#endif /* WIN */ +#ifdef MAC_OSX_TK /* AQUA */ void (*tkGenerateActivateEvents) (TkWindow * winPtr, int active); /* 0 */ void *reserved1; void *reserved2; @@ -651,7 +651,7 @@ typedef struct TkIntPlatStubs { void (*tkGenWMDestroyEvent) (Tk_Window tkwin); /* 51 */ void *reserved52; unsigned long (*tkpGetMS) (void); /* 53 */ -#endif /* MAC_OSX_TK */ +#endif /* AQUA */ #if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */ void (*tkCreateXEventSource) (void); /* 0 */ void (*tkFreeWindowId) (TkDisplay * dispPtr, Window w); /* 1 */ @@ -684,7 +684,7 @@ extern TkIntPlatStubs *tkIntPlatStubsPtr; * Inline function declarations: */ -#ifdef __WIN32__ +#ifdef __WIN32__ /* WIN */ #ifndef TkAlignImageData #define TkAlignImageData \ (tkIntPlatStubsPtr->tkAlignImageData) /* 0 */ @@ -826,8 +826,8 @@ extern TkIntPlatStubs *tkIntPlatStubsPtr; #define TkWinGetPlatformTheme \ (tkIntPlatStubsPtr->tkWinGetPlatformTheme) /* 35 */ #endif -#endif /* __WIN32__ */ -#ifdef MAC_OSX_TK +#endif /* WIN */ +#ifdef MAC_OSX_TK /* AQUA */ #ifndef TkGenerateActivateEvents #define TkGenerateActivateEvents \ (tkIntPlatStubsPtr->tkGenerateActivateEvents) /* 0 */ @@ -1020,7 +1020,7 @@ extern TkIntPlatStubs *tkIntPlatStubsPtr; #define TkpGetMS \ (tkIntPlatStubsPtr->tkpGetMS) /* 53 */ #endif -#endif /* MAC_OSX_TK */ +#endif /* AQUA */ #if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */ #ifndef TkCreateXEventSource #define TkCreateXEventSource \ diff --git a/generic/tkIntXlibDecls.h b/generic/tkIntXlibDecls.h index fadf72c..1e153f4 100644 --- a/generic/tkIntXlibDecls.h +++ b/generic/tkIntXlibDecls.h @@ -9,7 +9,7 @@ * Copyright (c) 1998-1999 by Scriptics Corporation. * All rights reserved. * - * RCS: @(#) $Id: tkIntXlibDecls.h,v 1.21 2006/12/18 16:42:46 dgp Exp $ + * RCS: @(#) $Id: tkIntXlibDecls.h,v 1.21.2.1 2007/12/10 18:39:30 dgp Exp $ */ #ifndef _TKINTXLIBDECLS @@ -34,7 +34,7 @@ * Exported function declarations: */ -#ifdef __WIN32__ +#ifdef __WIN32__ /* WIN */ #ifndef XSetDashes_TCL_DECLARED #define XSetDashes_TCL_DECLARED /* 0 */ @@ -659,8 +659,8 @@ EXTERN void XFillRectangle (Display * display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height); #endif -#endif /* __WIN32__ */ -#ifdef MAC_OSX_TK +#endif /* WIN */ +#ifdef MAC_OSX_TK /* AQUA */ #ifndef XSetDashes_TCL_DECLARED #define XSetDashes_TCL_DECLARED /* 0 */ @@ -1208,13 +1208,13 @@ EXTERN Status XQueryTree (Display * d, Window w1, Window * w2, /* 91 */ EXTERN int XSync (Display * display, Bool flag); #endif -#endif /* MAC_OSX_TK */ +#endif /* AQUA */ typedef struct TkIntXlibStubs { int magic; struct TkIntXlibStubHooks *hooks; -#ifdef __WIN32__ +#ifdef __WIN32__ /* WIN */ void (*xSetDashes) (Display * display, GC gc, int dash_offset, _Xconst char * dash_list, int n); /* 0 */ XModifierKeymap * (*xGetModifierMapping) (Display * d); /* 1 */ XImage * (*xCreateImage) (Display * d, Visual * v, unsigned int ui1, int i1, int i2, char * cp, unsigned int ui2, unsigned int ui3, int i3, int i4); /* 2 */ @@ -1322,8 +1322,8 @@ typedef struct TkIntXlibStubs { void (*xDrawLine) (Display * d, Drawable dr, GC g, int x1, int y1, int x2, int y2); /* 104 */ void (*xWarpPointer) (Display * d, Window s, Window dw, int sx, int sy, unsigned int sw, unsigned int sh, int dx, int dy); /* 105 */ void (*xFillRectangle) (Display * display, Drawable d, GC gc, int x, int y, unsigned int width, unsigned int height); /* 106 */ -#endif /* __WIN32__ */ -#ifdef MAC_OSX_TK +#endif /* WIN */ +#ifdef MAC_OSX_TK /* AQUA */ void (*xSetDashes) (Display * display, GC gc, int dash_offset, _Xconst char * dash_list, int n); /* 0 */ XModifierKeymap * (*xGetModifierMapping) (Display * d); /* 1 */ XImage * (*xCreateImage) (Display * d, Visual * v, unsigned int ui1, int i1, int i2, char * cp, unsigned int ui2, unsigned int ui3, int i3, int i4); /* 2 */ @@ -1416,7 +1416,7 @@ typedef struct TkIntXlibStubs { void (*xQueryColors) (Display * display, Colormap colormap, XColor * defs_in_out, int ncolors); /* 89 */ Status (*xQueryTree) (Display * d, Window w1, Window * w2, Window * w3, Window ** w4, unsigned int * ui); /* 90 */ int (*xSync) (Display * display, Bool flag); /* 91 */ -#endif /* MAC_OSX_TK */ +#endif /* AQUA */ } TkIntXlibStubs; #ifdef __cplusplus @@ -1433,7 +1433,7 @@ extern TkIntXlibStubs *tkIntXlibStubsPtr; * Inline function declarations: */ -#ifdef __WIN32__ +#ifdef __WIN32__ /* WIN */ #ifndef XSetDashes #define XSetDashes \ (tkIntXlibStubsPtr->xSetDashes) /* 0 */ @@ -1859,8 +1859,8 @@ extern TkIntXlibStubs *tkIntXlibStubsPtr; #define XFillRectangle \ (tkIntXlibStubsPtr->xFillRectangle) /* 106 */ #endif -#endif /* __WIN32__ */ -#ifdef MAC_OSX_TK +#endif /* WIN */ +#ifdef MAC_OSX_TK /* AQUA */ #ifndef XSetDashes #define XSetDashes \ (tkIntXlibStubsPtr->xSetDashes) /* 0 */ @@ -2229,7 +2229,7 @@ extern TkIntXlibStubs *tkIntXlibStubsPtr; #define XSync \ (tkIntXlibStubsPtr->xSync) /* 91 */ #endif -#endif /* MAC_OSX_TK */ +#endif /* AQUA */ #endif /* defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) */ diff --git a/generic/tkPlatDecls.h b/generic/tkPlatDecls.h index b47ca79..1d8bd2d 100644 --- a/generic/tkPlatDecls.h +++ b/generic/tkPlatDecls.h @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkPlatDecls.h,v 1.13 2006/12/18 16:42:46 dgp Exp $ + * RCS: @(#) $Id: tkPlatDecls.h,v 1.13.2.1 2007/12/10 18:39:30 dgp Exp $ */ #ifndef _TKPLATDECLS @@ -31,7 +31,7 @@ * Exported function declarations: */ -#ifdef __WIN32__ +#ifdef __WIN32__ /* WIN */ #ifndef Tk_AttachHWND_TCL_DECLARED #define Tk_AttachHWND_TCL_DECLARED /* 0 */ @@ -64,8 +64,8 @@ EXTERN int Tk_TranslateWinEvent (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam, LRESULT * result); #endif -#endif /* __WIN32__ */ -#ifdef MAC_OSX_TK +#endif /* WIN */ +#ifdef MAC_OSX_TK /* AQUA */ #ifndef Tk_MacOSXSetEmbedHandler_TCL_DECLARED #define Tk_MacOSXSetEmbedHandler_TCL_DECLARED /* 0 */ @@ -127,21 +127,21 @@ EXTERN void Tk_MacOSXSetupTkNotifier (void); /* 10 */ EXTERN int Tk_MacOSXIsAppInFront (void); #endif -#endif /* MAC_OSX_TK */ +#endif /* AQUA */ typedef struct TkPlatStubs { int magic; struct TkPlatStubHooks *hooks; -#ifdef __WIN32__ +#ifdef __WIN32__ /* WIN */ Window (*tk_AttachHWND) (Tk_Window tkwin, HWND hwnd); /* 0 */ HINSTANCE (*tk_GetHINSTANCE) (void); /* 1 */ HWND (*tk_GetHWND) (Window window); /* 2 */ Tk_Window (*tk_HWNDToWindow) (HWND hwnd); /* 3 */ void (*tk_PointerEvent) (HWND hwnd, int x, int y); /* 4 */ int (*tk_TranslateWinEvent) (HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam, LRESULT * result); /* 5 */ -#endif /* __WIN32__ */ -#ifdef MAC_OSX_TK +#endif /* WIN */ +#ifdef MAC_OSX_TK /* AQUA */ void (*tk_MacOSXSetEmbedHandler) (Tk_MacOSXEmbedRegisterWinProc * registerWinProcPtr, Tk_MacOSXEmbedGetGrafPortProc * getPortProcPtr, Tk_MacOSXEmbedMakeContainerExistProc * containerExistProcPtr, Tk_MacOSXEmbedGetClipProc * getClipProc, Tk_MacOSXEmbedGetOffsetInParentProc * getOffsetProc); /* 0 */ void (*tk_MacOSXTurnOffMenus) (void); /* 1 */ void (*tk_MacOSXTkOwnsCursor) (int tkOwnsIt); /* 2 */ @@ -153,7 +153,7 @@ typedef struct TkPlatStubs { ControlRef (*tkMacOSXGetRootControl) (Drawable drawable); /* 8 */ void (*tk_MacOSXSetupTkNotifier) (void); /* 9 */ int (*tk_MacOSXIsAppInFront) (void); /* 10 */ -#endif /* MAC_OSX_TK */ +#endif /* AQUA */ } TkPlatStubs; #ifdef __cplusplus @@ -170,7 +170,7 @@ extern TkPlatStubs *tkPlatStubsPtr; * Inline function declarations: */ -#ifdef __WIN32__ +#ifdef __WIN32__ /* WIN */ #ifndef Tk_AttachHWND #define Tk_AttachHWND \ (tkPlatStubsPtr->tk_AttachHWND) /* 0 */ @@ -195,8 +195,8 @@ extern TkPlatStubs *tkPlatStubsPtr; #define Tk_TranslateWinEvent \ (tkPlatStubsPtr->tk_TranslateWinEvent) /* 5 */ #endif -#endif /* __WIN32__ */ -#ifdef MAC_OSX_TK +#endif /* WIN */ +#ifdef MAC_OSX_TK /* AQUA */ #ifndef Tk_MacOSXSetEmbedHandler #define Tk_MacOSXSetEmbedHandler \ (tkPlatStubsPtr->tk_MacOSXSetEmbedHandler) /* 0 */ @@ -241,7 +241,7 @@ extern TkPlatStubs *tkPlatStubsPtr; #define Tk_MacOSXIsAppInFront \ (tkPlatStubsPtr->tk_MacOSXIsAppInFront) /* 10 */ #endif -#endif /* MAC_OSX_TK */ +#endif /* AQUA */ #endif /* defined(USE_TK_STUBS) && !defined(USE_TK_STUB_PROCS) */ diff --git a/generic/tkStubInit.c b/generic/tkStubInit.c index ba00d6c..ce94b7f 100644 --- a/generic/tkStubInit.c +++ b/generic/tkStubInit.c @@ -8,7 +8,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkStubInit.c,v 1.57.2.1 2007/09/07 01:25:36 dgp Exp $ + * RCS: @(#) $Id: tkStubInit.c,v 1.57.2.2 2007/12/10 18:39:30 dgp Exp $ */ #include "tkInt.h" @@ -171,98 +171,108 @@ TkIntStubs tkIntStubs = { TkpGetSubFonts, /* 110 */ TkpGetSystemDefault, /* 111 */ TkpMenuThreadInit, /* 112 */ -#if !defined(__WIN32__) /* UNIX */ +#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */ NULL, /* 113 */ -#endif /* UNIX */ -#ifdef __WIN32__ +#endif /* X11 */ +#ifdef __WIN32__ /* WIN */ TkClipBox, /* 113 */ -#endif /* __WIN32__ */ -#ifdef MAC_OSX_TK +#endif /* WIN */ +#ifdef MAC_OSX_TK /* AQUA */ + NULL, /* 113 */ /* Dummy entry for stubs table backwards compatibility */ TkClipBox, /* 113 */ -#endif /* MAC_OSX_TK */ -#if !defined(__WIN32__) /* UNIX */ +#endif /* AQUA */ +#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */ NULL, /* 114 */ -#endif /* UNIX */ -#ifdef __WIN32__ +#endif /* X11 */ +#ifdef __WIN32__ /* WIN */ TkCreateRegion, /* 114 */ -#endif /* __WIN32__ */ -#ifdef MAC_OSX_TK +#endif /* WIN */ +#ifdef MAC_OSX_TK /* AQUA */ + NULL, /* 114 */ /* Dummy entry for stubs table backwards compatibility */ TkCreateRegion, /* 114 */ -#endif /* MAC_OSX_TK */ -#if !defined(__WIN32__) /* UNIX */ +#endif /* AQUA */ +#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */ NULL, /* 115 */ -#endif /* UNIX */ -#ifdef __WIN32__ +#endif /* X11 */ +#ifdef __WIN32__ /* WIN */ TkDestroyRegion, /* 115 */ -#endif /* __WIN32__ */ -#ifdef MAC_OSX_TK +#endif /* WIN */ +#ifdef MAC_OSX_TK /* AQUA */ + NULL, /* 115 */ /* Dummy entry for stubs table backwards compatibility */ TkDestroyRegion, /* 115 */ -#endif /* MAC_OSX_TK */ -#if !defined(__WIN32__) /* UNIX */ +#endif /* AQUA */ +#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */ NULL, /* 116 */ -#endif /* UNIX */ -#ifdef __WIN32__ +#endif /* X11 */ +#ifdef __WIN32__ /* WIN */ TkIntersectRegion, /* 116 */ -#endif /* __WIN32__ */ -#ifdef MAC_OSX_TK +#endif /* WIN */ +#ifdef MAC_OSX_TK /* AQUA */ + NULL, /* 116 */ /* Dummy entry for stubs table backwards compatibility */ TkIntersectRegion, /* 116 */ -#endif /* MAC_OSX_TK */ -#if !defined(__WIN32__) /* UNIX */ +#endif /* AQUA */ +#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */ NULL, /* 117 */ -#endif /* UNIX */ -#ifdef __WIN32__ +#endif /* X11 */ +#ifdef __WIN32__ /* WIN */ TkRectInRegion, /* 117 */ -#endif /* __WIN32__ */ -#ifdef MAC_OSX_TK +#endif /* WIN */ +#ifdef MAC_OSX_TK /* AQUA */ + NULL, /* 117 */ /* Dummy entry for stubs table backwards compatibility */ TkRectInRegion, /* 117 */ -#endif /* MAC_OSX_TK */ -#if !defined(__WIN32__) /* UNIX */ +#endif /* AQUA */ +#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */ NULL, /* 118 */ -#endif /* UNIX */ -#ifdef __WIN32__ +#endif /* X11 */ +#ifdef __WIN32__ /* WIN */ TkSetRegion, /* 118 */ -#endif /* __WIN32__ */ -#ifdef MAC_OSX_TK +#endif /* WIN */ +#ifdef MAC_OSX_TK /* AQUA */ + NULL, /* 118 */ /* Dummy entry for stubs table backwards compatibility */ TkSetRegion, /* 118 */ -#endif /* MAC_OSX_TK */ -#if !defined(__WIN32__) /* UNIX */ +#endif /* AQUA */ +#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */ NULL, /* 119 */ -#endif /* UNIX */ -#ifdef __WIN32__ +#endif /* X11 */ +#ifdef __WIN32__ /* WIN */ TkUnionRectWithRegion, /* 119 */ -#endif /* __WIN32__ */ -#ifdef MAC_OSX_TK +#endif /* WIN */ +#ifdef MAC_OSX_TK /* AQUA */ + NULL, /* 119 */ /* Dummy entry for stubs table backwards compatibility */ TkUnionRectWithRegion, /* 119 */ -#endif /* MAC_OSX_TK */ +#endif /* AQUA */ NULL, /* 120 */ -#if !defined(__WIN32__) /* UNIX */ +#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */ NULL, /* 121 */ -#endif /* UNIX */ -#ifdef __WIN32__ +#endif /* X11 */ +#ifdef __WIN32__ /* WIN */ NULL, /* 121 */ -#endif /* __WIN32__ */ -#ifdef MAC_OSX_TK +#endif /* WIN */ +#ifdef MAC_OSX_TK /* AQUA */ + NULL, /* 121 */ /* Dummy entry for stubs table backwards compatibility */ TkpCreateNativeBitmap, /* 121 */ -#endif /* MAC_OSX_TK */ -#if !defined(__WIN32__) /* UNIX */ +#endif /* AQUA */ +#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */ NULL, /* 122 */ -#endif /* UNIX */ -#ifdef __WIN32__ +#endif /* X11 */ +#ifdef __WIN32__ /* WIN */ NULL, /* 122 */ -#endif /* __WIN32__ */ -#ifdef MAC_OSX_TK +#endif /* WIN */ +#ifdef MAC_OSX_TK /* AQUA */ + NULL, /* 122 */ /* Dummy entry for stubs table backwards compatibility */ TkpDefineNativeBitmaps, /* 122 */ -#endif /* MAC_OSX_TK */ +#endif /* AQUA */ NULL, /* 123 */ -#if !defined(__WIN32__) /* UNIX */ +#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */ NULL, /* 124 */ -#endif /* UNIX */ -#ifdef __WIN32__ +#endif /* X11 */ +#ifdef __WIN32__ /* WIN */ NULL, /* 124 */ -#endif /* __WIN32__ */ -#ifdef MAC_OSX_TK +#endif /* WIN */ +#ifdef MAC_OSX_TK /* AQUA */ + NULL, /* 124 */ /* Dummy entry for stubs table backwards compatibility */ TkpGetNativeAppBitmap, /* 124 */ -#endif /* MAC_OSX_TK */ +#endif /* AQUA */ NULL, /* 125 */ NULL, /* 126 */ NULL, /* 127 */ @@ -283,15 +293,16 @@ TkIntStubs tkIntStubs = { TkFocusFree, /* 142 */ TkClipCleanup, /* 143 */ TkGCCleanup, /* 144 */ -#if !defined(__WIN32__) /* UNIX */ +#if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */ NULL, /* 145 */ -#endif /* UNIX */ -#ifdef __WIN32__ +#endif /* X11 */ +#ifdef __WIN32__ /* WIN */ TkSubtractRegion, /* 145 */ -#endif /* __WIN32__ */ -#ifdef MAC_OSX_TK +#endif /* WIN */ +#ifdef MAC_OSX_TK /* AQUA */ + NULL, /* 145 */ /* Dummy entry for stubs table backwards compatibility */ TkSubtractRegion, /* 145 */ -#endif /* MAC_OSX_TK */ +#endif /* AQUA */ TkStylePkgInit, /* 146 */ TkStylePkgFree, /* 147 */ TkToplevelWindowForCommand, /* 148 */ @@ -309,7 +320,7 @@ TkIntStubs tkIntStubs = { TkIntPlatStubs tkIntPlatStubs = { TCL_STUB_MAGIC, NULL, -#ifdef __WIN32__ +#ifdef __WIN32__ /* WIN */ TkAlignImageData, /* 0 */ NULL, /* 1 */ TkGenerateActivateEvents, /* 2 */ @@ -346,8 +357,8 @@ TkIntPlatStubs tkIntPlatStubs = { TkWinGetPlatformId, /* 33 */ TkWinSetHINSTANCE, /* 34 */ TkWinGetPlatformTheme, /* 35 */ -#endif /* __WIN32__ */ -#ifdef MAC_OSX_TK +#endif /* WIN */ +#ifdef MAC_OSX_TK /* AQUA */ TkGenerateActivateEvents, /* 0 */ NULL, /* 1 */ NULL, /* 2 */ @@ -402,7 +413,7 @@ TkIntPlatStubs tkIntPlatStubs = { TkGenWMDestroyEvent, /* 51 */ NULL, /* 52 */ TkpGetMS, /* 53 */ -#endif /* MAC_OSX_TK */ +#endif /* AQUA */ #if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* X11 */ TkCreateXEventSource, /* 0 */ TkFreeWindowId, /* 1 */ @@ -424,7 +435,7 @@ TkIntPlatStubs tkIntPlatStubs = { TkIntXlibStubs tkIntXlibStubs = { TCL_STUB_MAGIC, NULL, -#ifdef __WIN32__ +#ifdef __WIN32__ /* WIN */ XSetDashes, /* 0 */ XGetModifierMapping, /* 1 */ XCreateImage, /* 2 */ @@ -532,8 +543,8 @@ TkIntXlibStubs tkIntXlibStubs = { XDrawLine, /* 104 */ XWarpPointer, /* 105 */ XFillRectangle, /* 106 */ -#endif /* __WIN32__ */ -#ifdef MAC_OSX_TK +#endif /* WIN */ +#ifdef MAC_OSX_TK /* AQUA */ XSetDashes, /* 0 */ XGetModifierMapping, /* 1 */ XCreateImage, /* 2 */ @@ -626,21 +637,21 @@ TkIntXlibStubs tkIntXlibStubs = { XQueryColors, /* 89 */ XQueryTree, /* 90 */ XSync, /* 91 */ -#endif /* MAC_OSX_TK */ +#endif /* AQUA */ }; TkPlatStubs tkPlatStubs = { TCL_STUB_MAGIC, NULL, -#ifdef __WIN32__ +#ifdef __WIN32__ /* WIN */ Tk_AttachHWND, /* 0 */ Tk_GetHINSTANCE, /* 1 */ Tk_GetHWND, /* 2 */ Tk_HWNDToWindow, /* 3 */ Tk_PointerEvent, /* 4 */ Tk_TranslateWinEvent, /* 5 */ -#endif /* __WIN32__ */ -#ifdef MAC_OSX_TK +#endif /* WIN */ +#ifdef MAC_OSX_TK /* AQUA */ Tk_MacOSXSetEmbedHandler, /* 0 */ Tk_MacOSXTurnOffMenus, /* 1 */ Tk_MacOSXTkOwnsCursor, /* 2 */ @@ -652,7 +663,7 @@ TkPlatStubs tkPlatStubs = { TkMacOSXGetRootControl, /* 8 */ Tk_MacOSXSetupTkNotifier, /* 9 */ Tk_MacOSXIsAppInFront, /* 10 */ -#endif /* MAC_OSX_TK */ +#endif /* AQUA */ }; static TkStubHooks tkStubHooks = { diff --git a/library/ttk/altTheme.tcl b/library/ttk/altTheme.tcl index d892175..e752fce 100644 --- a/library/ttk/altTheme.tcl +++ b/library/ttk/altTheme.tcl @@ -1,5 +1,5 @@ # -# $Id: altTheme.tcl,v 1.3.2.1 2007/11/21 16:46:27 dgp Exp $ +# $Id: altTheme.tcl,v 1.3.2.2 2007/12/10 18:39:30 dgp Exp $ # # Ttk widget set: Alternate theme # @@ -17,10 +17,9 @@ namespace eval ttk::theme::alt { -selectfg "#ffffff" } - namespace import -force ::ttk::style - style theme settings alt { + ttk::style theme settings alt { - style configure "." \ + ttk::style configure "." \ -background $colors(-frame) \ -foreground black \ -troughcolor $colors(-darker) \ @@ -29,74 +28,74 @@ namespace eval ttk::theme::alt { -font TkDefaultFont \ ; - style map "." -background \ + ttk::style map "." -background \ [list disabled $colors(-frame) active $colors(-activebg)] ; - style map "." -foreground [list disabled $colors(-disabledfg)] ; - style map "." -embossed [list disabled 1] ; + ttk::style map "." -foreground [list disabled $colors(-disabledfg)] ; + ttk::style map "." -embossed [list disabled 1] ; - style configure TButton \ + ttk::style configure TButton \ -anchor center -width -11 -padding "1 1" \ -relief raised -shiftrelief 1 \ -highlightthickness 1 -highlightcolor $colors(-frame) - style map TButton -relief { + ttk::style map TButton -relief { {pressed !disabled} sunken {active !disabled} raised } -highlightcolor {alternate black} - style configure TCheckbutton -indicatorcolor "#ffffff" -padding 2 - style configure TRadiobutton -indicatorcolor "#ffffff" -padding 2 - style map TCheckbutton -indicatorcolor \ + ttk::style configure TCheckbutton -indicatorcolor "#ffffff" -padding 2 + ttk::style configure TRadiobutton -indicatorcolor "#ffffff" -padding 2 + ttk::style map TCheckbutton -indicatorcolor \ [list disabled $colors(-frame) pressed $colors(-frame)] - style map TRadiobutton -indicatorcolor \ + ttk::style map TRadiobutton -indicatorcolor \ [list disabled $colors(-frame) pressed $colors(-frame)] - style configure TMenubutton \ + ttk::style configure TMenubutton \ -width -11 -padding "3 3" -relief raised - style configure TEntry -padding 1 - style map TEntry -fieldbackground \ + ttk::style configure TEntry -padding 1 + ttk::style map TEntry -fieldbackground \ [list readonly $colors(-frame) disabled $colors(-frame)] - style configure TCombobox -padding 1 - style map TCombobox -fieldbackground \ + ttk::style configure TCombobox -padding 1 + ttk::style map TCombobox -fieldbackground \ [list readonly $colors(-frame) disabled $colors(-frame)] - style configure Toolbutton -relief flat -padding 2 - style map Toolbutton -relief \ + ttk::style configure Toolbutton -relief flat -padding 2 + ttk::style map Toolbutton -relief \ {disabled flat selected sunken pressed sunken active raised} - style map Toolbutton -background \ + ttk::style map Toolbutton -background \ [list pressed $colors(-darker) active $colors(-activebg)] - style configure TScrollbar -relief raised + ttk::style configure TScrollbar -relief raised - style configure TLabelframe -relief groove -borderwidth 2 + ttk::style configure TLabelframe -relief groove -borderwidth 2 - style configure TNotebook -tabmargins {2 2 1 0} - style configure TNotebook.Tab \ + ttk::style configure TNotebook -tabmargins {2 2 1 0} + ttk::style configure TNotebook.Tab \ -padding {4 2} -background $colors(-darker) - style map TNotebook.Tab \ + ttk::style map TNotebook.Tab \ -background [list selected $colors(-frame)] \ -expand [list selected {2 2 1 0}] \ ; # Treeview: - style configure Heading -font TkHeadingFont -relief raised - style configure Row -background $colors(-window) - style configure Cell -background $colors(-window) - style map Row \ + ttk::style configure Heading -font TkHeadingFont -relief raised + ttk::style configure Row -background $colors(-window) + ttk::style configure Cell -background $colors(-window) + ttk::style map Row \ -background [list selected $colors(-selectbg)] \ -foreground [list selected $colors(-selectfg)] ; - style map Cell \ + ttk::style map Cell \ -background [list selected $colors(-selectbg)] \ -foreground [list selected $colors(-selectfg)] ; - style map Item \ + ttk::style map Item \ -background [list selected $colors(-selectbg)] \ -foreground [list selected $colors(-selectfg)] ; - style configure TScale \ + ttk::style configure TScale \ -groovewidth 4 -troughrelief sunken \ -sliderwidth raised -borderwidth 2 - style configure TProgressbar \ + ttk::style configure TProgressbar \ -background $colors(-selectbg) -borderwidth 0 } } diff --git a/library/ttk/classicTheme.tcl b/library/ttk/classicTheme.tcl index 658acf6..51e0689 100644 --- a/library/ttk/classicTheme.tcl +++ b/library/ttk/classicTheme.tcl @@ -1,5 +1,5 @@ # -# $Id: classicTheme.tcl,v 1.3.2.1 2007/11/21 16:46:27 dgp Exp $ +# $Id: classicTheme.tcl,v 1.3.2.2 2007/12/10 18:39:30 dgp Exp $ # # "classic" Tk theme. # @@ -19,9 +19,8 @@ namespace eval ttk::theme::classic { -indicator "#b03060" } - namespace import -force ::ttk::style - style theme settings classic { - style configure "." \ + ttk::style theme settings classic { + ttk::style configure "." \ -font TkDefaultFont \ -background $colors(-frame) \ -foreground black \ @@ -38,53 +37,53 @@ namespace eval ttk::theme::classic { # To match pre-Xft X11 appearance, use: # ttk::style configure . -font {Helvetica 12 bold} - style map "." -background \ + ttk::style map "." -background \ [list disabled $colors(-frame) active $colors(-activebg)] - style map "." -foreground \ + ttk::style map "." -foreground \ [list disabled $colors(-disabledfg)] - style map "." -highlightcolor [list focus black] + ttk::style map "." -highlightcolor [list focus black] - style configure TButton \ + ttk::style configure TButton \ -anchor center -padding "3m 1m" -relief raised -shiftrelief 1 - style map TButton -relief [list {!disabled pressed} sunken] + ttk::style map TButton -relief [list {!disabled pressed} sunken] - style configure TCheckbutton -indicatorrelief raised - style map TCheckbutton \ + ttk::style configure TCheckbutton -indicatorrelief raised + ttk::style map TCheckbutton \ -indicatorcolor [list \ pressed $colors(-frame) selected $colors(-indicator)] \ -indicatorrelief {selected sunken pressed sunken} \ ; - style configure TRadiobutton -indicatorrelief raised - style map TRadiobutton \ + ttk::style configure TRadiobutton -indicatorrelief raised + ttk::style map TRadiobutton \ -indicatorcolor [list \ pressed $colors(-frame) selected $colors(-indicator)] \ -indicatorrelief {selected sunken pressed sunken} \ ; - style configure TMenubutton -relief raised -padding "3m 1m" + ttk::style configure TMenubutton -relief raised -padding "3m 1m" - style configure TEntry -relief sunken -padding 1 -font TkTextFont - style map TEntry -fieldbackground \ + ttk::style configure TEntry -relief sunken -padding 1 -font TkTextFont + ttk::style map TEntry -fieldbackground \ [list readonly $colors(-frame) disabled $colors(-frame)] - style configure TCombobox -padding 1 - style map TCombobox -fieldbackground \ + ttk::style configure TCombobox -padding 1 + ttk::style map TCombobox -fieldbackground \ [list readonly $colors(-frame) disabled $colors(-frame)] - style configure TLabelframe -borderwidth 2 -relief groove + ttk::style configure TLabelframe -borderwidth 2 -relief groove - style configure TScrollbar -relief raised - style map TScrollbar -relief {{pressed !disabled} sunken} + ttk::style configure TScrollbar -relief raised + ttk::style map TScrollbar -relief {{pressed !disabled} sunken} - style configure TScale -sliderrelief raised - style map TScale -sliderrelief {{pressed !disabled} sunken} + ttk::style configure TScale -sliderrelief raised + ttk::style map TScale -sliderrelief {{pressed !disabled} sunken} - style configure TProgressbar -background SteelBlue - style configure TNotebook.Tab \ + ttk::style configure TProgressbar -background SteelBlue + ttk::style configure TNotebook.Tab \ -padding {3m 1m} \ -background $colors(-troughbg) - style map TNotebook.Tab -background [list selected $colors(-frame)] + ttk::style map TNotebook.Tab -background [list selected $colors(-frame)] # Treeview: ttk::style configure Heading -font TkHeadingFont -relief raised @@ -100,10 +99,10 @@ namespace eval ttk::theme::classic { # # Toolbar buttons: # - style configure Toolbutton -padding 2 -relief flat -shiftrelief 2 - style map Toolbutton -relief \ + ttk::style configure Toolbutton -padding 2 -relief flat -shiftrelief 2 + ttk::style map Toolbutton -relief \ {disabled flat selected sunken pressed sunken active raised} - style map Toolbutton -background \ + ttk::style map Toolbutton -background \ [list pressed $colors(-troughbg) active $colors(-activebg)] } } diff --git a/macosx/tkMacOSXPort.h b/macosx/tkMacOSXPort.h index 3d3c634..7182cee 100644 --- a/macosx/tkMacOSXPort.h +++ b/macosx/tkMacOSXPort.h @@ -12,7 +12,7 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkMacOSXPort.h,v 1.11 2007/04/23 21:24:34 das Exp $ + * RCS: @(#) $Id: tkMacOSXPort.h,v 1.11.2.1 2007/12/10 18:39:30 dgp Exp $ */ #ifndef _TKMACPORT @@ -60,6 +60,9 @@ # include <time.h> # endif #endif +#if HAVE_INTTYPES_H +# include <inttypes.h> +#endif #include <unistd.h> #include <X11/Xlib.h> #include <X11/cursorfont.h> diff --git a/macosx/ttkMacOSXTheme.c b/macosx/ttkMacOSXTheme.c index e1b82f4..d324eb5 100644 --- a/macosx/ttkMacOSXTheme.c +++ b/macosx/ttkMacOSXTheme.c @@ -27,7 +27,7 @@ * top-level window, not to the Tk_Window. BoxToRect() * accounts for this. * - * RCS: @(#) $Id: ttkMacOSXTheme.c,v 1.7.2.8 2007/12/04 17:05:21 dgp Exp $ + * RCS: @(#) $Id: ttkMacOSXTheme.c,v 1.7.2.9 2007/12/10 18:39:31 dgp Exp $ */ #include "tkMacOSXPrivate.h" @@ -965,7 +965,7 @@ TTK_LAYOUT("TMenubutton", TTK_LAYOUT("TCombobox", TTK_GROUP("Combobox.button", TTK_PACK_TOP|TTK_FILL_X, TTK_GROUP("Combobox.padding", TTK_FILL_BOTH, - TTK_NODE("Combobox.textarea", TTK_PACK_LEFT|TTK_FILL_X)))) + TTK_NODE("Combobox.textarea", TTK_FILL_X)))) /* Notebook tabs -- no focus ring */ TTK_LAYOUT("Tab", diff --git a/tests/safe.test b/tests/safe.test index bbfd095..fb8d098 100644 --- a/tests/safe.test +++ b/tests/safe.test @@ -6,7 +6,7 @@ # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. # -# RCS: @(#) $Id: safe.test,v 1.16 2006/10/17 10:21:50 patthoyts Exp $ +# RCS: @(#) $Id: safe.test,v 1.16.2.1 2007/12/10 18:39:31 dgp Exp $ package require tcltest 2.1 eval tcltest::configure $argv @@ -35,9 +35,9 @@ tcltest::loadTestedCommands # The set of hidden commands is platform dependent: if {[string equal $tcl_platform(platform) "windows"]} { - set hidden_cmds {bell cd clipboard encoding exec exit fconfigure file glob grab load menu open pwd selection socket source tk_chooseColor tk_chooseDirectory tk_getOpenFile tk_getSaveFile tk_messageBox toplevel wm} + set hidden_cmds {bell cd clipboard encoding exec exit fconfigure file glob grab load menu open pwd selection socket source tk_chooseColor tk_chooseDirectory tk_getOpenFile tk_getSaveFile tk_messageBox toplevel unload wm} } else { - set hidden_cmds {bell cd clipboard encoding exec exit fconfigure file glob grab load menu open pwd selection send socket source toplevel wm} + set hidden_cmds {bell cd clipboard encoding exec exit fconfigure file glob grab load menu open pwd selection send socket source toplevel unload wm} } set saveAutoPath $::auto_path diff --git a/unix/README b/unix/README index 1a54013..a299b56 100644 --- a/unix/README +++ b/unix/README @@ -20,7 +20,7 @@ SGI, as well as PCs running Linux, BSDI, and SCO UNIX. To compile for a PC running Windows, see the README file in the directory ../win. To compile for MacOSX, see the README file in the directory ../macosx. -RCS: @(#) $Id: README,v 1.22.2.2 2007/11/25 06:47:34 dgp Exp $ +RCS: @(#) $Id: README,v 1.22.2.3 2007/12/10 18:39:31 dgp Exp $ How To Compile And Install Tk: ------------------------------ @@ -99,7 +99,10 @@ How To Compile And Install Tk: (e) Type "make". This will create a library archive called "libtk<version>.a" or "libtk<version>.so" and an interpreter application called "wish" that allows you to type Tcl/Tk commands - interactively or execute script files. + interactively or execute script files. It will also create a + stub library archive "libtkstub<version>.a" that developers may + link against other C code to produce loadable extensions that call + into Tk's public interface routines. (f) If the make fails then you'll have to personalize the Makefile for your site or possibly modify the distribution in other ways. @@ -113,22 +116,16 @@ How To Compile And Install Tk: directories to do this. The installation directories are determined by the "configure" script and may be specified with the --prefix and --exec-prefix options to "configure". See the - Makefile for information on what directories were chosen; you - can override these choices by modifying the "prefix" and - "exec_prefix" variables in the Makefile. - -(h) At this point you can play with Tk by invoking the "wish" - program and typing Tcl/Tk commands. However, if you haven't installed - Tk then you'll first need to set your TK_LIBRARY environment - variable to hold the full path name of the "library" subdirectory. - If you haven't installed Tcl either then you'll need to set your - TCL_LIBRARY environment variable as well (see the Tcl README file - for information on this). Note that installed versions of wish, - libtk.a, libtk.so, and the Tk library have a version number in their - names, such as "wish8.5" or "libtk8.5.so"; to use the installed - versions, either specify the version number or create a symbolic - link (e.g. from "wish" to "wish8.5"). You can also play with Tcl/Tk - by typing "make shell", provided Tcl has been built first. + Makefile for information on what directories were chosen. You + should not override these choices by modifying the Makefile, or by + copying files post-install. The installed binaries have embedded within + them path values relative to the install directory. If you change your + mind about where Tk should be installed, start this procedure over again from step (a) so that the path embedded in the binaries agrees with the + install location. + +(h) At this point you can play with Tk by running the installed "wish" + executable, or via the "make shell" target, and typing Tcl/Tk commands + at the interactive prompt. If you have trouble compiling Tk, see the URL noted above about working platforms. It contains information that people have provided about changes diff --git a/win/configure b/win/configure index e48016c..c742249 100755 --- a/win/configure +++ b/win/configure @@ -4017,7 +4017,7 @@ TK_SHARED_LIB_SUFFIX="\${NODOT_VERSION}${DLLSUFFIX}" TK_UNSHARED_LIB_SUFFIX="\${NODOT_VERSION}${LIBSUFFIX}" TK_EXPORT_FILE_SUFFIX="\${NODOT_VERSION}${LIBSUFFIX}" -eval "TK_SRC_DIR=`cd $srcdir/..; pwd`" +eval "TK_SRC_DIR=\"`cd $srcdir/..; pwd`\"" eval "TK_DLL_FILE=tk$VER${DLLSUFFIX}" eval "TK_LIB_FILE=${LIBPREFIX}tk$VER${LIBSUFFIX}" diff --git a/win/configure.in b/win/configure.in index c59fbe7..260f4ba 100644 --- a/win/configure.in +++ b/win/configure.in @@ -3,7 +3,7 @@ # generate the file "configure", which is run during Tk installation # to configure the system for the local environment. # -# RCS: @(#) $Id: configure.in,v 1.66.2.5 2007/11/21 16:46:30 dgp Exp $ +# RCS: @(#) $Id: configure.in,v 1.66.2.6 2007/12/10 18:39:32 dgp Exp $ AC_INIT(../generic/tk.h) AC_PREREQ(2.59) @@ -179,7 +179,7 @@ TK_SHARED_LIB_SUFFIX="\${NODOT_VERSION}${DLLSUFFIX}" TK_UNSHARED_LIB_SUFFIX="\${NODOT_VERSION}${LIBSUFFIX}" TK_EXPORT_FILE_SUFFIX="\${NODOT_VERSION}${LIBSUFFIX}" -eval "TK_SRC_DIR=`cd $srcdir/..; pwd`" +eval "TK_SRC_DIR=\"`cd $srcdir/..; pwd`\"" eval "TK_DLL_FILE=tk$VER${DLLSUFFIX}" eval "TK_LIB_FILE=${LIBPREFIX}tk$VER${LIBSUFFIX}" diff --git a/win/rules.vc b/win/rules.vc index abb9980..5e49386 100644 --- a/win/rules.vc +++ b/win/rules.vc @@ -11,7 +11,7 @@ # Copyright (c) 2003-2007 Patrick Thoyts # #------------------------------------------------------------------------------ -# RCS: @(#) $Id: rules.vc,v 1.15.2.3 2007/11/01 16:37:25 dgp Exp $ +# RCS: @(#) $Id: rules.vc,v 1.15.2.4 2007/12/10 18:39:32 dgp Exp $ #------------------------------------------------------------------------------ !ifndef _RULES_VC @@ -189,10 +189,10 @@ VCVER=0 !if ![echo VCVERSION=_MSC_VER > vercl.x] \ && ![cl -nologo -TC -P vercl.x $(ERRNULL)] !include vercl.i -!if $(VCVERSION) >= 1400 +!if $(VCVERSION) >= 1500 +VCVER=9 +!elseif $(VCVERSION) >= 1400 VCVER=8 -_VC_MANIFEST_EMBED_EXE=if exist $@.manifest mt -nologo -manifest $@.manifest -outputresource:$@;1 -_VC_MANIFEST_EMBED_DLL=if exist $@.manifest mt -nologo -manifest $@.manifest -outputresource:$@;2 !elseif $(VCVERSION) >= 1300 VCVER=7 !elseif $(VCVERSION) >= 1200 @@ -200,6 +200,12 @@ VCVER=6 !endif !endif +# Since MSVC8 we must deal with manifest resources. +!if $(VCVERSION) >= 1400 +_VC_MANIFEST_EMBED_EXE=if exist $@.manifest mt -nologo -manifest $@.manifest -outputresource:$@;1 +_VC_MANIFEST_EMBED_DLL=if exist $@.manifest mt -nologo -manifest $@.manifest -outputresource:$@;2 +!endif + #---------------------------------------------------------- # Decode the options requested. #---------------------------------------------------------- diff --git a/win/tkWin.h b/win/tkWin.h index 08d6d64..73f0a66 100644 --- a/win/tkWin.h +++ b/win/tkWin.h @@ -9,12 +9,27 @@ * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkWin.h,v 1.13 2005/01/16 00:23:11 chengyemao Exp $ + * RCS: @(#) $Id: tkWin.h,v 1.13.2.1 2007/12/10 18:39:32 dgp Exp $ */ #ifndef _TKWIN #define _TKWIN +/* + * We must specify the lower version we intend to support. In particular + * the SystemParametersInfo API doesn't like to receive structures that + * are larger than it expects which affects the font assignements. + * + * WINVER = 0x0410 means Windows 98 and above + */ + +#ifndef WINVER +#define WINVER 0x0410 +#endif +#ifndef _WIN32_WINDOWS +#define _WIN32_WINDOWS 0x0410 +#endif + #ifndef _TK #include <tk.h> #endif diff --git a/win/tkWinFont.c b/win/tkWinFont.c index 078e521..51d206b 100644 --- a/win/tkWinFont.c +++ b/win/tkWinFont.c @@ -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: tkWinFont.c,v 1.32.2.4 2007/11/21 16:46:31 dgp Exp $ + * RCS: @(#) $Id: tkWinFont.c,v 1.32.2.5 2007/12/10 18:39:32 dgp Exp $ */ #include "tkWinInt.h" @@ -336,7 +336,7 @@ CreateNamedSystemLogFont( Tcl_Interp *interp, Tk_Window tkwin, CONST char* name, - LOGFONT* logFontPtr) + LOGFONTA* logFontPtr) { HFONT hFont; int r; @@ -406,30 +406,39 @@ TkWinSetupSystemFonts(TkMainInfo *mainPtr) ((TkWindow *) tkwin)->mainPtr = mainPtr; } - ncMetrics.cbSize = sizeof(ncMetrics); - SystemParametersInfo(SPI_GETNONCLIENTMETRICS, sizeof(ncMetrics), - &ncMetrics, 0); + /* + * If this API call fails then we will fallback to setting these + * named fonts from script in ttk/fonts.tcl. So far I've only + * seen it fail when WINVER has been defined for a higher platform than + * we are running on. (ie: WINVER=0x0600 and running on XP). + */ - CreateNamedSystemLogFont(interp, tkwin, "TkDefaultFont", + ZeroMemory(&ncMetrics, sizeof(ncMetrics)); + ncMetrics.cbSize = sizeof(ncMetrics); + if (SystemParametersInfo(SPI_GETNONCLIENTMETRICS, + sizeof(ncMetrics), &ncMetrics, 0)) { + CreateNamedSystemLogFont(interp, tkwin, "TkDefaultFont", &ncMetrics.lfMessageFont); - CreateNamedSystemLogFont(interp, tkwin, "TkHeadingFont", + CreateNamedSystemLogFont(interp, tkwin, "TkHeadingFont", &ncMetrics.lfMessageFont); - CreateNamedSystemLogFont(interp, tkwin, "TkTextFont", + CreateNamedSystemLogFont(interp, tkwin, "TkTextFont", &ncMetrics.lfMessageFont); - CreateNamedSystemLogFont(interp, tkwin, "TkMenuFont", + CreateNamedSystemLogFont(interp, tkwin, "TkMenuFont", &ncMetrics.lfMenuFont); - CreateNamedSystemLogFont(interp, tkwin, "TkTooltipFont", + CreateNamedSystemLogFont(interp, tkwin, "TkTooltipFont", &ncMetrics.lfStatusFont); - CreateNamedSystemLogFont(interp, tkwin, "TkCaptionFont", + CreateNamedSystemLogFont(interp, tkwin, "TkCaptionFont", &ncMetrics.lfCaptionFont); - CreateNamedSystemLogFont(interp, tkwin, "TkSmallCaptionFont", + CreateNamedSystemLogFont(interp, tkwin, "TkSmallCaptionFont", &ncMetrics.lfSmCaptionFont); + } iconMetrics.cbSize = sizeof(iconMetrics); - SystemParametersInfo(SPI_GETICONMETRICS, sizeof(iconMetrics), - &iconMetrics, 0); - CreateNamedSystemLogFont(interp, tkwin, "TkIconFont", + if (SystemParametersInfo(SPI_GETICONMETRICS, sizeof(iconMetrics), + &iconMetrics, 0)) { + CreateNamedSystemLogFont(interp, tkwin, "TkIconFont", &iconMetrics.lfFont); + } hFont = (HFONT)GetStockObject(ANSI_FIXED_FONT); CreateNamedSystemFont(interp, tkwin, "TkFixedFont", hFont); diff --git a/win/tkWinWm.c b/win/tkWinWm.c index 1a158f7..aaf6b8a 100644 --- a/win/tkWinWm.c +++ b/win/tkWinWm.c @@ -12,7 +12,7 @@ * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. * - * RCS: @(#) $Id: tkWinWm.c,v 1.116.2.4 2007/12/05 20:26:47 dgp Exp $ + * RCS: @(#) $Id: tkWinWm.c,v 1.116.2.5 2007/12/10 18:39:32 dgp Exp $ */ #include "tkWinInt.h" @@ -563,6 +563,30 @@ static void WmUpdateGeom(WmInfo *wmPtr, TkWindow *winPtr); */ #define WIDTHBYTES(bits) ((((bits) + 31)>>5)<<2) + +/* + * Hacks to make this file build with older versions of the SDK. + */ + +#ifndef GetClassLongPtr +# define GetClassLongPtrA GetClassLongA +# define GetClassLongPtrW GetClassLongW +# define SetClassLongPtrA SetClassLongA +# define SetClassLongPtrW SetClassLongW +# ifdef UNICODE +# define GetClassLongPtr GetClassLongPtrW +# define SetClassLongPtr SetClassLongPtrW +# else +# define GetClassLongPtr GetClassLongPtrA +# define SetClassLongPtr SetClassLongPtrA +# endif /* !UNICODE */ +#endif /* !GetClassLongPtr */ +#ifndef GCLP_HICON +# define GCLP_HICON GCL_HICON +#endif /* !GCLP_HICON */ +#ifndef GCLP_HICONSM +# define GCLP_HICONSM (-34) +#endif /* !GCLP_HICONSM */ /* *---------------------------------------------------------------------- diff --git a/win/ttkWinMonitor.c b/win/ttkWinMonitor.c index a5580a2..d93907c 100644 --- a/win/ttkWinMonitor.c +++ b/win/ttkWinMonitor.c @@ -1,11 +1,10 @@ -/* $Id: ttkWinMonitor.c,v 1.10.2.4 2007/12/05 20:26:47 dgp Exp $ +/* $Id: ttkWinMonitor.c,v 1.10.2.5 2007/12/10 18:39:33 dgp Exp $ */ #ifdef _MSC_VER #define WIN32_LEAN_AND_MEAN #endif -#include <windows.h> #include <tkWinInt.h> #include "ttk/ttkTheme.h" diff --git a/win/ttkWinTheme.c b/win/ttkWinTheme.c index 3557fdc..5fec125 100644 --- a/win/ttkWinTheme.c +++ b/win/ttkWinTheme.c @@ -1,14 +1,12 @@ /* winTheme.c - Copyright (C) 2004 Pat Thoyts <patthoyts@users.sf.net> * - * $Id: ttkWinTheme.c,v 1.5.2.5 2007/12/04 17:05:21 dgp Exp $ + * $Id: ttkWinTheme.c,v 1.5.2.6 2007/12/10 18:39:33 dgp Exp $ */ #ifdef _MSC_VER #define WIN32_LEAN_AND_MEAN #endif -#include <windows.h> - #include <tkWinInt.h> #ifndef DFCS_HOT /* Windows 98/Me, Windows 200/XP only */ diff --git a/win/ttkWinXPTheme.c b/win/ttkWinXPTheme.c index 3d91fde..9683da0 100644 --- a/win/ttkWinXPTheme.c +++ b/win/ttkWinXPTheme.c @@ -1,5 +1,5 @@ /* - * $Id: ttkWinXPTheme.c,v 1.12.2.4 2007/12/04 17:05:21 dgp Exp $ + * $Id: ttkWinXPTheme.c,v 1.12.2.5 2007/12/10 18:39:33 dgp Exp $ * * Tk theme engine which uses the Windows XP "Visual Styles" API * Adapted from Georgios Petasis' XP theme patch. @@ -19,8 +19,7 @@ #ifndef HAVE_UXTHEME_H /* Stub for platforms that lack the XP theme API headers: */ -#include <windows.h> -#include <tcl.h> +#include <tkWinInt.h> int TtkXPTheme_Init(Tcl_Interp *interp, HWND hwnd) { return TCL_OK; } #else |