summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorericm <ericm>2000-10-01 21:31:35 (GMT)
committerericm <ericm>2000-10-01 21:31:35 (GMT)
commit5c06a2b6a522b05e7d208c8eb130ceed025357b5 (patch)
treeac6a7a75130d27feefe8fce4d0333c5f8d692013 /generic
parent550ed6e220a4b17dd1059ff841b5f416b73f4195 (diff)
downloadtk-5c06a2b6a522b05e7d208c8eb130ceed025357b5.zip
tk-5c06a2b6a522b05e7d208c8eb130ceed025357b5.tar.gz
tk-5c06a2b6a522b05e7d208c8eb130ceed025357b5.tar.bz2
* doc/SetOptions.3: Added note that restoreProc and freeProc may
be NULL. * generic/tkConfig.c (Tk_RestoreSavedOptions): For custom options, added test that the restoreProc is not NULL, to allow for custom options that don't care about supporting Tk_RestoreSavedOptions.
Diffstat (limited to 'generic')
-rw-r--r--generic/tkConfig.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/generic/tkConfig.c b/generic/tkConfig.c
index ad64aaf..dfdd237 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.12 2000/09/29 17:55:31 ericm Exp $
+ * RCS: @(#) $Id: tkConfig.c,v 1.13 2000/10/01 21:31:36 ericm Exp $
*/
/*
@@ -1432,9 +1432,11 @@ Tk_RestoreSavedOptions(savePtr)
}
case TK_OPTION_CUSTOM: {
Tk_ObjCustomOption *custom = optionPtr->extra.custom;
- custom->restoreProc(custom->clientData, savePtr->tkwin,
- internalPtr,
- (char *)&savePtr->items[i].internalForm);
+ if (custom->restoreProc != NULL) {
+ custom->restoreProc(custom->clientData, savePtr->tkwin,
+ internalPtr,
+ (char *)&savePtr->items[i].internalForm);
+ }
break;
}
default: {