Readded WS_VISIBLE flag.
Fixed expansion of size limit for contained text. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_4_BRANCH@27668 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -128,7 +128,7 @@ bool wxTextCtrl::Create(
|
|||||||
m_windowStyle = lStyle;
|
m_windowStyle = lStyle;
|
||||||
m_bIsMLE = FALSE;
|
m_bIsMLE = FALSE;
|
||||||
|
|
||||||
long lSstyle = WS_TABSTOP;
|
long lSstyle = WS_VISIBLE | WS_TABSTOP;
|
||||||
|
|
||||||
//
|
//
|
||||||
// Single and multiline edit fields are two different controls in PM
|
// Single and multiline edit fields are two different controls in PM
|
||||||
@@ -1164,11 +1164,17 @@ void wxTextCtrl::AdjustSpaceLimit()
|
|||||||
}
|
}
|
||||||
if (uLen >= uLimit)
|
if (uLen >= uLimit)
|
||||||
{
|
{
|
||||||
uLimit = uLen + 0x8000; // 32Kb
|
if (m_bIsMLE)
|
||||||
if (uLimit > 0xffff)
|
|
||||||
{
|
{
|
||||||
uLimit = 0L;
|
uLimit = uLen + 0x8000; // 32Kb
|
||||||
|
if (uLimit > 0xffff)
|
||||||
|
{
|
||||||
|
uLimit = 0L;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
uLimit = 0x7fff;
|
||||||
|
|
||||||
if (m_bIsMLE)
|
if (m_bIsMLE)
|
||||||
::WinSendMsg(GetHwnd(), MLM_SETTEXTLIMIT, MPFROMLONG(uLimit), 0);
|
::WinSendMsg(GetHwnd(), MLM_SETTEXTLIMIT, MPFROMLONG(uLimit), 0);
|
||||||
else
|
else
|
||||||
|
Reference in New Issue
Block a user