Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Comment: | More complete purge of things only present for supporting long-dead Mac 9 systems. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | core-8-4-branch |
Files: | files | file ages | folders |
SHA1: |
599ec1e501bf3a502d1b6b513a7c0f76 |
User & Date: | dgp 2012-11-15 19:31:20 |
2012-12-03
| ||
01:23 | [Bug 3588824]: bug in image index handling for weird image names check-in: 407486bb user: fvogel tags: core-8-4-branch | |
2012-12-02
| ||
22:27 | merge-mark check-in: 82edd3d8 user: jan.nijtmans tags: core-8-5-branch | |
2012-11-22
| ||
21:12 | [Bug 3588824]: bug in image index handling for weird image names check-in: 7bb1876e user: fvogel tags: bug-3588824 | |
2012-11-19
| ||
16:54 | merge 8.4 check-in: 0096c844 user: dgp tags: core-8-4-20-rc | |
2012-11-15
| ||
19:31 | More complete purge of things only present for supporting long-dead Mac 9 systems. check-in: 599ec1e5 user: dgp tags: core-8-4-branch | |
08:29 |
Remove all the long dead mac entries in tk*.decls files
re-generate all tk*Decls.h files. check-in: 4b7cb51b user: jan.nijtmans tags: core-8-4-branch | |
Changes to doc/chooseDirectory.n.
︙ | ︙ | |||
20 21 22 23 24 25 26 | possible as command line arguments: .TP \fB\-initialdir\fR \fIdirname\fR Specifies that the directories in \fIdirectory\fR should be displayed when the dialog pops up. If this parameter is not specified, then the directories in the current working directory are displayed. If the parameter specifies a relative path, the return value will convert the | | < < < | 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 | possible as command line arguments: .TP \fB\-initialdir\fR \fIdirname\fR Specifies that the directories in \fIdirectory\fR should be displayed when the dialog pops up. If this parameter is not specified, then the directories in the current working directory are displayed. If the parameter specifies a relative path, the return value will convert the relative path to an absolute path. .TP \fB\-parent\fR \fIwindow\fR Makes \fIwindow\fR the logical parent of the dialog. The dialog is displayed on top of its parent window. .TP \fB\-title\fR \fItitleString\fR Specifies a string to display as the title of the dialog box. If this |
︙ | ︙ |
Changes to doc/console.n.
︙ | ︙ | |||
18 19 20 21 22 23 24 | .PP The console window is a replacement for a real console to allow input and output on the standard I/O channels on platforms that do not have a real console. It is implemented as a separate interpreter with the Tk toolkit loaded, and control over this interpreter is given through the \fBconsole\fR command. The behaviour of the console window is defined mainly through the contents of the \fIconsole.tcl\fR file in | | | 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 | .PP The console window is a replacement for a real console to allow input and output on the standard I/O channels on platforms that do not have a real console. It is implemented as a separate interpreter with the Tk toolkit loaded, and control over this interpreter is given through the \fBconsole\fR command. The behaviour of the console window is defined mainly through the contents of the \fIconsole.tcl\fR file in the Tk library. .PP .TP \fBconsole eval \fIscript\fR Evaluate the \fIscript\fR argument as a Tcl script in the console interpreter. The normal interpreter is accessed through the \fBconsoleinterp\fR command in the console interpreter. .TP |
︙ | ︙ |
Changes to doc/getOpenFile.n.
︙ | ︙ | |||
35 36 37 38 39 40 41 | The following \fIoption\-value\fR pairs are possible as command line arguments to these two commands: .TP \fB\-defaultextension\fR \fIextension\fR Specifies a string that will be appended to the filename if the user enters a filename without an extension. The default value is the empty string, which means no extension will be appended to the filename in | | | 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 | The following \fIoption\-value\fR pairs are possible as command line arguments to these two commands: .TP \fB\-defaultextension\fR \fIextension\fR Specifies a string that will be appended to the filename if the user enters a filename without an extension. The default value is the empty string, which means no extension will be appended to the filename in any case. This option is ignored on Mac OS X, which does not require extensions to filenames, .VS 8.4 and the UNIX implementation guesses reasonable values for this from the \fB\-filetypes\fR option when this is not supplied. .VE 8.4 .TP \fB\-filetypes\fR \fIfilePatternList\fR |
︙ | ︙ | |||
57 58 59 60 61 62 63 | discussion on the contents of \fIfilePatternList\fR. .TP \fB\-initialdir\fR \fIdirectory\fR Specifies that the files in \fIdirectory\fR should be displayed when the dialog pops up. If this parameter is not specified, then the files in the current working directory are displayed. If the parameter specifies a relative path, the return value will convert the | | < < < | < < < | < | 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 | discussion on the contents of \fIfilePatternList\fR. .TP \fB\-initialdir\fR \fIdirectory\fR Specifies that the files in \fIdirectory\fR should be displayed when the dialog pops up. If this parameter is not specified, then the files in the current working directory are displayed. If the parameter specifies a relative path, the return value will convert the relative path to an absolute path. .TP \fB\-initialfile\fR \fIfilename\fR Specifies a filename to be displayed in the dialog when it pops up. .TP \fB\-multiple\fR \fIboolean\fR Allows the user to choose multiple files from the Open dialog. .TP \fB\-message\fR \fIstring\fR Specifies a message to include in the client area of the dialog. This is only available on the Mac OS X. .TP \fB\-parent\fR \fIwindow\fR Makes \fIwindow\fR the logical parent of the file dialog. The file dialog is displayed on top of its parent window. .TP \fB\-title\fR \fItitleString\fR Specifies a string to display as the title of the dialog box. If this |
︙ | ︙ |
Changes to generic/default.h.
︙ | ︙ | |||
16 17 18 19 20 21 22 | #if defined(__WIN32__) || defined(_WIN32) || \ defined(__MINGW32__) # include "tkWinDefault.h" #else # if defined(MAC_OSX_TK) # include "tkMacOSXDefault.h" | < < | 16 17 18 19 20 21 22 23 24 25 26 27 28 | #if defined(__WIN32__) || defined(_WIN32) || \ defined(__MINGW32__) # include "tkWinDefault.h" #else # if defined(MAC_OSX_TK) # include "tkMacOSXDefault.h" # else # include "tkUnixDefault.h" # endif #endif #endif /* _DEFAULT */ |
Changes to generic/tk.h.
︙ | ︙ | |||
56 57 58 59 60 61 62 | #define TK_RELEASE_SERIAL 19 #define TK_VERSION "8.4" #define TK_PATCH_LEVEL "8.4.19" /* * A special definition used to allow this header file to be included | | | < | < < < | 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 | #define TK_RELEASE_SERIAL 19 #define TK_VERSION "8.4" #define TK_PATCH_LEVEL "8.4.19" /* * A special definition used to allow this header file to be included * from windows resource files so that they can obtain version * information. RC_INVOKED is defined by default by the windows RC tool. * * Resource compilers don't like all the C stuff, like typedefs and * procedure declarations, that occur below, so block them out. */ #ifndef RC_INVOKED #ifndef _XLIB_H # if defined(MAC_OSX_TK) # include <X11/Xlib.h> # include <X11/X.h> # else # include <X11/Xlib.h> # endif #endif #ifdef __STDC__ |
︙ | ︙ |
Changes to generic/tkBind.c.
︙ | ︙ | |||
15 16 17 18 19 20 21 | #include "tkPort.h" #include "tkInt.h" #ifdef __WIN32__ #include "tkWinInt.h" #endif | | | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 | #include "tkPort.h" #include "tkInt.h" #ifdef __WIN32__ #include "tkWinInt.h" #endif #if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* UNIX */ #include "tkUnixInt.h" #endif /* * File structure: * |
︙ | ︙ |
Changes to generic/tkCmds.c.
︙ | ︙ | |||
13 14 15 16 17 18 19 | */ #include "tkPort.h" #include "tkInt.h" #if defined(WIN32) #include "tkWinInt.h" | < < | 13 14 15 16 17 18 19 20 21 22 23 24 25 26 | */ #include "tkPort.h" #include "tkInt.h" #if defined(WIN32) #include "tkWinInt.h" #elif defined(MAC_OSX_TK) #include "tkMacOSXInt.h" #else #include "tkUnixInt.h" #endif /* |
︙ | ︙ | |||
833 834 835 836 837 838 839 | if (objc != 2) { Tcl_WrongNumArgs(interp, 2, objv, NULL); return TCL_ERROR; } #if defined(WIN32) windowingsystem = "win32"; | < < | 831 832 833 834 835 836 837 838 839 840 841 842 843 844 | if (objc != 2) { Tcl_WrongNumArgs(interp, 2, objv, NULL); return TCL_ERROR; } #if defined(WIN32) windowingsystem = "win32"; #elif defined(MAC_OSX_TK) windowingsystem = "aqua"; #else windowingsystem = "x11"; #endif Tcl_SetStringObj(Tcl_GetObjResult(interp), windowingsystem, -1); break; |
︙ | ︙ |
Changes to generic/tkConsole.c.
︙ | ︙ | |||
346 347 348 349 350 351 352 | Tcl_Channel chan; ConsoleInfo *info; Tk_Window mainWindow; Tcl_Command token; int result = TCL_OK; int haveConsoleChannel = 1; | < < < < | 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 | Tcl_Channel chan; ConsoleInfo *info; Tk_Window mainWindow; Tcl_Command token; int result = TCL_OK; int haveConsoleChannel = 1; static CONST char *initCmd = "source $tk_library/console.tcl"; /* Init an interp with Tcl and Tk */ Tcl_Interp *consoleInterp = Tcl_CreateInterp(); if (Tcl_Init(consoleInterp) != TCL_OK) { goto error; } if (Tk_Init(consoleInterp) != TCL_OK) { |
︙ | ︙ |
Changes to generic/tkFileFilter.h.
︙ | ︙ | |||
9 10 11 12 13 14 15 | * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. */ #ifndef _TK_FILE_FILTER #define _TK_FILE_FILTER | < < < < | 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 | * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. */ #ifndef _TK_FILE_FILTER #define _TK_FILE_FILTER #define OSType long #ifdef BUILD_tk # undef TCL_STORAGE_CLASS # define TCL_STORAGE_CLASS DLLEXPORT #endif typedef struct GlobPattern { |
︙ | ︙ |
Changes to generic/tkGrab.c.
︙ | ︙ | |||
9 10 11 12 13 14 15 | * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. */ #include "tkPort.h" #include "tkInt.h" | | | 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 | * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. */ #include "tkPort.h" #include "tkInt.h" #if !(defined(__WIN32__) || defined(MAC_OSX_TK)) #include "tkUnixInt.h" #endif /* * The grab state machine has four states: ungrabbed, button pressed, * grabbed, and button pressed while grabbed. In addition, there are * three pieces of grab state information: the current grab window, |
︙ | ︙ |
Changes to generic/tkImgPhoto.c.
︙ | ︙ | |||
2766 2767 2768 2769 2770 2771 2772 | * XGetImage with a zero size, which it does not like. [Bug 979239] */ if (width < 1 || height < 1) { return; } | < < < < < < < < | | 2766 2767 2768 2769 2770 2771 2772 2773 2774 2775 2776 2777 2778 2779 2780 | * XGetImage with a zero size, which it does not like. [Bug 979239] */ if (width < 1 || height < 1) { return; } if ((instancePtr->masterPtr->flags & COMPLEX_ALPHA) && visInfo.depth >= 15 && (visInfo.class == DirectColor || visInfo.class == TrueColor)) { Tk_ErrorHandler handler; XImage *bgImg = NULL; /* * Create an error handler to suppress the case where the input was |
︙ | ︙ |
Changes to generic/tkIntXlibDecls.h.
︙ | ︙ | |||
15 16 17 18 19 20 21 | /* * WARNING: This file is automatically generated by the tools/genStubs.tcl * script. Any modifications to the function declarations below should be made * in the generic/tkInt.decls script. */ | < < < < | 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 | /* * WARNING: This file is automatically generated by the tools/genStubs.tcl * script. Any modifications to the function declarations below should be made * in the generic/tkInt.decls script. */ #include "X11/Xutil.h" #ifdef BUILD_tk #undef TCL_STORAGE_CLASS #define TCL_STORAGE_CLASS DLLEXPORT #endif typedef int (*XAfterFunction) ( /* WARNING, this type not in Xlib spec */ |
︙ | ︙ |
Changes to generic/tkMain.c.
︙ | ︙ | |||
92 93 94 95 96 97 98 | return 1; } else { return 0; } } #else | < < < < | 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 | return 1; } else { return 0; } } #else extern int isatty _ANSI_ARGS_((int fd)); extern char * strrchr _ANSI_ARGS_((CONST char *string, int c)); #endif /* * Forward declarations for procedures defined later in this file. */ |
︙ | ︙ | |||
189 190 191 192 193 194 195 | Tcl_Preserve((ClientData) interp); #if defined(__WIN32__) && !defined(STATIC_BUILD) if (!tclStubsPtr->reserved9) { /* Only initialize console when not running under cygwin */ Tk_InitConsoleChannels(interp); } | | | 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 | Tcl_Preserve((ClientData) interp); #if defined(__WIN32__) && !defined(STATIC_BUILD) if (!tclStubsPtr->reserved9) { /* Only initialize console when not running under cygwin */ Tk_InitConsoleChannels(interp); } #elif defined(__WIN32__) Tk_InitConsoleChannels(interp); #endif #ifdef MAC_OSX_TK if (TclGetStartupScriptFileName() == NULL) { TkMacOSXDefaultStartupScript(); } |
︙ | ︙ |
Changes to generic/tkMenu.c.
︙ | ︙ | |||
28 29 30 31 32 33 34 | * * In order to make the bindings for cascade menus work properly under Unix, * the cascade menus' pathnames must be proper children of the menu that * they are cascade from. So if there is a menu .m, and it has two * cascades labelled "File" and "Edit", the cascade menus might have * the pathnames .m.file and .m.edit. Another constraint is that the menus * used for menubars must be children of the toplevel widget that they | | < < | 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 | * * In order to make the bindings for cascade menus work properly under Unix, * the cascade menus' pathnames must be proper children of the menu that * they are cascade from. So if there is a menu .m, and it has two * cascades labelled "File" and "Edit", the cascade menus might have * the pathnames .m.file and .m.edit. Another constraint is that the menus * used for menubars must be children of the toplevel widget that they * are attached to. * * To handle all of the constraints, Tk menubars and tearoff menus are * implemented using menu clones. Menu clones are full menus in their own * right; they have a Tk window and pathname associated with them; they have * a TkMenu structure and array of entries. However, they are linked with the * original menu that they were cloned from. The reflect the attributes of * the original, or "master", menu. So if an item is added to a menu, and |
︙ | ︙ |
Changes to generic/tkPointer.c.
︙ | ︙ | |||
14 15 16 17 18 19 20 | #include "tkInt.h" #ifdef __WIN32__ #include "tkWinInt.h" #endif | < < < < < | 14 15 16 17 18 19 20 21 22 23 24 25 26 27 | #include "tkInt.h" #ifdef __WIN32__ #include "tkWinInt.h" #endif #if defined(MAC_OSX_TK) #include "tkMacOSXInt.h" #define Cursor XCursor #endif /* * Mask that selects any of the state bits corresponding to buttons, |
︙ | ︙ |
Changes to generic/tkPort.h.
︙ | ︙ | |||
20 21 22 23 24 25 26 | #ifndef _TCL #include "tcl.h" #endif #if defined(__WIN32__) || defined(_WIN32) # include "tkWinPort.h" #else | | < < | 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 | #ifndef _TCL #include "tcl.h" #endif #if defined(__WIN32__) || defined(_WIN32) # include "tkWinPort.h" #else # if defined(MAC_OSX_TK) # include "tkMacOSXPort.h" # else # include "tkUnixPort.h" # endif #endif #endif /* _TKPORT */ |
Changes to generic/tkSelect.c.
︙ | ︙ | |||
1194 1195 1196 1197 1198 1199 1200 | * Using UTF8_STRING instead of the XA_UTF8_STRING macro allows us * to support older X servers that didn't have UTF8_STRING yet. * This is necessary on Unix systems. * For more information, see: * http://www.cl.cam.ac.uk/~mgk25/unicode.html#x11 */ | | | 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 | * Using UTF8_STRING instead of the XA_UTF8_STRING macro allows us * to support older X servers that didn't have UTF8_STRING yet. * This is necessary on Unix systems. * For more information, see: * http://www.cl.cam.ac.uk/~mgk25/unicode.html#x11 */ #if !(defined(__WIN32__) || defined(MAC_OSX_TK)) dispPtr->utf8Atom = Tk_InternAtom(tkwin, "UTF8_STRING"); #else dispPtr->utf8Atom = (Atom) NULL; #endif } /* |
︙ | ︙ |
Changes to generic/tkStubInit.c.
︙ | ︙ | |||
8 9 10 11 12 13 14 | * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. */ #include "tkInt.h" #include "tkPort.h" | | < < < < < | 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 | * See the file "license.terms" for information on usage and redistribution of * this file, and for a DISCLAIMER OF ALL WARRANTIES. */ #include "tkInt.h" #include "tkPort.h" #if !(defined(__WIN32__) && defined(MAC_OSX_TK)) /* UNIX */ #define UNIX_TK #endif #ifdef __WIN32__ #include "tkWinInt.h" #endif #if defined(MAC_OSX_TK) /* set this locally .. we could have used _TKMACINT */ #include "tkMacOSXInt.h" #endif #include "tkDecls.h" |
︙ | ︙ | |||
237 238 239 240 241 242 243 | # define TkWinGetPlatformId 0 # define TkWinSetHINSTANCE 0 # define TkWinGetPlatformTheme 0 # define TkWinChildProc 0 # define TkBindDeadWindow 0 /* On purpose not in Cygwin's stub table */ | | | 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 | # define TkWinGetPlatformId 0 # define TkWinSetHINSTANCE 0 # define TkWinGetPlatformTheme 0 # define TkWinChildProc 0 # define TkBindDeadWindow 0 /* On purpose not in Cygwin's stub table */ # elif !defined(MAC_OSX_TK) /* UNIX */ # undef TkClipBox # undef TkCreateRegion # undef TkDestroyRegion # undef TkIntersectRegion # undef TkRectInRegion # undef TkSetRegion |
︙ | ︙ |
Changes to generic/tkStubLib.c.
︙ | ︙ | |||
32 33 34 35 36 37 38 | #include "tkPort.h" #include "tkInt.h" #ifdef __WIN32__ #include "tkWinInt.h" #endif | < < < < | 32 33 34 35 36 37 38 39 40 41 42 43 44 45 | #include "tkPort.h" #include "tkInt.h" #ifdef __WIN32__ #include "tkWinInt.h" #endif #ifdef MAC_OSX_TK #include "tkMacOSXInt.h" #endif #include "tkDecls.h" #include "tkIntDecls.h" #include "tkPlatDecls.h" |
︙ | ︙ |
Changes to generic/tkTest.c.
︙ | ︙ | |||
18 19 20 21 22 23 24 | #include "tkPort.h" #include "tkText.h" #ifdef __WIN32__ #include "tkWinInt.h" #endif | | | 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 | #include "tkPort.h" #include "tkText.h" #ifdef __WIN32__ #include "tkWinInt.h" #endif #if defined(MAC_OSX_TK) #include "tkScrollbar.h" #endif #ifdef __UNIX__ #include "tkUnixInt.h" #endif |
︙ | ︙ | |||
173 174 175 176 177 178 179 | static int TestdeleteappsCmd _ANSI_ARGS_((ClientData dummy, Tcl_Interp *interp, int argc, CONST char **argv)); static int TestfontObjCmd _ANSI_ARGS_((ClientData dummy, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])); static int TestmakeexistCmd _ANSI_ARGS_((ClientData dummy, Tcl_Interp *interp, int argc, CONST char **argv)); | | | | | | | 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 | static int TestdeleteappsCmd _ANSI_ARGS_((ClientData dummy, Tcl_Interp *interp, int argc, CONST char **argv)); static int TestfontObjCmd _ANSI_ARGS_((ClientData dummy, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])); static int TestmakeexistCmd _ANSI_ARGS_((ClientData dummy, Tcl_Interp *interp, int argc, CONST char **argv)); #if !(defined(__WIN32__) || defined(MAC_OSX_TK)) static int TestmenubarCmd _ANSI_ARGS_((ClientData dummy, Tcl_Interp *interp, int argc, CONST char **argv)); #endif #if defined(__WIN32__) || defined(MAC_OSX_TK) static int TestmetricsCmd _ANSI_ARGS_((ClientData dummy, Tcl_Interp *interp, int argc, CONST char **argv)); #endif static int TestobjconfigObjCmd _ANSI_ARGS_((ClientData dummy, Tcl_Interp *interp, int objc, Tcl_Obj * CONST objv[])); static int CustomOptionSet _ANSI_ARGS_((ClientData clientData, Tcl_Interp *interp, Tk_Window tkwin, Tcl_Obj **value, char *recordPtr, int internalOffset, char *saveInternalPtr, int flags)); static Tcl_Obj *CustomOptionGet _ANSI_ARGS_((ClientData clientData, Tk_Window tkwin, char *recordPtr, int internalOffset)); static void CustomOptionRestore _ANSI_ARGS_((ClientData clientData, Tk_Window tkwin, char *internalPtr, char *saveInternalPtr)); static void CustomOptionFree _ANSI_ARGS_((ClientData clientData, Tk_Window tkwin, char *internalPtr)); static int TestpropCmd _ANSI_ARGS_((ClientData dummy, Tcl_Interp *interp, int argc, CONST char **argv)); #if !(defined(__WIN32__) || defined(MAC_OSX_TK)) static int TestsendCmd _ANSI_ARGS_((ClientData dummy, Tcl_Interp *interp, int argc, CONST char **argv)); #endif static int TesttextCmd _ANSI_ARGS_((ClientData dummy, Tcl_Interp *interp, int argc, CONST char **argv)); #if !(defined(__WIN32__) || defined(MAC_OSX_TK)) static int TestwrapperCmd _ANSI_ARGS_((ClientData dummy, Tcl_Interp *interp, int argc, CONST char **argv)); #endif static void TrivialCmdDeletedProc _ANSI_ARGS_(( ClientData clientData)); static int TrivialConfigObjCmd _ANSI_ARGS_((ClientData dummy, Tcl_Interp *interp, int objc, Tcl_Obj * CONST objv[])); static void TrivialEventProc _ANSI_ARGS_((ClientData clientData, XEvent *eventPtr)); /* * External (platform specific) initialization routine: */ extern int TkplatformtestInit _ANSI_ARGS_((Tcl_Interp *interp)); #if !(defined(__WIN32__) || defined(MAC_OSX_TK)) #define TkplatformtestInit(x) TCL_OK #endif /* *---------------------------------------------------------------------- * * Tktest_Init -- |
︙ | ︙ | |||
279 280 281 282 283 284 285 | (ClientData) Tk_MainWindow(interp), (Tcl_CmdDeleteProc *) NULL); Tcl_CreateObjCommand(interp, "testobjconfig", TestobjconfigObjCmd, (ClientData) Tk_MainWindow(interp), (Tcl_CmdDeleteProc *) NULL); Tcl_CreateObjCommand(interp, "testfont", TestfontObjCmd, (ClientData) Tk_MainWindow(interp), (Tcl_CmdDeleteProc *) NULL); Tcl_CreateCommand(interp, "testmakeexist", TestmakeexistCmd, (ClientData) Tk_MainWindow(interp), (Tcl_CmdDeleteProc *) NULL); | | | | | | 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 | (ClientData) Tk_MainWindow(interp), (Tcl_CmdDeleteProc *) NULL); Tcl_CreateObjCommand(interp, "testobjconfig", TestobjconfigObjCmd, (ClientData) Tk_MainWindow(interp), (Tcl_CmdDeleteProc *) NULL); Tcl_CreateObjCommand(interp, "testfont", TestfontObjCmd, (ClientData) Tk_MainWindow(interp), (Tcl_CmdDeleteProc *) NULL); Tcl_CreateCommand(interp, "testmakeexist", TestmakeexistCmd, (ClientData) Tk_MainWindow(interp), (Tcl_CmdDeleteProc *) NULL); #if !(defined(__WIN32__) || defined(MAC_OSX_TK)) Tcl_CreateCommand(interp, "testmenubar", TestmenubarCmd, (ClientData) Tk_MainWindow(interp), (Tcl_CmdDeleteProc *) NULL); #endif #if defined(__WIN32__) || defined(MAC_OSX_TK) Tcl_CreateCommand(interp, "testmetrics", TestmetricsCmd, (ClientData) Tk_MainWindow(interp), (Tcl_CmdDeleteProc *) NULL); #endif Tcl_CreateCommand(interp, "testprop", TestpropCmd, (ClientData) Tk_MainWindow(interp), (Tcl_CmdDeleteProc *) NULL); #if !(defined(__WIN32__) || defined(MAC_OSX_TK)) Tcl_CreateCommand(interp, "testsend", TestsendCmd, (ClientData) Tk_MainWindow(interp), (Tcl_CmdDeleteProc *) NULL); #endif Tcl_CreateCommand(interp, "testtext", TesttextCmd, (ClientData) Tk_MainWindow(interp), (Tcl_CmdDeleteProc *) NULL); #if !(defined(__WIN32__) || defined(MAC_OSX_TK)) Tcl_CreateCommand(interp, "testwrapper", TestwrapperCmd, (ClientData) Tk_MainWindow(interp), (Tcl_CmdDeleteProc *) NULL); #endif /* * Create test image type. */ |
︙ | ︙ | |||
1957 1958 1959 1960 1961 1962 1963 | * Side effects: * Changes menubar related stuff. * *---------------------------------------------------------------------- */ /* ARGSUSED */ | | | 1957 1958 1959 1960 1961 1962 1963 1964 1965 1966 1967 1968 1969 1970 1971 | * Side effects: * Changes menubar related stuff. * *---------------------------------------------------------------------- */ /* ARGSUSED */ #if !(defined(__WIN32__) || defined(MAC_OSX_TK)) static int TestmenubarCmd(clientData, interp, argc, argv) ClientData clientData; /* Main window for application. */ Tcl_Interp *interp; /* Current interpreter. */ int argc; /* Number of arguments. */ CONST char **argv; /* Argument strings. */ { |
︙ | ︙ | |||
2026 2027 2028 2029 2030 2031 2032 | * * Side effects: * None. * *---------------------------------------------------------------------- */ | | | 2026 2027 2028 2029 2030 2031 2032 2033 2034 2035 2036 2037 2038 2039 2040 | * * Side effects: * None. * *---------------------------------------------------------------------- */ #if defined(__WIN32__) || defined(MAC_OSX_TK) static int TestmetricsCmd(clientData, interp, argc, argv) ClientData clientData; /* Main window for application. */ Tcl_Interp *interp; /* Current interpreter. */ int argc; /* Number of arguments. */ CONST char **argv; /* Argument strings. */ { |
︙ | ︙ | |||
2178 2179 2180 2181 2182 2183 2184 | * Side effects: * Depends on option; see below. * *---------------------------------------------------------------------- */ /* ARGSUSED */ | | | 2178 2179 2180 2181 2182 2183 2184 2185 2186 2187 2188 2189 2190 2191 2192 | * Side effects: * Depends on option; see below. * *---------------------------------------------------------------------- */ /* ARGSUSED */ #if !(defined(__WIN32__) || defined(MAC_OSX_TK)) static int TestsendCmd(clientData, interp, argc, argv) ClientData clientData; /* Main window for application. */ Tcl_Interp *interp; /* Current interpreter. */ int argc; /* Number of arguments. */ CONST char **argv; /* Argument strings. */ { |
︙ | ︙ | |||
2353 2354 2355 2356 2357 2358 2359 | TkTextPrintIndex(&index, buf); sprintf(buf + strlen(buf), " %d", index.byteIndex); Tcl_AppendResult(interp, buf, NULL); return TCL_OK; } | | | 2353 2354 2355 2356 2357 2358 2359 2360 2361 2362 2363 2364 2365 2366 2367 | TkTextPrintIndex(&index, buf); sprintf(buf + strlen(buf), " %d", index.byteIndex); Tcl_AppendResult(interp, buf, NULL); return TCL_OK; } #if !(defined(__WIN32__) || defined(MAC_OSX_TK)) /* *---------------------------------------------------------------------- * * TestwrapperCmd -- * * This procedure implements the "testwrapper" command. It * provides a way from Tcl to determine the extra window Tk adds |
︙ | ︙ |
Changes to generic/tkText.c.
︙ | ︙ | |||
16 17 18 19 20 21 22 | */ #include "default.h" #include "tkPort.h" #include "tkInt.h" #include "tkUndo.h" | | | 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 | */ #include "default.h" #include "tkPort.h" #include "tkInt.h" #include "tkUndo.h" #if defined(MAC_OSX_TK) #define Style TkStyle #define DInfo TkDInfo #endif #include "tkText.h" /* |
︙ | ︙ |
Changes to generic/tkWindow.c.
︙ | ︙ | |||
14 15 16 17 18 19 20 | */ #include "tkPort.h" #include "tkInt.h" #ifdef __WIN32__ #include "tkWinInt.h" | | | 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 | */ #include "tkPort.h" #include "tkInt.h" #ifdef __WIN32__ #include "tkWinInt.h" #elif !(defined(MAC_OSX_TK)) #include "tkUnixInt.h" #endif #include "tclInt.h" /* for Tcl_CreateNamespace() */ /* * Type used to keep track of Window objects that were |
︙ | ︙ | |||
132 133 134 135 136 137 138 | {"option", Tk_OptionObjCmd, PASSMAINWINDOW|ISSAFE}, {"pack", Tk_PackObjCmd, PASSMAINWINDOW|ISSAFE}, {"place", Tk_PlaceObjCmd, ISSAFE}, {"raise", Tk_RaiseObjCmd, PASSMAINWINDOW|ISSAFE}, {"selection", Tk_SelectionObjCmd, PASSMAINWINDOW}, {"tk", Tk_TkObjCmd, PASSMAINWINDOW|ISSAFE}, {"tkwait", Tk_TkwaitObjCmd, PASSMAINWINDOW|ISSAFE}, | | | 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 | {"option", Tk_OptionObjCmd, PASSMAINWINDOW|ISSAFE}, {"pack", Tk_PackObjCmd, PASSMAINWINDOW|ISSAFE}, {"place", Tk_PlaceObjCmd, ISSAFE}, {"raise", Tk_RaiseObjCmd, PASSMAINWINDOW|ISSAFE}, {"selection", Tk_SelectionObjCmd, PASSMAINWINDOW}, {"tk", Tk_TkObjCmd, PASSMAINWINDOW|ISSAFE}, {"tkwait", Tk_TkwaitObjCmd, PASSMAINWINDOW|ISSAFE}, #if defined(__WIN32__) || defined(MAC_OSX_TK) {"tk_chooseColor", Tk_ChooseColorObjCmd, PASSMAINWINDOW}, {"tk_chooseDirectory", Tk_ChooseDirectoryObjCmd, WINMACONLY|PASSMAINWINDOW}, {"tk_getOpenFile", Tk_GetOpenFileObjCmd, WINMACONLY|PASSMAINWINDOW}, {"tk_getSaveFile", Tk_GetSaveFileObjCmd, WINMACONLY|PASSMAINWINDOW}, #endif #if defined(__WIN32__) || defined(MAC_OSX_TK) {"tk_messageBox", Tk_MessageBoxObjCmd, PASSMAINWINDOW}, |
︙ | ︙ | |||
171 172 173 174 175 176 177 | {"text", (Tcl_ObjCmdProc *) Tk_TextCmd, NOOBJPROC|PASSMAINWINDOW|ISSAFE}, {"toplevel", Tk_ToplevelObjCmd, 0}, /* * Misc. */ | | | 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 | {"text", (Tcl_ObjCmdProc *) Tk_TextCmd, NOOBJPROC|PASSMAINWINDOW|ISSAFE}, {"toplevel", Tk_ToplevelObjCmd, 0}, /* * Misc. */ #if defined(MAC_OSX_TK) {"::tk::unsupported::MacWindowStyle", TkUnsupported1ObjCmd, PASSMAINWINDOW|ISSAFE}, #endif {NULL, NULL, 0} }; /* |
︙ | ︙ | |||
1457 1458 1459 1460 1461 1462 1463 | if (winPtr->flags & TK_WIN_MANAGED) { TkWmDeadWindow(winPtr); } else if (winPtr->flags & TK_WM_COLORMAP_WINDOW) { TkWmRemoveFromColormapWindows(winPtr); } if (winPtr->window != None) { | | | 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 | if (winPtr->flags & TK_WIN_MANAGED) { TkWmDeadWindow(winPtr); } else if (winPtr->flags & TK_WM_COLORMAP_WINDOW) { TkWmRemoveFromColormapWindows(winPtr); } if (winPtr->window != None) { #if defined(MAC_OSX_TK) || defined(__WIN32__) XDestroyWindow(winPtr->display, winPtr->window); #else if ((winPtr->flags & TK_TOP_HIERARCHY) || !(winPtr->flags & TK_DONT_DESTROY_WINDOW)) { /* * The parent has already been destroyed and this isn't * a top-level window, so this window will be destroyed |
︙ | ︙ | |||
1567 1568 1569 1570 1571 1572 1573 | ckfree((char *) winPtr->mainPtr); /* * If no other applications are using the display, close the * display now and relinquish its data structures. */ | | | 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 | ckfree((char *) winPtr->mainPtr); /* * If no other applications are using the display, close the * display now and relinquish its data structures. */ #if !defined(WIN32) && defined(NOT_YET) if (dispPtr->refCount <= 0) { /* * I have disabled this code because on Windows there are * still order dependencies in close-down. All displays * and resources will get closed down properly anyway at * exit, through the exit handler. -- jyl */ |
︙ | ︙ | |||
2109 2110 2111 2112 2113 2114 2115 | void Tk_DefineCursor(tkwin, cursor) Tk_Window tkwin; /* Window to manipulate. */ Tk_Cursor cursor; /* Cursor to use for window (may be None). */ { register TkWindow *winPtr = (TkWindow *) tkwin; | | | 2109 2110 2111 2112 2113 2114 2115 2116 2117 2118 2119 2120 2121 2122 2123 | void Tk_DefineCursor(tkwin, cursor) Tk_Window tkwin; /* Window to manipulate. */ Tk_Cursor cursor; /* Cursor to use for window (may be None). */ { register TkWindow *winPtr = (TkWindow *) tkwin; #if defined(MAC_OSX_TK) winPtr->atts.cursor = (XCursor) cursor; #else winPtr->atts.cursor = (Cursor) cursor; #endif if (winPtr->window != None) { XDefineCursor(winPtr->display, winPtr->window, winPtr->atts.cursor); |
︙ | ︙ |
Changes to library/bgerror.tcl.
︙ | ︙ | |||
90 91 92 93 94 95 96 | set ret [catch {::tkerror $err} msg]; if {$ret != 1} {return -code $ret $msg} # Ok the application's tkerror either failed or was not found # we use the default dialog then : set windowingsystem [tk windowingsystem] | < | | 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 | set ret [catch {::tkerror $err} msg]; if {$ret != 1} {return -code $ret $msg} # Ok the application's tkerror either failed or was not found # we use the default dialog then : set windowingsystem [tk windowingsystem] if {$windowingsystem eq "aqua"} { set ok [mc Ok] set messageFont system set textRelief flat set textHilight 0 } else { set ok [mc OK] set messageFont {Times -18} |
︙ | ︙ | |||
139 140 141 142 143 144 145 | destroy .bgerrorDialog toplevel .bgerrorDialog -class ErrorDialog wm withdraw .bgerrorDialog wm title .bgerrorDialog $title wm iconname .bgerrorDialog ErrorDialog wm protocol .bgerrorDialog WM_DELETE_WINDOW { } | < | | 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 | destroy .bgerrorDialog toplevel .bgerrorDialog -class ErrorDialog wm withdraw .bgerrorDialog wm title .bgerrorDialog $title wm iconname .bgerrorDialog ErrorDialog wm protocol .bgerrorDialog WM_DELETE_WINDOW { } if {$windowingsystem eq "aqua"} { ::tk::unsupported::MacWindowStyle style .bgerrorDialog moveableAlert {} } elseif {$windowingsystem eq "x11"} { wm attributes .bgerrorDialog -type dialog } frame .bgerrorDialog.bot frame .bgerrorDialog.top |
︙ | ︙ | |||
186 187 188 189 190 191 192 | # Max-width of message is the width of the screen... set wrapwidth [winfo screenwidth .bgerrorDialog] # ...minus the width of the icon, padding and a fudge factor for # the window manager decorations and aesthetics. set wrapwidth [expr {$wrapwidth-60-[winfo pixels .bgerrorDialog 9m]}] label .bgerrorDialog.msg -justify left -text $text -font $messageFont \ -wraplength $wrapwidth | < < < < < < < | 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 | # Max-width of message is the width of the screen... set wrapwidth [winfo screenwidth .bgerrorDialog] # ...minus the width of the icon, padding and a fudge factor for # the window manager decorations and aesthetics. set wrapwidth [expr {$wrapwidth-60-[winfo pixels .bgerrorDialog 9m]}] label .bgerrorDialog.msg -justify left -text $text -font $messageFont \ -wraplength $wrapwidth canvas .bgerrorDialog.bitmap -width 32 -height 32 -highlightthickness 0 .bgerrorDialog.bitmap create oval 0 0 31 31 -fill red -outline black .bgerrorDialog.bitmap create line 9 9 23 23 -fill white -width 4 .bgerrorDialog.bitmap create line 9 23 23 9 -fill white -width 4 grid .bgerrorDialog.bitmap .bgerrorDialog.msg \ -in .bgerrorDialog.top \ -row 0 \ -padx 3m \ -pady 3m grid configure .bgerrorDialog.msg -sticky nsw -padx {0 3m} grid rowconfigure .bgerrorDialog.top 1 -weight 1 |
︙ | ︙ | |||
222 223 224 225 226 227 228 | -in .bgerrorDialog.bot \ -column $i \ -row 0 \ -sticky ew \ -padx 10 grid columnconfigure .bgerrorDialog.bot $i -weight 1 # We boost the size of some Mac buttons for l&f | < | | 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 | -in .bgerrorDialog.bot \ -column $i \ -row 0 \ -sticky ew \ -padx 10 grid columnconfigure .bgerrorDialog.bot $i -weight 1 # We boost the size of some Mac buttons for l&f if {$windowingsystem eq "aqua"} { if {($name eq "ok") || ($name eq "dismiss")} { grid columnconfigure .bgerrorDialog.bot $i -minsize 90 } grid configure .bgerrorDialog.$name -pady 7 } incr i } |
︙ | ︙ |
Changes to library/button.tcl.
︙ | ︙ | |||
12 13 14 15 16 17 18 | # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # #------------------------------------------------------------------------- # The code below creates the default class bindings for buttons. #------------------------------------------------------------------------- | | | 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 | # of this file, and for a DISCLAIMER OF ALL WARRANTIES. # #------------------------------------------------------------------------- # The code below creates the default class bindings for buttons. #------------------------------------------------------------------------- if {[tk windowingsystem] eq "aqua"} { bind Radiobutton <Enter> { tk::ButtonEnter %W } bind Radiobutton <1> { tk::ButtonDown %W } bind Radiobutton <ButtonRelease-1> { |
︙ | ︙ | |||
438 439 440 441 442 443 444 | } } } } } | | | 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 | } } } } } if {[tk windowingsystem] eq "aqua"} { #################### # Mac implementation #################### # ::tk::ButtonEnter -- # The procedure below is invoked when the mouse pointer enters a |
︙ | ︙ |
Changes to library/console.tcl.
︙ | ︙ | |||
44 45 46 47 48 49 50 | proc ::tk::ConsoleInit {} { global tcl_platform if {![consoleinterp eval {set tcl_interactive}]} { wm withdraw . } | < | < | | 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 | proc ::tk::ConsoleInit {} { global tcl_platform if {![consoleinterp eval {set tcl_interactive}]} { wm withdraw . } if {[tk windowingsystem] eq "aqua"} { set mod "Cmd" } else { set mod "Ctrl" } if {[catch {menu .menubar} err]} { bgerror "INIT: $err" } .menubar add cascade -label File -menu .menubar.file -underline 0 .menubar add cascade -label Edit -menu .menubar.edit -underline 0 menu .menubar.file -tearoff 0 .menubar.file add command -label [mc "Source..."] \ -underline 0 -command tk::ConsoleSource .menubar.file add command -label [mc "Hide Console"] \ -underline 0 -command {wm withdraw .} .menubar.file add command -label [mc "Clear Console"] \ -underline 0 -command {.console delete 1.0 "promptEnd linestart"} if {[tk windowingsystem] eq "aqua"} { .menubar.file add command -label [mc "Quit"] \ -command exit -accel Cmd-Q } else { .menubar.file add command -label [mc "Exit"] \ -underline 1 -command exit } |
︙ | ︙ | |||
99 100 101 102 103 104 105 | . configure -menu .menubar set con [text .console -yscrollcommand [list .sb set] -setgrid true] scrollbar .sb -command [list $con yview] pack .sb -side right -fill both pack $con -fill both -expand 1 -side left switch -exact $tcl_platform(platform) { | < < < | 97 98 99 100 101 102 103 104 105 106 107 108 109 110 | . configure -menu .menubar set con [text .console -yscrollcommand [list .sb set] -setgrid true] scrollbar .sb -command [list $con yview] pack .sb -side right -fill both pack $con -fill both -expand 1 -side left switch -exact $tcl_platform(platform) { "windows" { $con configure -font systemfixed } "unix" { if {[tk windowingsystem] eq "aqua"} { $con configure -font {Monaco 10 normal} -highlightthickness 0 } |
︙ | ︙ | |||
463 464 465 466 467 468 469 | catch {tk::ConsoleInsert %W [::tk::GetSelection %W PRIMARY]} } bind Console <KeyPress> { tk::ConsoleInsert %W %A } bind Console <F9> { eval destroy [winfo child .] | < < < | | < | | 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 | catch {tk::ConsoleInsert %W [::tk::GetSelection %W PRIMARY]} } bind Console <KeyPress> { tk::ConsoleInsert %W %A } bind Console <F9> { eval destroy [winfo child .] source [file join $tk_library console.tcl] } if {[tk windowingsystem] eq "aqua"} { bind Console <Command-q> { exit } } bind Console <<Cut>> { # Same as the copy event if {![catch {set data [%W get sel.first sel.last]}]} { |
︙ | ︙ |
Changes to library/dialog.tcl.
︙ | ︙ | |||
41 42 43 44 45 46 47 | } elseif {"" eq $default} { set default -1 } else { set default [lsearch -exact $args $default] } set windowingsystem [tk windowingsystem] | | | 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 | } elseif {"" eq $default} { set default -1 } else { set default [lsearch -exact $args $default] } set windowingsystem [tk windowingsystem] if {$windowingsystem eq "aqua"} { option add *Dialog*background systemDialogBackgroundActive widgetDefault option add *Dialog*Button.highlightBackground \ systemDialogBackgroundActive widgetDefault } # 1. Create the top-level window and divide it into top # and bottom parts. |
︙ | ︙ | |||
67 68 69 70 71 72 73 | # window, this can hang the entire application. Therefore we only make # the dialog transient if the parent is viewable. # if {[winfo viewable [winfo toplevel [winfo parent $w]]] } { wm transient $w [winfo toplevel [winfo parent $w]] } | | | < | | | 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 | # window, this can hang the entire application. Therefore we only make # the dialog transient if the parent is viewable. # if {[winfo viewable [winfo toplevel [winfo parent $w]]] } { wm transient $w [winfo toplevel [winfo parent $w]] } if {$windowingsystem eq "aqua"} { ::tk::unsupported::MacWindowStyle style $w moveableModal {} } elseif {$windowingsystem eq "x11"} { wm attributes $w -type dialog } frame $w.bot frame $w.top if {$windowingsystem eq "x11"} { $w.bot configure -relief raised -bd 1 $w.top configure -relief raised -bd 1 } pack $w.bot -side bottom -fill both pack $w.top -side top -fill both -expand 1 # 2. Fill the top part with bitmap and message (use the option # database for -wraplength and -font so that they can be # overridden by the caller). option add *Dialog.msg.wrapLength 3i widgetDefault if {$windowingsystem eq "aqua"} { option add *Dialog.msg.font system widgetDefault } else { option add *Dialog.msg.font {Times 12} widgetDefault } label $w.msg -justify left -text $text pack $w.msg -in $w.top -side right -expand 1 -fill both -padx 3m -pady 3m if {$bitmap ne ""} { if {$windowingsystem eq "aqua" && $bitmap eq "error"} { set bitmap "stop" } label $w.bitmap -bitmap $bitmap pack $w.bitmap -in $w.top -side left -padx 3m -pady 3m } # 3. Create a row of buttons at the bottom of the dialog. set i 0 foreach but $args { button $w.button$i -text $but -command [list set ::tk::Priv(button) $i] if {$i == $default} { $w.button$i configure -default active } else { $w.button$i configure -default normal } grid $w.button$i -in $w.bot -column $i -row 0 -sticky ew \ -padx 10 -pady 4 grid columnconfigure $w.bot $i # We boost the size of some Mac buttons for l&f if {$windowingsystem eq "aqua"} { set tmp [string tolower $but] if {$tmp eq "ok" || $tmp eq "cancel"} { grid columnconfigure $w.bot $i -minsize 90 } grid configure $w.button$i -pady 7 } incr i |
︙ | ︙ |
Changes to library/entry.tcl.
︙ | ︙ | |||
199 200 201 202 203 204 205 | bind Entry <Alt-KeyPress> {# nothing} bind Entry <Meta-KeyPress> {# nothing} bind Entry <Control-KeyPress> {# nothing} bind Entry <Escape> {# nothing} bind Entry <Return> {# nothing} bind Entry <KP_Enter> {# nothing} bind Entry <Tab> {# nothing} | | | 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 | bind Entry <Alt-KeyPress> {# nothing} bind Entry <Meta-KeyPress> {# nothing} bind Entry <Control-KeyPress> {# nothing} bind Entry <Escape> {# nothing} bind Entry <Return> {# nothing} bind Entry <KP_Enter> {# nothing} bind Entry <Tab> {# nothing} if {[tk windowingsystem] eq "aqua"} { bind Entry <Command-KeyPress> {# nothing} } # On Windows, paste is done using Shift-Insert. Shift-Insert already # generates the <<Paste>> event, so we don't need to do anything here. if {[tk windowingsystem] ne "win32"} { bind Entry <Insert> { |
︙ | ︙ |
Changes to library/listbox.tcl.
︙ | ︙ | |||
172 173 174 175 176 177 178 | bind Listbox <B2-Motion> { %W scan dragto %x %y } # The MouseWheel will typically only fire on Windows and Mac OS X. # However, someone could use the "event generate" command to produce # one on other platforms. | | | 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 | bind Listbox <B2-Motion> { %W scan dragto %x %y } # The MouseWheel will typically only fire on Windows and Mac OS X. # However, someone could use the "event generate" command to produce # one on other platforms. if {[tk windowingsystem] eq "aqua"} { bind Listbox <MouseWheel> { %W yview scroll [expr {- (%D)}] units } bind Listbox <Option-MouseWheel> { %W yview scroll [expr {-10 * (%D)}] units } bind Listbox <Shift-MouseWheel> { |
︙ | ︙ |
Changes to library/msgbox.tcl.
︙ | ︙ | |||
152 153 154 155 156 157 158 | tclParseConfigSpec $w $specs "" $args if {[lsearch -exact {info warning error question} $data(-icon)] == -1} { error "bad -icon value \"$data(-icon)\": must be error, info, question, or warning" } set windowingsystem [tk windowingsystem] | | | 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 | tclParseConfigSpec $w $specs "" $args if {[lsearch -exact {info warning error question} $data(-icon)] == -1} { error "bad -icon value \"$data(-icon)\": must be error, info, question, or warning" } set windowingsystem [tk windowingsystem] if {$windowingsystem eq "aqua"} { switch -- $data(-icon) { "error" {set data(-icon) "stop"} "warning" {set data(-icon) "caution"} "info" {set data(-icon) "note"} } option add *Dialog*background systemDialogBackgroundActive widgetDefault option add *Dialog*Button.highlightBackground \ |
︙ | ︙ | |||
259 260 261 262 263 264 265 | # "grab"bed windows. So only make the message box transient if the parent # is viewable. # if {[winfo viewable [winfo toplevel $data(-parent)]] } { wm transient $w $data(-parent) } | | | | | | 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 | # "grab"bed windows. So only make the message box transient if the parent # is viewable. # if {[winfo viewable [winfo toplevel $data(-parent)]] } { wm transient $w $data(-parent) } if {$windowingsystem eq "aqua"} { ::tk::unsupported::MacWindowStyle style $w moveableModal {} } elseif {$windowingsystem eq "x11"} { wm attributes $w -type dialog } frame $w.bot -background $bg pack $w.bot -side bottom -fill both frame $w.top -background $bg pack $w.top -side top -fill both -expand 1 if {$windowingsystem ne "aqua"} { $w.bot configure -relief raised -bd 1 $w.top configure -relief raised -bd 1 } # 4. Fill the top part with bitmap and message (use the option # database for -wraplength and -font so that they can be # overridden by the caller). option add *Dialog.msg.wrapLength 3i widgetDefault if {$windowingsystem eq "aqua"} { option add *Dialog.msg.font system widgetDefault } else { option add *Dialog.msg.font {Times 14} widgetDefault } label $w.msg -anchor nw -justify left -text $data(-message) \ -background $bg if {$data(-icon) ne ""} { if {($windowingsystem eq "aqua") || ([winfo depth $w] < 4) || $tk_strictMotif} { label $w.bitmap -bitmap $data(-icon) -background $bg } else { canvas $w.bitmap -width 32 -height 32 -highlightthickness 0 \ -background $bg switch $data(-icon) { error { |
︙ | ︙ | |||
354 355 356 357 358 359 360 | $w.$name configure -default active } else { $w.$name configure -default normal } grid $w.$name -in $w.bot -row 0 -column $i -padx 3m -pady 2m -sticky ew grid columnconfigure $w.bot $i -uniform buttons # We boost the size of some Mac buttons for l&f | | | 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 | $w.$name configure -default active } else { $w.$name configure -default normal } grid $w.$name -in $w.bot -row 0 -column $i -padx 3m -pady 2m -sticky ew grid columnconfigure $w.bot $i -uniform buttons # We boost the size of some Mac buttons for l&f if {$windowingsystem eq "aqua"} { set tmp [string tolower $name] if {$tmp eq "ok" || $tmp eq "cancel" || $tmp eq "yes" || $tmp eq "no" || $tmp eq "abort" || $tmp eq "retry" || $tmp eq "ignore"} { grid columnconfigure $w.bot $i -minsize 90 } grid configure $w.$name -pady 7 |
︙ | ︙ |
Changes to library/scrlbar.tcl.
︙ | ︙ | |||
124 125 126 127 128 129 130 | bind Scrollbar <Home> { tk::ScrollToPos %W 0 } bind Scrollbar <End> { tk::ScrollToPos %W 1 } } | | | 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 | bind Scrollbar <Home> { tk::ScrollToPos %W 0 } bind Scrollbar <End> { tk::ScrollToPos %W 1 } } if {[tk windowingsystem] eq "aqua"} { bind Scrollbar <MouseWheel> { tk::ScrollByUnits %W v [expr {- (%D)}] } bind Scrollbar <Option-MouseWheel> { tk::ScrollByUnits %W v [expr {-10 * (%D)}] } bind Scrollbar <Shift-MouseWheel> { |
︙ | ︙ |
Changes to library/spinbox.tcl.
︙ | ︙ | |||
207 208 209 210 211 212 213 | bind Spinbox <Meta-KeyPress> {# nothing} bind Spinbox <Control-KeyPress> {# nothing} bind Spinbox <Escape> {# nothing} bind Spinbox <Return> {# nothing} bind Spinbox <KP_Enter> {# nothing} bind Spinbox <Tab> {# nothing} | | | 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 | bind Spinbox <Meta-KeyPress> {# nothing} bind Spinbox <Control-KeyPress> {# nothing} bind Spinbox <Escape> {# nothing} bind Spinbox <Return> {# nothing} bind Spinbox <KP_Enter> {# nothing} bind Spinbox <Tab> {# nothing} if {[tk windowingsystem] eq "aqua"} { bind Spinbox <Command-KeyPress> {# nothing} } # On Windows, paste is done using Shift-Insert. Shift-Insert already # generates the <<Paste>> event, so we don't need to do anything here. if {[tk windowingsystem] ne "win32"} { bind Spinbox <Insert> { |
︙ | ︙ |
Changes to library/text.tcl.
︙ | ︙ | |||
271 272 273 274 275 276 277 | bind Text <Alt-KeyPress> {# nothing } bind Text <Meta-KeyPress> {# nothing} bind Text <Control-KeyPress> {# nothing} bind Text <Escape> {# nothing} bind Text <KP_Enter> {# nothing} | | | 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 | bind Text <Alt-KeyPress> {# nothing } bind Text <Meta-KeyPress> {# nothing} bind Text <Control-KeyPress> {# nothing} bind Text <Escape> {# nothing} bind Text <KP_Enter> {# nothing} if {[tk windowingsystem] eq "aqua"} { bind Text <Command-KeyPress> {# nothing} } # Additional emacs-like bindings: bind Text <Control-a> { if {!$tk_strictMotif} { |
︙ | ︙ | |||
387 388 389 390 391 392 393 | if {!$tk_strictMotif} { %W delete [tk::TextPrevPos %W insert tcl_startOfPreviousWord] insert } } # Macintosh only bindings: | | | 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 | if {!$tk_strictMotif} { %W delete [tk::TextPrevPos %W insert tcl_startOfPreviousWord] insert } } # Macintosh only bindings: if {[tk windowingsystem] eq "aqua"} { bind Text <FocusIn> { %W configure -selectbackground systemHighlight -selectforeground systemHighlightText } bind Text <FocusOut> { %W configure -selectbackground systemHighlightSecondary -selectforeground systemHighlightText } bind Text <Option-Left> { |
︙ | ︙ | |||
448 449 450 451 452 453 454 | } set ::tk::Priv(prevPos) {} # The MouseWheel will typically only fire on Windows and MacOS X. # However, someone could use the "event generate" command to produce # one on other platforms. | | | 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 | } set ::tk::Priv(prevPos) {} # The MouseWheel will typically only fire on Windows and MacOS X. # However, someone could use the "event generate" command to produce # one on other platforms. if {[tk windowingsystem] eq "aqua"} { bind Text <MouseWheel> { %W yview scroll [expr {- (%D)}] units } bind Text <Option-MouseWheel> { %W yview scroll [expr {-10 * (%D)}] units } bind Text <Shift-MouseWheel> { |
︙ | ︙ |
Changes to library/tk.tcl.
︙ | ︙ | |||
113 114 115 116 117 118 119 | set x [expr {[winfo vrootx $w]+[winfo vrootwidth $w]-[winfo reqwidth $w]}] } if {$y < [winfo vrooty $w]} { set y [winfo vrooty $w] } elseif {$y > ([winfo vrooty $w]+[winfo vrootheight $w]-[winfo reqheight $w])} { set y [expr {[winfo vrooty $w]+[winfo vrootheight $w]-[winfo reqheight $w]}] } | | | 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 | set x [expr {[winfo vrootx $w]+[winfo vrootwidth $w]-[winfo reqwidth $w]}] } if {$y < [winfo vrooty $w]} { set y [winfo vrooty $w] } elseif {$y > ([winfo vrooty $w]+[winfo vrootheight $w]-[winfo reqheight $w])} { set y [expr {[winfo vrooty $w]+[winfo vrootheight $w]-[winfo reqheight $w]}] } if {$windowingsystem eq "aqua"} { # Avoid the native menu bar which sits on top of everything. if {$y < 22} { set y 22 } } } wm maxsize $w [winfo vrootwidth $w] [winfo vrootheight $w] wm geometry $w +$x+$y wm deiconify $w |
︙ | ︙ | |||
386 387 388 389 390 391 392 | event add <<Copy>> <Command-Key-c> <Key-F3> event add <<Paste>> <Command-Key-v> <Key-F4> event add <<PasteSelection>> <ButtonRelease-2> event add <<Clear>> <Clear> event add <<Undo>> <Command-Key-z> event add <<Redo>> <Command-Key-y> } | < < < < < < < < < < < < < < < < < < < < | 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 | event add <<Copy>> <Command-Key-c> <Key-F3> event add <<Paste>> <Command-Key-v> <Key-F4> event add <<PasteSelection>> <ButtonRelease-2> event add <<Clear>> <Clear> event add <<Undo>> <Command-Key-z> event add <<Redo>> <Command-Key-y> } } # ---------------------------------------------------------------------- # Read in files that define all of the class bindings. # ---------------------------------------------------------------------- if {$::tk_library ne ""} { proc ::tk::SourceLibFile {file} { namespace eval :: [list source [file join $::tk_library $file.tcl]] } namespace eval ::tk { SourceLibFile button SourceLibFile entry SourceLibFile listbox SourceLibFile menu SourceLibFile panedwindow SourceLibFile scale |
︙ | ︙ |
Changes to tests/clrpick.test.
︙ | ︙ | |||
168 169 170 171 172 173 174 | tk_chooseColor -title "Press Ok $verylongstring" -initialcolor $color \ -parent $parent } "$color" set color #808040 test clrpick-2.2 {tk_chooseColor command} \ {nonUnixUserInteraction colorsLeftover} { | < < < | < | 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 | tk_chooseColor -title "Press Ok $verylongstring" -initialcolor $color \ -parent $parent } "$color" set color #808040 test clrpick-2.2 {tk_chooseColor command} \ {nonUnixUserInteraction colorsLeftover} { set colors "128 128 64" ToChooseColorByKey $parent 128 128 64 tk_chooseColor -parent $parent -title "choose $colors" } "$color" test clrpick-2.3 {tk_chooseColor command} \ {nonUnixUserInteraction colorsLeftover} { ToPressButton $parent ok |
︙ | ︙ |
Changes to tests/font.test.
︙ | ︙ | |||
48 49 50 51 52 53 54 | } setup case $tcl_platform(platform) { unix {set fixed "fixed"} windows {set fixed "courier 12"} | < | 48 49 50 51 52 53 54 55 56 57 58 59 60 61 | } setup case $tcl_platform(platform) { unix {set fixed "fixed"} windows {set fixed "courier 12"} } set times [font actual {times 0} -family] test font-1.1 {TkFontPkgInit} { catch {interp delete foo} interp create foo foo eval { |
︙ | ︙ |
Deleted tests/macMenu.test.
|
| < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < |
Deleted tests/macscrollbar.test.
|
| < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < |
Changes to tests/safe.test.
︙ | ︙ | |||
31 32 33 34 35 36 37 | ## it indicates that something went wrong sourcing tk.tcl. ## Ensure that any changes that occured to tk.tcl will work or ## are properly prevented in a safe interpreter. -- hobbs # The set of hidden commands is platform dependent: | | < < | 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 | ## it indicates that something went wrong sourcing tk.tcl. ## Ensure that any changes that occured to tk.tcl will work or ## are properly prevented in a safe interpreter. -- hobbs # The set of hidden commands is platform dependent: if {"$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} } 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 saveAutoPath $::auto_path set ::auto_path [list [info library] $::tk_library] |
︙ | ︙ |
Changes to tests/text.test.
︙ | ︙ | |||
126 127 128 129 130 131 132 | list [catch {text .t2 -gorp nofun} msg] $msg [winfo exists .t2] } {1 {unknown option "-gorp"} 0} test text-2.4 {Tk_TextCmd procedure} { catch {destroy .t2} list [catch {text .t2 -bd 2 -fg red} msg] $msg \ [lindex [.t2 config -bd] 4] [lindex [.t2 config -fg] 4] } {0 .t2 2 red} | | < < | 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 | list [catch {text .t2 -gorp nofun} msg] $msg [winfo exists .t2] } {1 {unknown option "-gorp"} 0} test text-2.4 {Tk_TextCmd procedure} { catch {destroy .t2} list [catch {text .t2 -bd 2 -fg red} msg] $msg \ [lindex [.t2 config -bd] 4] [lindex [.t2 config -fg] 4] } {0 .t2 2 red} if {$tcl_platform(platform) == "windows"} { set relief flat } else { set relief raised } test text-2.5 {Tk_TextCmd procedure} { catch {destroy .t2} text .t2 |
︙ | ︙ |
Changes to tests/unixMenu.test.
1 | # This file is a Tcl script to test menus in Tk. It is | | < < | 1 2 3 4 5 6 7 8 9 | # This file is a Tcl script to test menus in Tk. It is # organized in the standard fashion for Tcl tests. # # Copyright (c) 1995-1996 Sun Microsystems, Inc. # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. package require tcltest 2.1 namespace import -force tcltest::configure |
︙ | ︙ |
Changes to tests/winMenu.test.
1 | # This file is a Tcl script to test menus in Tk. It is | | < < | 1 2 3 4 5 6 7 8 9 | # This file is a Tcl script to test menus in Tk. It is # organized in the standard fashion for Tcl tests. # # Copyright (c) 1995-1996 Sun Microsystems, Inc. # Copyright (c) 1998-1999 by Scriptics Corporation. # All rights reserved. package require tcltest 2.1 namespace import -force tcltest::configure |
︙ | ︙ |
Changes to unix/Makefile.in.
︙ | ︙ | |||
1494 1495 1496 1497 1498 1499 1500 | BUILD_HTML = \ @if test -f "$(BUILD_TCLSH)"; then \ $(SHELL_ENV) TCLSH="$(BUILD_TCLSH)"; else \ TCLSH="$(TCL_EXE)"; fi ;\ "$${TCLSH}" $(TOOL_DIR)/tcltk-man2html.tcl --htmldir="$(HTML_INSTALL_DIR)" \ --srcdir=$(TOP_DIR)/.. $(BUILD_HTML_FLAGS) | < < < < < < < < < < < < < < < | 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 | BUILD_HTML = \ @if test -f "$(BUILD_TCLSH)"; then \ $(SHELL_ENV) TCLSH="$(BUILD_TCLSH)"; else \ TCLSH="$(TCL_EXE)"; fi ;\ "$${TCLSH}" $(TOOL_DIR)/tcltk-man2html.tcl --htmldir="$(HTML_INSTALL_DIR)" \ --srcdir=$(TOP_DIR)/.. $(BUILD_HTML_FLAGS) # # Targets to build Solaris package of the distribution for the current # architecture. To build stream packages for both sun4 and i86pc # architectures: # # On the sun4 machine, execute the following: # make distclean; ./configure |
︙ | ︙ |
Changes to unix/README.
︙ | ︙ | |||
14 15 16 17 18 19 20 | The rest of this file contains instructions on how to do this. The release should compile and run either "out of the box" or with trivial changes on any UNIX-like system that approximates POSIX, BSD, or System V. We know that it runs on workstations from Sun, H-P, DEC, IBM, and 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 | | < | 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 | The rest of this file contains instructions on how to do this. The release should compile and run either "out of the box" or with trivial changes on any UNIX-like system that approximates POSIX, BSD, or System V. We know that it runs on workstations from Sun, H-P, DEC, IBM, and 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 Mac OS X, see the README file in the directory ../macosx. How To Compile And Install Tk: ------------------------------ (a) Make sure that the Tcl release is present in the directory ../../tcl<version> (or else use the "--with-tcl" switch described below). This release of Tk will only work with the equivalently |
︙ | ︙ |
Changes to unix/tkUnix3d.c.
︙ | ︙ | |||
8 9 10 11 12 13 14 | * * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. */ #include <tk3d.h> | | | 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 | * * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. */ #include <tk3d.h> #if !(defined(__WIN32__) || defined(MAC_OSX_TK)) #include "tkUnixInt.h" #endif /* * This structure is used to keep track of the extra colors used * by Unix 3d borders. */ |
︙ | ︙ |
Changes to unix/tkUnixDraw.c.
︙ | ︙ | |||
8 9 10 11 12 13 14 | * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. */ #include "tkPort.h" #include "tkInt.h" | | | 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 | * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. */ #include "tkPort.h" #include "tkInt.h" #if !defined(__WIN32__) #include "tkUnixInt.h" #endif /* * The following structure is used to pass information to * ScrollRestrictProc from TkScrollWindow. */ |
︙ | ︙ |
Changes to xlib/X11/X.h.
︙ | ︙ | |||
29 30 31 32 33 34 35 | ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ #define X_PROTOCOL 11 /* current protocol version */ #define X_PROTOCOL_REVISION 0 /* current minor version */ | | | 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 | ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ******************************************************************/ #define X_PROTOCOL 11 /* current protocol version */ #define X_PROTOCOL_REVISION 0 /* current minor version */ #if defined(MAC_OSX_TK) # define Cursor XCursor # define Region XRegion #endif /* Resources */ #ifdef _WIN64 |
︙ | ︙ | |||
665 666 667 668 669 670 671 | /* Byte order used in imageByteOrder and bitmapBitOrder */ #define LSBFirst 0 #define MSBFirst 1 | | | 665 666 667 668 669 670 671 672 673 674 675 676 677 | /* Byte order used in imageByteOrder and bitmapBitOrder */ #define LSBFirst 0 #define MSBFirst 1 #if defined(MAC_OSX_TK) # undef Cursor # undef Region #endif #endif /* X_H */ |
Changes to xlib/X11/Xlib.h.
︙ | ︙ | |||
23 24 25 26 27 28 29 | * Structures and symbols starting with "_" are private to the library. */ #ifndef _XLIB_H_ #define _XLIB_H_ #define XlibSpecificationRelease 5 | | < < < < < < < < < | | 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 | * Structures and symbols starting with "_" are private to the library. */ #ifndef _XLIB_H_ #define _XLIB_H_ #define XlibSpecificationRelease 5 #if !defined(MAC_OSX_TK) # include <X11/X.h> #endif #ifdef MAC_OSX_TK # include <X11/X.h> # define Cursor XCursor # define Region XRegion #endif /* applications should not depend on these two headers being included! */ #include <X11/Xfuncproto.h> #ifndef X_WCHAR #ifdef X_NOT_STDC_ENV #define X_WCHAR #endif #endif #ifndef X_WCHAR #include <stddef.h> #else /* replace this with #include or typedef appropriate for your system */ typedef unsigned long wchar_t; #endif typedef char *XPointer; #define Bool int #if defined(MAC_OSX_TK) /* Use define rather than typedef, since may need to undefine this later */ #define Status int #else typedef int Status; #endif #define True 1 #define False 0 |
︙ | ︙ | |||
1202 1203 1204 1205 1206 1207 1208 | #include "tkIntXlibDecls.h" _XFUNCPROTOEND | | | 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 | #include "tkIntXlibDecls.h" _XFUNCPROTOEND #if defined(MAC_OSX_TK) # undef Cursor # undef Region #endif #endif /* _XLIB_H_ */ |
Changes to xlib/X11/Xutil.h.
︙ | ︙ | |||
25 26 27 28 29 30 31 | ******************************************************************/ #ifndef _XUTIL_H_ #define _XUTIL_H_ /* You must include <X11/Xlib.h> before including this file */ | | | 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 | ******************************************************************/ #ifndef _XUTIL_H_ #define _XUTIL_H_ /* You must include <X11/Xlib.h> before including this file */ #if defined(MAC_OSX_TK) # define Region XRegion #endif /* * Bitmask returned by XParseGeometry(). Each bit tells if the corresponding * value (x, y, width, height) was found in the parsed string. */ |
︙ | ︙ | |||
844 845 846 847 848 849 850 | Region /* srb */, Region /* dr_return */ #endif ); _XFUNCPROTOEND | | | 844 845 846 847 848 849 850 851 852 853 854 855 | Region /* srb */, Region /* dr_return */ #endif ); _XFUNCPROTOEND #if defined(MAC_OSX_TK) # undef Region #endif #endif /* _XUTIL_H_ */ |
Changes to xlib/X11/keysym.h.
︙ | ︙ | |||
28 29 30 31 32 33 34 | #define XK_MISCELLANY #define XK_LATIN1 #define XK_LATIN2 #define XK_LATIN3 #define XK_LATIN4 #define XK_GREEK | < < < < | 28 29 30 31 32 33 34 35 | #define XK_MISCELLANY #define XK_LATIN1 #define XK_LATIN2 #define XK_LATIN3 #define XK_LATIN4 #define XK_GREEK #include <X11/keysymdef.h> |
Changes to xlib/xgc.c.
︙ | ︙ | |||
9 10 11 12 13 14 15 | * * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. */ #include <tkInt.h> | | < < < < < < | 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 | * * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. */ #include <tkInt.h> #if !defined(MAC_OSX_TK) # include <X11/Xlib.h> #endif #ifdef MAC_OSX_TK # include <tkMacOSXInt.h> # include <X11/Xlib.h> # include <X11/X.h> # define Cursor XCursor # define Region XRegion #endif |
︙ | ︙ | |||
509 510 511 512 513 514 515 | int i; for (i=0; i<npoints; i++) { XDrawPoint(display, d, gc, points[i].x, points[i].y); } } | | | 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 | int i; for (i=0; i<npoints; i++) { XDrawPoint(display, d, gc, points[i].x, points[i].y); } } #if !defined(MAC_OSX_TK) void XDrawSegments(display, d, gc, segments, nsegments) Display* display; Drawable d; GC gc; XSegment* segments; int nsegments; |
︙ | ︙ |
Changes to xlib/xutil.c.
︙ | ︙ | |||
8 9 10 11 12 13 14 | * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. */ #include <stdlib.h> #include <tk.h> | < < < < | | < | 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 | * See the file "license.terms" for information on usage and redistribution * of this file, and for a DISCLAIMER OF ALL WARRANTIES. */ #include <stdlib.h> #include <tk.h> #include <X11/Xutil.h> #include <X11/Xatom.h> /* *---------------------------------------------------------------------- * * XInternAtom -- * * This procedure simulates the XInternAtom function by calling |
︙ | ︙ |