Some more Multi-Line Text control fixes
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@12234 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
parent
051443d481
commit
9c88ff79e5
@ -159,8 +159,8 @@ bool wxTextCtrl::Create(
|
|||||||
//
|
//
|
||||||
if ( m_windowStyle & wxTE_MULTILINE )
|
if ( m_windowStyle & wxTE_MULTILINE )
|
||||||
{
|
{
|
||||||
|
lSstyle |= MLS_BORDER | MLS_WORDWRAP;
|
||||||
m_bIsMLE = TRUE;
|
m_bIsMLE = TRUE;
|
||||||
m_windowStyle |= wxTE_PROCESS_ENTER;
|
|
||||||
|
|
||||||
if ((m_windowStyle & wxTE_NO_VSCROLL) == 0)
|
if ((m_windowStyle & wxTE_NO_VSCROLL) == 0)
|
||||||
lSstyle |= MLS_VSCROLL;
|
lSstyle |= MLS_VSCROLL;
|
||||||
@ -284,6 +284,14 @@ void wxTextCtrl::SetupColours()
|
|||||||
vBkgndColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW);
|
vBkgndColour = wxSystemSettings::GetSystemColour(wxSYS_COLOUR_WINDOW);
|
||||||
SetBackgroundColour(vBkgndColour);
|
SetBackgroundColour(vBkgndColour);
|
||||||
SetForegroundColour(GetParent()->GetForegroundColour());
|
SetForegroundColour(GetParent()->GetForegroundColour());
|
||||||
|
if (m_bIsMLE)
|
||||||
|
{
|
||||||
|
::WinSendMsg( GetHwnd()
|
||||||
|
,MLM_SETTEXTCOLOR
|
||||||
|
,(MPARAM)GetParent()->GetForegroundColour().GetPixel()
|
||||||
|
,(MPARAM)MLE_RGB
|
||||||
|
);
|
||||||
|
}
|
||||||
} // end of wxTextCtrl::SetupColours
|
} // end of wxTextCtrl::SetupColours
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
|
Loading…
Reference in New Issue
Block a user