diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-09-09 11:25:29 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-09-09 11:25:29 (GMT) |
| commit | c582be3c0f71b3545bb5ad4c4e7509fddd547586 (patch) | |
| tree | 50590849f17448d69e2a07794f34df7c4e738d0e /win/tkWinClipboard.c | |
| parent | 87e7625c3c920df32eff50d6d50e98ba73bf495b (diff) | |
| parent | 3764526f9b0411b4d6f7b469aa0c12d7c0b1771a (diff) | |
| download | tk-c582be3c0f71b3545bb5ad4c4e7509fddd547586.zip tk-c582be3c0f71b3545bb5ad4c4e7509fddd547586.tar.gz tk-c582be3c0f71b3545bb5ad4c4e7509fddd547586.tar.bz2 | |
Merge trunk
Diffstat (limited to 'win/tkWinClipboard.c')
| -rw-r--r-- | win/tkWinClipboard.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/win/tkWinClipboard.c b/win/tkWinClipboard.c index a14ec47..8bfd03c 100644 --- a/win/tkWinClipboard.c +++ b/win/tkWinClipboard.c @@ -80,7 +80,7 @@ TkSelGetSelection( } data = GlobalLock(handle); Tcl_DStringInit(&ds); - Tcl_UniCharToUtfDString((WCHAR *)data, wcslen((WCHAR *)data), &ds); + Tcl_WCharToUtfDString((WCHAR *)data, wcslen((WCHAR *)data), &ds); GlobalUnlock(handle); } else if (IsClipboardFormatAvailable(CF_TEXT)) { /* @@ -159,7 +159,7 @@ TkSelGetSelection( } len = wcslen(fname); Tcl_DStringInit(&dsTmp); - Tcl_UniCharToUtfDString(fname, len, &dsTmp); + Tcl_WCharToUtfDString(fname, len, &dsTmp); Tcl_DStringAppend(&ds, Tcl_DStringValue(&dsTmp), Tcl_DStringLength(&dsTmp)); Tcl_DStringFree(&dsTmp); @@ -335,7 +335,7 @@ TkWinClipboardRender( */ Tcl_DStringInit(&ds); - Tcl_UtfToUniCharDString(rawText, -1, &ds); + Tcl_UtfToWCharDString(rawText, -1, &ds); ckfree(rawText); handle = GlobalAlloc(GMEM_MOVEABLE|GMEM_DDESHARE, (unsigned) Tcl_DStringLength(&ds) + 2); @@ -426,7 +426,7 @@ UpdateClipboard( void TkSelEventProc( Tk_Window tkwin, /* Window for which event was targeted. */ - register XEvent *eventPtr) /* X event: either SelectionClear, + XEvent *eventPtr) /* X event: either SelectionClear, * SelectionRequest, or SelectionNotify. */ { if (eventPtr->type == SelectionClear) { @@ -453,7 +453,7 @@ TkSelEventProc( void TkSelPropProc( - register XEvent *eventPtr) /* X PropertyChange event. */ + XEvent *eventPtr) /* X PropertyChange event. */ { } |