Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

always show vert SB for multiline text ctrls without wxTE_RICH style

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/wxUNIVERSAL@8715 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2000-11-10 21:14:20 +00:00
parent c0bd235861
commit a00fd3e544
3 changed files with 48 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/univ/textctrl.cpp
View File

@@ -277,6 +277,20 @@ bool wxTextCtrl::Create(wxWindow *parent,
const wxValidator& validator,
const wxString &name)
{
if ( style & wxTE_MULTILINE )
{
// for compatibility with wxMSW we create the controls with vertical
// scrollbar always shown unless they have wxTE_RICH style (because
// Windows text controls always has vert scrollbar but richedit one
// doesn't)
if ( !(style & wxTE_RICH) )
{
style |= wxALWAYS_SHOW_SB;
}
// TODO: support wxTE_NO_VSCROLL (?)
}
if ( !wxControl::Create(parent, id, pos, size, style,
validator, name) )
{
@@ -294,16 +308,6 @@ bool wxTextCtrl::Create(wxWindow *parent,
// support it anyhow
wxASSERT_MSG( !(style & wxTE_PASSWORD),
_T("wxTE_PASSWORD can't be used with multiline ctrls") );
// create vertical scrollbar if necessary (on by default)
if ( !(style & wxTE_NO_VSCROLL) )
{
}
// and the horizontal one
if ( style & wxHSCROLL )
{
}
}
SetValue(value);
@@ -2627,8 +2631,8 @@ void wxTextCtrl::DoDraw(wxControlRenderer *renderer)
dc.SetTextForeground(GetForegroundColour());
// get the intersection of the update region with the text area: note that
// the update region is in window coord and text area is in the client
// ones, so it must be shifted before computing intesection
// the update region is in window coords and text area is in the client
// ones, so it must be shifted before computing intersection
wxRegion rgnUpdate = GetUpdateRegion();
wxRect rectTextArea = GetRealTextArea();
wxPoint pt = GetClientAreaOrigin();
@@ -2652,16 +2656,21 @@ void wxTextCtrl::DoDraw(wxControlRenderer *renderer)
for ( ; iter.HaveRects(); iter++ )
{
wxRect r = iter.GetRect();
// this is a workaround for wxGTK::wxRegion bug
#ifdef __WXGTK__
if ( !r.width || !r.height )
{
// this happens under wxGTK
// ignore invalid rect
continue;
}
#endif // __WXGTK__
DoDrawTextInRect(dc, r);
}
// show caret first time only
// show caret first time only: we must show it after drawing the text or
// the display can be corrupted when it's hidden
if ( !m_hasCaret && GetCaret() )
{
GetCaret()->Show();