summaryrefslogtreecommitdiffstats
path: root/mac
diff options
context:
space:
mode:
authordgp <dgp@users.sourceforge.net>2002-08-05 04:30:37 (GMT)
committerdgp <dgp@users.sourceforge.net>2002-08-05 04:30:37 (GMT)
commitb5333ac3910c2299be88875fe833d76136a92fc0 (patch)
tree7d072949961c0e2749f8fc33c73bf1d093c3d635 /mac
parent54f11088e5bee7a0f06235e8b67cdde9dfa614d4 (diff)
downloadtk-b5333ac3910c2299be88875fe833d76136a92fc0.zip
tk-b5333ac3910c2299be88875fe833d76136a92fc0.tar.gz
tk-b5333ac3910c2299be88875fe833d76136a92fc0.tar.bz2
Applied companion patch for Tcl Patch 585105,
updating Tk to use Tcl 8.4's fully CONST-ified interface, and fully CONSTifying Tk at the same time. This patch includes purging Tk of its last direct access to interp->result. [Bug 589853] The substantial changes include copying event sequence strings into Tcl_DStrings in tkBind.c, and copying [text] indices into Tcl_DStrings because parsing them involved overwriting them. If this causes performance trouble, that can be resolved by further converting them to Tcl_Obj's. The #defines USE_NON_CONST and USE_COMPAT_CONST have the same effect for Tk as they do for Tcl. (They actually change tcl.h)
Diffstat (limited to 'mac')
-rw-r--r--mac/tkMacConfig.c6
-rw-r--r--mac/tkMacCursor.c6
-rw-r--r--mac/tkMacEmbed.c6
-rw-r--r--mac/tkMacSend.c6
4 files changed, 12 insertions, 12 deletions
diff --git a/mac/tkMacConfig.c b/mac/tkMacConfig.c
index 951f553..9c80591 100644
--- a/mac/tkMacConfig.c
+++ b/mac/tkMacConfig.c
@@ -9,7 +9,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacConfig.c,v 1.2 1999/04/16 01:51:30 stanton Exp $
+ * RCS: @(#) $Id: tkMacConfig.c,v 1.3 2002/08/05 04:30:40 dgp Exp $
*/
#include "tk.h"
@@ -38,8 +38,8 @@
Tcl_Obj *
TkpGetSystemDefault(
Tk_Window tkwin, /* A window to use. */
- char *dbName, /* The option database name. */
- char *className) /* The name of the option class. */
+ CONST char *dbName, /* The option database name. */
+ CONST char *className) /* The name of the option class. */
{
return NULL;
}
diff --git a/mac/tkMacCursor.c b/mac/tkMacCursor.c
index 1a5ded8..9318be9 100644
--- a/mac/tkMacCursor.c
+++ b/mac/tkMacCursor.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: tkMacCursor.c,v 1.6 2002/01/25 21:09:37 dgp Exp $
+ * RCS: @(#) $Id: tkMacCursor.c,v 1.7 2002/08/05 04:30:40 dgp Exp $
*/
#include "tkPort.h"
@@ -249,8 +249,8 @@ TkGetCursorByName(
TkCursor *
TkCreateCursorFromData(
Tk_Window tkwin, /* Window in which cursor will be used. */
- char *source, /* Bitmap data for cursor shape. */
- char *mask, /* Bitmap data for cursor mask. */
+ CONST char *source, /* Bitmap data for cursor shape. */
+ CONST char *mask, /* Bitmap data for cursor mask. */
int width, int height, /* Dimensions of cursor. */
int xHot, int yHot, /* Location of hot-spot in cursor. */
XColor fgColor, /* Foreground color for cursor. */
diff --git a/mac/tkMacEmbed.c b/mac/tkMacEmbed.c
index a5e97f8..d370f32 100644
--- a/mac/tkMacEmbed.c
+++ b/mac/tkMacEmbed.c
@@ -13,7 +13,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacEmbed.c,v 1.4 1999/04/16 01:51:30 stanton Exp $
+ * RCS: @(#) $Id: tkMacEmbed.c,v 1.5 2002/08/05 04:30:40 dgp Exp $
*/
#include "tkInt.h"
@@ -232,7 +232,7 @@ TkpUseWindow(
* if string is bogus. */
Tk_Window tkwin, /* Tk window that does not yet have an
* associated X window. */
- char *string) /* String identifying an X window to use
+ CONST char *string) /* String identifying an X window to use
* for tkwin; must be an integer value. */
{
TkWindow *winPtr = (TkWindow *) tkwin;
@@ -620,7 +620,7 @@ TkpTestembedCmd(
ClientData clientData, /* Main window for application. */
Tcl_Interp *interp, /* Current interpreter. */
int argc, /* Number of arguments. */
- char **argv) /* Argument strings. */
+ CONST char **argv) /* Argument strings. */
{
int all;
Container *containerPtr;
diff --git a/mac/tkMacSend.c b/mac/tkMacSend.c
index a53e445..63dbfbb 100644
--- a/mac/tkMacSend.c
+++ b/mac/tkMacSend.c
@@ -31,7 +31,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkMacSend.c,v 1.5 2002/01/18 03:24:28 das Exp $
+ * RCS: @(#) $Id: tkMacSend.c,v 1.6 2002/08/05 04:30:40 dgp Exp $
*/
#include <Gestalt.h>
@@ -234,12 +234,12 @@ static int ValidateName _ANSI_ARGS_((TkDisplay *dispPtr,
*--------------------------------------------------------------
*/
-char *
+CONST char *
Tk_SetAppName(
Tk_Window tkwin, /* Token for any window in the application
* to be named: it is just used to identify
* the application and the display. */
- char *name) /* The name that will be used to
+ CONST char *name) /* The name that will be used to
* refer to the interpreter in later
* "send" commands. Must be globally
* unique. */