summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorhobbs <hobbs>2006-05-25 23:51:22 (GMT)
committerhobbs <hobbs>2006-05-25 23:51:22 (GMT)
commit73595b628469375e509b39df65cbf11c02ffd513 (patch)
tree3a11cf564dfdd2fc48637f0d22248da490221bd6
parent3a91a5ed9e19c222c4a75c65dbffa4aeb1f1dcda (diff)
downloadtk-73595b628469375e509b39df65cbf11c02ffd513.zip
tk-73595b628469375e509b39df65cbf11c02ffd513.tar.gz
tk-73595b628469375e509b39df65cbf11c02ffd513.tar.bz2
* generic/tkMessage.c (MessageWidgetObjCmd): Correct msgPtr
preserve/release pairing. [Bug 1485750] (afredd)
-rw-r--r--generic/tkMessage.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/generic/tkMessage.c b/generic/tkMessage.c
index b32ecfc..54372ca 100644
--- a/generic/tkMessage.c
+++ b/generic/tkMessage.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: tkMessage.c,v 1.14 2002/08/05 04:30:40 dgp Exp $
+ * RCS: @(#) $Id: tkMessage.c,v 1.14.2.1 2006/05/25 23:51:22 hobbs Exp $
*/
#include "tkPort.h"
@@ -335,15 +335,16 @@ MessageWidgetObjCmd(clientData, interp, objc, objv)
case MESSAGE_CGET: {
if (objc != 3) {
Tcl_WrongNumArgs(interp, 2, objv, "option");
- return TCL_ERROR;
- }
- objPtr = Tk_GetOptionValue(interp, (char *) msgPtr,
- msgPtr->optionTable, objv[2], msgPtr->tkwin);
- if (objPtr == NULL) {
result = TCL_ERROR;
} else {
- Tcl_SetObjResult(interp, objPtr);
- result = TCL_OK;
+ objPtr = Tk_GetOptionValue(interp, (char *) msgPtr,
+ msgPtr->optionTable, objv[2], msgPtr->tkwin);
+ if (objPtr == NULL) {
+ result = TCL_ERROR;
+ } else {
+ Tcl_SetObjResult(interp, objPtr);
+ result = TCL_OK;
+ }
}
break;
}