AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use wxRTC text colour if possible for caret

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@74361 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 2013-07-05 16:26:37 +00:00
parent eaaf10f671
commit d8d4411312
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/richtext/richtextctrl.cpp
View File

@ -4863,8 +4863,15 @@ void wxRichTextCaret::Refresh()
void wxRichTextCaret::DoDraw(wxDC *dc)
{
dc->SetBrush((m_hasFocus ? m_caretBrush : *wxTRANSPARENT_BRUSH));
dc->SetPen(m_caretPen);
wxBrush brush(m_caretBrush);
wxPen pen(m_caretPen);
if (m_richTextCtrl && m_richTextCtrl->GetBasicStyle().HasTextColour())
{
brush = wxBrush(m_richTextCtrl->GetBasicStyle().GetTextColour());
pen = wxPen(m_richTextCtrl->GetBasicStyle().GetTextColour());
}
dc->SetBrush((m_hasFocus ? brush : *wxTRANSPARENT_BRUSH));
dc->SetPen(pen);
wxPoint pt(m_x, m_y);