menu changed, many uninitialized variables are now initialized - thanks Purify

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2725 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
1999-06-09 11:36:45 +00:00
parent 3a5ffa81c1
commit 8236a88ae2
4 changed files with 80 additions and 44 deletions

View File

@@ -463,23 +463,16 @@ wxLayoutStyleInfo::wxLayoutStyleInfo(int ifamily,
wxColour *fg,
wxColour *bg)
{
family = ifamily; size = isize;
style = istyle; weight = iweight;
family = ifamily;
size = isize;
style = istyle;
weight = iweight;
underline = iul != 0;
if(fg)
{
m_fg = *fg;
m_fg_valid = TRUE;
}
else
m_fg = *wxBLACK;
if(bg)
{
m_bg = *bg;
m_bg_valid = TRUE;
}
else
m_bg = *wxWHITE;
m_fg_valid = fg != 0;
m_bg_valid = bg != 0;
m_fg = m_fg_valid ? *fg : *wxBLACK;
m_bg = m_fg_valid ? *bg : *wxWHITE;
}
#define COPY_SI_(what) if(right.what != -1) what = right.what;
@@ -632,6 +625,7 @@ wxLayoutLine::wxLayoutLine(wxLayoutLine *prev, wxLayoutList *llist)
m_LineNumber = 0;
m_Width = m_Height = 0;
m_Length = 0;
m_updateLeft = -1;
MarkDirty(0);
m_Previous = prev;
m_Next = NULL;