Get rid of TCL_ENCODING_NOCOMPLAIN, since it will (most likely) be removed from Tcl

6 files changed, 9 insertions, 9 deletions

diff --git a/generic/tkClipboard.c b/generic/tkClipboard.c
index 64fcaeb..8dd9cd4 100644
--- a/generic/tkClipboard.c
+++ b/generic/tkClipboard.c
@@ -712,7 +712,7 @@ ClipboardGetProc(
     Tcl_Encoding utf8 = Tcl_GetEncoding(NULL, "utf-8");
     Tcl_DString ds;
 
-    (void)Tcl_ExternalToUtfDStringEx(utf8, portion, -1, TCL_ENCODING_NOCOMPLAIN, &ds);
+    (void)Tcl_ExternalToUtfDString(utf8, portion, -1, &ds);
     Tcl_DStringAppend((Tcl_DString *) clientData, Tcl_DStringValue(&ds), Tcl_DStringLength(&ds));
     Tcl_DStringFree(&ds);
     Tcl_FreeEncoding(utf8);
diff --git a/generic/tkConsole.c b/generic/tkConsole.c
index d04d3aa..0c12c43 100644
--- a/generic/tkConsole.c
+++ b/generic/tkConsole.c
@@ -517,7 +517,7 @@ ConsoleOutput(
 	     * Assumption is utf-8 Tcl_Encoding is reliably present.
 	     */
 
-	    (void)Tcl_ExternalToUtfDStringEx(utf8, buf, toWrite, TCL_ENCODING_NOCOMPLAIN, &ds);
+	    (void)Tcl_ExternalToUtfDString(utf8, buf, toWrite, &ds);
 	    const char *bytes = Tcl_DStringValue(&ds);
 	    int numBytes = Tcl_DStringLength(&ds);
 	    Tcl_Obj *cmd = Tcl_NewStringObj("tk::ConsoleOutput", -1);
diff --git a/generic/tkFileFilter.c b/generic/tkFileFilter.c
index cf7b307..db5718d 100644
--- a/generic/tkFileFilter.c
+++ b/generic/tkFileFilter.c
@@ -286,7 +286,7 @@ AddClause(
 		 * be 4 macRoman characters long
 		 */
 
-		(void)Tcl_UtfToExternalDStringEx(macRoman, strType, len, TCL_ENCODING_NOCOMPLAIN, &osTypeDS);
+		(void)Tcl_UtfToExternalDString(macRoman, strType, len, &osTypeDS);
 		len = Tcl_DStringLength(&osTypeDS);
 		Tcl_DStringFree(&osTypeDS);
 	    }
@@ -385,7 +385,7 @@ AddClause(
 	     * macRoman characters long
 	     */
 
-	    (void)Tcl_UtfToExternalDStringEx(macRoman, strType, len, TCL_ENCODING_NOCOMPLAIN, &osTypeDS);
+	    (void)Tcl_UtfToExternalDString(macRoman, strType, len, &osTypeDS);
 	    string = Tcl_DStringValue(&osTypeDS);
 	    mfPtr->type = (OSType) string[0] << 24 | (OSType) string[1] << 16 |
 		    (OSType) string[2] <<  8 | (OSType) string[3];
diff --git a/generic/tkMain.c b/generic/tkMain.c
index 75b3f7c..fe2c395 100644
--- a/generic/tkMain.c
+++ b/generic/tkMain.c
@@ -71,7 +71,7 @@ NewNativeObj(
     Tcl_DStringInit(&ds);
     Tcl_WCharToUtfDString(string, wcslen(string), &ds);
 #else
-    (void)Tcl_ExternalToUtfDStringEx(NULL, (char *)string, -1, TCL_ENCODING_NOCOMPLAIN, &ds);
+    (void)Tcl_ExternalToUtfDString(NULL, (char *)string, -1, &ds);
 #endif
     obj = Tcl_NewStringObj(Tcl_DStringValue(&ds), Tcl_DStringLength(&ds));
     Tcl_DStringFree(&ds);
diff --git a/macosx/tkMacOSXBitmap.c b/macosx/tkMacOSXBitmap.c
index ab9d62c..e4cbcdf 100644
--- a/macosx/tkMacOSXBitmap.c
+++ b/macosx/tkMacOSXBitmap.c
@@ -205,7 +205,7 @@ OSTypeFromString(const char *s, OSType *t) {
     Tcl_DString ds;
     Tcl_Encoding encoding = Tcl_GetEncoding(NULL, "macRoman");
 
-    (void)Tcl_UtfToExternalDStringEx(encoding, s, -1, TCL_ENCODING_NOCOMPLAIN, &ds);
+    (void)Tcl_UtfToExternalDString(encoding, s, TCL_INDEX_NONE, &ds);
     if (Tcl_DStringLength(&ds) <= 4) {
 	char string[4] = {};
 	memcpy(string, Tcl_DStringValue(&ds), Tcl_DStringLength(&ds));
@@ -387,7 +387,7 @@ TkMacOSXIconBitmapObjCmd(
 	Tcl_DString ds;
  	Tcl_Encoding encoding = Tcl_GetEncoding(NULL, "macRoman");
 
-	(void)Tcl_UtfToExternalDStringEx(encoding, value, -1, TCL_ENCODING_NOCOMPLAIN, &ds);
+	(void)Tcl_UtfToExternalDString(encoding, value, TCL_INDEX_NONE, &ds);
 	len = Tcl_DStringLength(&ds);
 	Tcl_DStringFree(&ds);
 	Tcl_FreeEncoding(encoding);
diff --git a/macosx/tkMacOSXHLEvents.c b/macosx/tkMacOSXHLEvents.c
index 5c15838..44047d5 100644
--- a/macosx/tkMacOSXHLEvents.c
+++ b/macosx/tkMacOSXHLEvents.c
@@ -227,8 +227,8 @@ static const char getSdefProc[] = "::tk::mac::GetDynamicSdef";
 	if (fileURL == nil) {
 	    continue;
 	}
-	(void)Tcl_ExternalToUtfDStringEx(utf8, [[fileURL path] UTF8String], -1,
-		TCL_ENCODING_NOCOMPLAIN, &pathName);
+	(void)Tcl_ExternalToUtfDString(utf8, [[fileURL path] UTF8String], -1,
+		&pathName);
 	Tcl_DStringAppendElement(openCommand, Tcl_DStringValue(&pathName));
 	Tcl_DStringFree(&pathName);
     }