summaryrefslogtreecommitdiffstats
path: root/generic/tkConfig.c
diff options
context:
space:
mode:
authornijtmans <nijtmans>2010-02-22 23:38:53 (GMT)
committernijtmans <nijtmans>2010-02-22 23:38:53 (GMT)
commitfe9ceaeb3f6bc75446211de711e2d0e889df1ea4 (patch)
tree3752864f6e36215ef73589032ae459b20b3459d4 /generic/tkConfig.c
parent320524e2cf394d50034e2cbb715958c1545a7673 (diff)
downloadtk-fe9ceaeb3f6bc75446211de711e2d0e889df1ea4.zip
tk-fe9ceaeb3f6bc75446211de711e2d0e889df1ea4.tar.gz
tk-fe9ceaeb3f6bc75446211de711e2d0e889df1ea4.tar.bz2
Use @EXEEXT@ in stead of @EXT_SUFFIX@
Use -DBUILD_tk in Makefile Make internal Tk_ObjCustomOption const
Diffstat (limited to 'generic/tkConfig.c')
-rw-r--r--generic/tkConfig.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/generic/tkConfig.c b/generic/tkConfig.c
index d220423..8669b1b 100644
--- a/generic/tkConfig.c
+++ b/generic/tkConfig.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: tkConfig.c,v 1.32 2009/12/15 18:12:07 dgp Exp $
+ * RCS: @(#) $Id: tkConfig.c,v 1.33 2010/02/22 23:38:53 nijtmans Exp $
*/
/*
@@ -65,7 +65,7 @@ typedef struct TkOption {
struct TkOption *synonymPtr;
/* For synonym options, this points to the
* master entry. */
- struct Tk_ObjCustomOption *custom;
+ const struct Tk_ObjCustomOption *custom;
/* For TK_OPTION_CUSTOM. */
} extra;
int flags; /* Miscellaneous flag values; see below for
@@ -940,7 +940,7 @@ DoObjConfig(
break;
}
case TK_OPTION_CUSTOM: {
- Tk_ObjCustomOption *custom = optionPtr->extra.custom;
+ const Tk_ObjCustomOption *custom = optionPtr->extra.custom;
if (custom->setProc(custom->clientData, interp, tkwin,
&valuePtr, recordPtr, optionPtr->specPtr->internalOffset,
@@ -1530,7 +1530,7 @@ Tk_RestoreSavedOptions(
*((Tk_Window *) internalPtr) = *((Tk_Window *) ptr);
break;
case TK_OPTION_CUSTOM: {
- Tk_ObjCustomOption *custom = optionPtr->extra.custom;
+ const Tk_ObjCustomOption *custom = optionPtr->extra.custom;
if (custom->restoreProc != NULL) {
custom->restoreProc(custom->clientData, savePtr->tkwin,
@@ -1755,7 +1755,7 @@ FreeResources(
}
break;
case TK_OPTION_CUSTOM: {
- Tk_ObjCustomOption *custom = optionPtr->extra.custom;
+ const Tk_ObjCustomOption *custom = optionPtr->extra.custom;
if (internalFormExists && custom->freeProc != NULL) {
custom->freeProc(custom->clientData, tkwin, internalPtr);
}
@@ -2046,7 +2046,7 @@ GetObjectForOption(
break;
}
case TK_OPTION_CUSTOM: {
- Tk_ObjCustomOption *custom = optionPtr->extra.custom;
+ const Tk_ObjCustomOption *custom = optionPtr->extra.custom;
objPtr = custom->getProc(custom->clientData, tkwin, recordPtr,
optionPtr->specPtr->internalOffset);