diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-01-19 21:41:13 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-01-19 21:41:13 (GMT) |
| commit | 1075a3a387cd7209472fa59e506cfad79f8499eb (patch) | |
| tree | 2f18c41be9b0b88367b80400714953c5f9f88d0e | |
| parent | 99be8f67054bc21a0a099763b7fd0db8d2a6b9f5 (diff) | |
| parent | cd709aa9e14a8f83c1cfa236afd707f0a9a4e8ce (diff) | |
| download | tk-1075a3a387cd7209472fa59e506cfad79f8499eb.zip tk-1075a3a387cd7209472fa59e506cfad79f8499eb.tar.gz tk-1075a3a387cd7209472fa59e506cfad79f8499eb.tar.bz2 | |
Merge 8.6
| -rw-r--r-- | generic/tkMain.c | 6 | ||||
| -rw-r--r-- | generic/tkText.c | 5 |
2 files changed, 0 insertions, 11 deletions
diff --git a/generic/tkMain.c b/generic/tkMain.c index ccb624b..64eedb2 100644 --- a/generic/tkMain.c +++ b/generic/tkMain.c @@ -55,12 +55,6 @@ extern const TclIntPlatStubs *tclIntPlatStubsPtr; #include "tkMacOSXInt.h" #endif -/* - * Further on, in UNICODE mode we just use Tcl_NewUnicodeObj, otherwise - * NewNativeObj is needed (which provides proper conversion from native - * encoding to UTF-8). - */ - static inline Tcl_Obj * NewNativeObj( TCHAR *string) diff --git a/generic/tkText.c b/generic/tkText.c index f810010..33fa1d0 100644 --- a/generic/tkText.c +++ b/generic/tkText.c @@ -5402,11 +5402,6 @@ TextEditCmd( * appending several thousand lines, we could attempt to pre-allocate a * larger space). * - * Also the result is built up as a utf-8 string, but, if we knew we - * wanted it as Unicode, we could potentially save a huge conversion by - * building it up as Unicode directly. This could be as simple as - * replacing Tcl_NewObj by Tcl_NewUnicodeObj. - * * Results: * Tcl_Obj of string type containing the specified text. If the * visibleOnly flag is set to 1, then only those characters which are not |