From ca746004af612fcebb72adc28df0e33b1bf7ac63 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 19 Feb 2011 00:30:24 +0000 Subject: [PATCH] Don't ask for wxTextAttr colour if it doesn't have any in text sample. This fixes an assert which could happen when showing the rich text editor. Also show the colour in a more readable form if possible. Closes #12950. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@66960 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/text/text.cpp | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/samples/text/text.cpp b/samples/text/text.cpp index 3a2f94a910..6de6576370 100644 --- a/samples/text/text.cpp +++ b/samples/text/text.cpp @@ -1861,9 +1861,20 @@ void RichTextFrame::OnIdle(wxIdleEvent& WXUNUSED(event)) alignment = wxT("left-aligned"); else if (attr.GetAlignment() == wxTEXT_ALIGNMENT_JUSTIFIED) alignment = wxT("justified"); - msg.Printf( "Facename: %s, wxColour(%d, %d, %d), %s", facename, - attr.GetTextColour().Red(), attr.GetTextColour().Green(), attr.GetTextColour().Blue(), - alignment ); + + msg.Printf("Facename: %s", facename); + + if (attr.HasTextColour()) + { + msg += wxString::Format(", colour: %s", + attr.GetTextColour().GetAsString()); + } + else + { + msg += ", no colour"; + } + + msg << ", " << alignment; if (attr.HasFont()) { -- 2.45.2