Merge branch 'master' into windows-namespace-and-hresult-cleanup

This commit is contained in:
Pietro Gagliardi 2018-05-28 13:39:36 -04:00
commit 7e2c505b1d
1 changed files with 1 additions and 1 deletions

View File

@ -75,7 +75,7 @@ void uiMultilineEntrySetText(uiMultilineEntry *e, const char *text)
// doing this raises an EN_CHANGED // doing this raises an EN_CHANGED
e->inhibitChanged = TRUE; e->inhibitChanged = TRUE;
crlf = LFtoCRLF(text); crlf = LFtoCRLF(text);
uiWindowsSetWindowText(e->hwnd, text); uiWindowsSetWindowText(e->hwnd, crlf);
uiprivFree(crlf); uiprivFree(crlf);
e->inhibitChanged = FALSE; e->inhibitChanged = FALSE;
// don't queue the control for resize; entry sizes are independent of their contents // don't queue the control for resize; entry sizes are independent of their contents