summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorpspjuth <peter.spjuth@gmail.com>2003-07-16 23:17:36 (GMT)
committerpspjuth <peter.spjuth@gmail.com>2003-07-16 23:17:36 (GMT)
commitba154f21db39f6326e1369e93778cad9c1d02385 (patch)
treeb771442ab219f21be34c5dc9b6401bdcffa7cb13 /generic
parentaa5738dd765124fc5c414ef6e0a7cded389065f6 (diff)
downloadtk-ba154f21db39f6326e1369e93778cad9c1d02385.zip
tk-ba154f21db39f6326e1369e93778cad9c1d02385.tar.gz
tk-ba154f21db39f6326e1369e93778cad9c1d02385.tar.bz2
Make sure all options can be set
to their default value. [Bug #697652]
Diffstat (limited to 'generic')
-rw-r--r--generic/tkFrame.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/generic/tkFrame.c b/generic/tkFrame.c
index f4f0a53..6be4c48 100644
--- a/generic/tkFrame.c
+++ b/generic/tkFrame.c
@@ -12,7 +12,7 @@
* See the file "license.terms" for information on usage and redistribution
* of this file, and for a DISCLAIMER OF ALL WARRANTIES.
*
- * RCS: @(#) $Id: tkFrame.c,v 1.15 2003/01/22 14:32:59 dkf Exp $
+ * RCS: @(#) $Id: tkFrame.c,v 1.15.2.1 2003/07/16 23:17:38 pspjuth Exp $
*/
#include "default.h"
@@ -594,7 +594,7 @@ CreateFrame(clientData, interp, objc, objv, type, appName)
if (useOption == NULL) {
useOption = Tk_GetOption(new, "use", "Use");
}
- if (useOption != NULL) {
+ if ((useOption != NULL) && (*useOption != 0)) {
if (TkpUseWindow(interp, new, useOption) != TCL_OK) {
goto error;
}
@@ -605,6 +605,9 @@ CreateFrame(clientData, interp, objc, objv, type, appName)
if (colormapName == NULL) {
colormapName = Tk_GetOption(new, "colormap", "Colormap");
}
+ if ((colormapName != NULL) && (*colormapName == 0)) {
+ colormapName = NULL;
+ }
if (visualName != NULL) {
visual = Tk_GetVisual(interp, new, visualName, &depth,
(colormapName == NULL) ? &colormap : (Colormap *) NULL);