--- tk8.4.6/unix/tkUnixWm.c.orig	2005-05-31 23:58:40.000000000 +0900
+++ tk8.4.6/unix/tkUnixWm.c	2005-06-08 19:56:35.000000000 +0900
@@ -628,7 +628,7 @@
 	 */
 
 	string = (wmPtr->title != NULL) ? wmPtr->title : winPtr->nameUid;
-	Tcl_UtfToExternalDString(NULL, string, -1, &ds);
+	Tcl_UtfToExternalDString(Tcl_GetEncoding(0, "utf-8"), string, -1, &ds);
 	string = Tcl_DStringValue(&ds);
 	if (XStringListToTextProperty(&(Tcl_DStringValue(&ds)), 1,
 		&textProp)  != 0) {
@@ -2938,7 +2938,7 @@
 	    XTextProperty textProp;
 	    Tcl_DString ds;
 
-	    Tcl_UtfToExternalDString(NULL, wmPtr->title, -1, &ds);
+	    Tcl_UtfToExternalDString(Tcl_GetEncoding(0, "utf-8"), wmPtr->title, -1, &ds);
 	    if (XStringListToTextProperty(&(Tcl_DStringValue(&ds)), 1,
 		    &textProp)  != 0) {
 		XSetWMName(winPtr->display, wmPtr->wrapperPtr->window,