From bd5d41f65dd324c3eaf873e37cbf493aa2f5144f Mon Sep 17 00:00:00 2001 From: Dimitri Schoolwerth Date: Tue, 23 Dec 2003 03:01:37 +0000 Subject: [PATCH] Applied patch #864557 (Adjustment of richedit sample to new FindColour solution). git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@24969 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- samples/richedit/wxllist.cpp | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/samples/richedit/wxllist.cpp b/samples/richedit/wxllist.cpp index b5625309d2..bc00fa710e 100644 --- a/samples/richedit/wxllist.cpp +++ b/samples/richedit/wxllist.cpp @@ -1821,16 +1821,10 @@ wxLayoutList::SetFont(int family, int size, int style, int weight, int underline, wxChar const *fg, wxChar const *bg) { - wxColour - *cfg = NULL, - *cbg = NULL; + wxColour cfg = wxTheColourDatabase->Find((fg)?fg:wxT("BLACK")); + wxColour cbg = wxTheColourDatabase->Find((bg)?bg:wxT("WHITE")); - if( fg ) - cfg = wxTheColourDatabase->FindColour(fg); - if( bg ) - cbg = wxTheColourDatabase->FindColour(bg); - - SetFont(family,size,style,weight,underline,cfg,cbg); + SetFont(family,size,style,weight,underline,&cfg,&cbg); } void -- 2.50.0