Don't assume that wxTE_RICH(2) implies wxTE_MULTILINE for wxTextCtrl in wxOSX.
authorVadim Zeitlin <vadim@wxwidgets.org>
Fri, 28 Dec 2012 16:03:20 +0000 (16:03 +0000)
committerVadim Zeitlin <vadim@wxwidgets.org>
Fri, 28 Dec 2012 16:03:20 +0000 (16:03 +0000)
commit98c9096992dfc5e8149d0bf1b7d0de51a7979075
tree3d578c110449d2f2a0bdc38ffc7c33d3cec4e49a
parentf69306fe61bfce53b6261f18967cceaefd919d90
Don't assume that wxTE_RICH(2) implies wxTE_MULTILINE for wxTextCtrl in wxOSX.

Under MSW single line text controls can still use these styles, so don't
assume that the control should be made multi-line just because one of them is
specified.

This fixes the appearance of the in-place text control in wxGridCellTextEditor
which is created with wxTE_RICH2 style to work around some wxMSW problem.

Closes #11681.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73294 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
src/osx/cocoa/textctrl.mm