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

Implemented text background colour

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@44612 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart
2007-03-05 15:22:07 +00:00
parent d38819f56f
commit 3e54156282
2 changed files with 104 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
samples/richtext/richtext.cpp
View File

@@ -757,9 +757,12 @@ MyFrame::MyFrame(const wxString& title, wxWindowID id, const wxPoint& pos,
r.WriteText(wxT("colour, like this red bit.")); r.WriteText(wxT("colour, like this red bit."));
r.EndTextColour(); r.EndTextColour();
r.BeginTextColour(wxColour(0, 0, 255)); wxRichTextAttr backgroundColourAttr;
r.WriteText(wxT(" And this blue bit.")); backgroundColourAttr.SetBackgroundColour(*wxGREEN);
r.EndTextColour(); backgroundColourAttr.SetTextColour(wxColour(0, 0, 255));
r.BeginStyle(backgroundColourAttr);
r.WriteText(wxT(" And this blue on green bit."));
r.EndStyle();
r.WriteText(wxT(" Naturally you can make things ")); r.WriteText(wxT(" Naturally you can make things "));
r.BeginBold(); r.BeginBold();

10
src/richtext/richtextbuffer.cpp
View File

@@ -4329,14 +4329,20 @@ bool wxRichTextPlainText::DrawTabbedString(wxDC& dc, const wxTextAttrEx& attr, c
dc.SetBrush(*wxBLACK_BRUSH); dc.SetBrush(*wxBLACK_BRUSH);
dc.SetPen(*wxBLACK_PEN); dc.SetPen(*wxBLACK_PEN);
dc.SetTextForeground(*wxWHITE); dc.SetTextForeground(*wxWHITE);
dc.SetBackgroundMode(wxTRANSPARENT);
} }
else else
{ {
dc.SetTextForeground(attr.GetTextColour()); dc.SetTextForeground(attr.GetTextColour());
dc.SetBackgroundMode(wxTRANSPARENT);
} }
if (attr.HasFlag(wxTEXT_ATTR_BACKGROUND_COLOUR) && attr.GetBackgroundColour().IsOk())
{
dc.SetBackgroundMode(wxSOLID);
dc.SetTextBackground(attr.GetBackgroundColour());
}
else
dc.SetBackgroundMode(wxTRANSPARENT);
while (hasTabs) while (hasTabs)
{ {
// the string has a tab // the string has a tab