mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2024-11-11 03:10:09 +00:00
win32: don't convert '\n' to '\r\n' when copying if it already is '\r\n'
https://bugzilla.gnome.org/show_bug.cgi?id=649390
This commit is contained in:
parent
242d0c5d22
commit
136f6b15be
@ -205,7 +205,7 @@ _gdk_win32_window_change_property (GdkWindow *window,
|
||||
wclen++; /* Terminating 0 */
|
||||
size = wclen * 2;
|
||||
for (i = 0; i < wclen; i++)
|
||||
if (wcptr[i] == '\n')
|
||||
if (wcptr[i] == '\n' && (i == 0 || wcptr[i - 1] != '\r'))
|
||||
size += 2;
|
||||
|
||||
if (!(hdata = GlobalAlloc (GMEM_MOVEABLE, size)))
|
||||
@ -222,7 +222,7 @@ _gdk_win32_window_change_property (GdkWindow *window,
|
||||
p = (wchar_t *) ucptr;
|
||||
for (i = 0; i < wclen; i++)
|
||||
{
|
||||
if (wcptr[i] == '\n')
|
||||
if (wcptr[i] == '\n' && (i == 0 || wcptr[i - 1] != '\r'))
|
||||
*p++ = '\r';
|
||||
*p++ = wcptr[i];
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user