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
This commit is contained in:
@@ -1821,16 +1821,10 @@ wxLayoutList::SetFont(int family, int size, int style, int weight,
|
|||||||
int underline, wxChar const *fg, wxChar const *bg)
|
int underline, wxChar const *fg, wxChar const *bg)
|
||||||
|
|
||||||
{
|
{
|
||||||
wxColour
|
wxColour cfg = wxTheColourDatabase->Find((fg)?fg:wxT("BLACK"));
|
||||||
*cfg = NULL,
|
wxColour cbg = wxTheColourDatabase->Find((bg)?bg:wxT("WHITE"));
|
||||||
*cbg = NULL;
|
|
||||||
|
|
||||||
if( fg )
|
SetFont(family,size,style,weight,underline,&cfg,&cbg);
|
||||||
cfg = wxTheColourDatabase->FindColour(fg);
|
|
||||||
if( bg )
|
|
||||||
cbg = wxTheColourDatabase->FindColour(bg);
|
|
||||||
|
|
||||||
SetFont(family,size,style,weight,underline,cfg,cbg);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
|
Reference in New Issue
Block a user