diff options
author | dgp <dgp@noemail.net> | 2002-01-18 13:29:05 (GMT) |
---|---|---|
committer | dgp <dgp@noemail.net> | 2002-01-18 13:29:05 (GMT) |
commit | 59637c022cfec706325405304716953456f8121a (patch) | |
tree | fcb77c867cf10b8afb28eb48d8124a40768d57ea | |
parent | 088aa31ee9e94debfb069b5bd23b7b877504fad8 (diff) | |
download | tk-59637c022cfec706325405304716953456f8121a.zip tk-59637c022cfec706325405304716953456f8121a.tar.gz tk-59637c022cfec706325405304716953456f8121a.tar.bz2 |
* Overloked Tcl_GetIndexFromObj callers
FossilOrigin-Name: 78e880525bb5a1240f24ac264df24f0fc87f641b
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | win/tkWinDialog.c | 22 |
2 files changed, 15 insertions, 11 deletions
@@ -1,3 +1,7 @@ +2002-01-18 Don Porter <dgp@users.sourceforge.net> + + * win/tkWinDialog.c: Overlooked Tcl_GetIndexFromObj callers. + 2001-01-18 Daniel Steffen <das@users.sourceforge.net> * mac/tkMacDialog.c: diff --git a/win/tkWinDialog.c b/win/tkWinDialog.c index e2a9233..2b52978 100644 --- a/win/tkWinDialog.c +++ b/win/tkWinDialog.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: tkWinDialog.c,v 1.23 2001/12/28 23:43:44 hobbs Exp $ + * RCS: @(#) $Id: tkWinDialog.c,v 1.24 2002/01/18 13:29:05 dgp Exp $ * */ @@ -226,7 +226,7 @@ Tk_ChooseColorObjCmd(clientData, interp, objc, objv) static int inited = 0; static COLORREF dwCustColors[16]; static long oldColor; /* the color selected last time */ - static char *optionStrings[] = { + static CONST char *optionStrings[] = { "-initialcolor", "-parent", "-title", NULL }; enum options { @@ -507,15 +507,15 @@ GetFileNameW(clientData, interp, objc, objv, open) Tcl_DString extString, filterString, dirString, titleString; ThreadSpecificData *tsdPtr = (ThreadSpecificData *) Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData)); - static char *saveOptionStrings[] = { + static CONST char *saveOptionStrings[] = { "-defaultextension", "-filetypes", "-initialdir", "-initialfile", "-parent", "-title", NULL }; - static char *openOptionStrings[] = { + static CONST char *openOptionStrings[] = { "-defaultextension", "-filetypes", "-initialdir", "-initialfile", "-multiple", "-parent", "-title", NULL }; - char **optionStrings; + CONST char **optionStrings; enum options { FILE_DEFAULT, FILE_TYPES, FILE_INITDIR, FILE_INITFILE, @@ -982,15 +982,15 @@ GetFileNameA(clientData, interp, objc, objv, open) Tcl_DString extString, filterString, dirString, titleString; ThreadSpecificData *tsdPtr = (ThreadSpecificData *) Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData)); - static char *saveOptionStrings[] = { + static CONST char *saveOptionStrings[] = { "-defaultextension", "-filetypes", "-initialdir", "-initialfile", "-parent", "-title", NULL }; - static char *openOptionStrings[] = { + static CONST char *openOptionStrings[] = { "-defaultextension", "-filetypes", "-initialdir", "-initialfile", "-multiple", "-parent", "-title", NULL }; - char **optionStrings; + CONST char **optionStrings; enum options { FILE_DEFAULT, FILE_TYPES, FILE_INITDIR, FILE_INITFILE, @@ -1654,7 +1654,7 @@ Tk_ChooseDirectoryObjCmd(clientData, interp, objc, objv) Tcl_DString initDirString; /* Initial directory */ ThreadSpecificData *tsdPtr = (ThreadSpecificData *) Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData)); - static char *optionStrings[] = { + static CONST char *optionStrings[] = { "-initialdir", "-mustexist", "-parent", "-title", (char *) NULL }; enum options { @@ -1990,7 +1990,7 @@ Tk_ChooseDirectoryObjCmd(clientData, interp, objc, objv) Tcl_DString titleString, dirString; ThreadSpecificData *tsdPtr = (ThreadSpecificData *) Tcl_GetThreadData(&dataKey, sizeof(ThreadSpecificData)); - static char *optionStrings[] = { + static CONST char *optionStrings[] = { "-initialdir", "-mustexist", "-parent", "-title", NULL }; @@ -2432,7 +2432,7 @@ Tk_MessageBoxObjCmd(clientData, interp, objc, objv) int defaultBtn, icon, type; int i, oldMode, flags, winCode; Tcl_DString messageString, titleString; - static char *optionStrings[] = { + static CONST char *optionStrings[] = { "-default", "-icon", "-message", "-parent", "-title", "-type", NULL }; |