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

No changes, just removed hard tabs and trailing white space.

Browse Source 
This commit is huge but there are no non-white-space changes in it.

Some files containing third-party sources (src/msw/wince/time.cpp,
src/x11/pango*.cpp) were left unchanged.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61724 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2009-08-21 10:41:26 +00:00
parent 545cb3fcf2
commit 03647350fc
436 changed files with 2774 additions and 2769 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/richtext/richtextstyles.cpp
View File

@@ -619,7 +619,7 @@ wxString wxRichTextStyleListBox::CreateHTML(wxRichTextStyleDefinition* def) cons
int size = 3;
#endif
// Guess a standard font size
// Guess a standard font size
int stdFontSize = 0;
// First see if we have a default/normal style to base the size on
@@ -628,22 +628,22 @@ wxString wxRichTextStyleListBox::CreateHTML(wxRichTextStyleDefinition* def) cons
size_t i;
for (i = 0; i < m_styleNames.GetCount(); i++)
{
wxString name = m_styleNames[i].Lower();
if (name.Find(wxT("normal")) != wxNOT_FOUND || name.Find(normalTranslated) != wxNOT_FOUND ||
name.Find(wxT("default")) != wxNOT_FOUND || name.Find(defaultTranslated) != wxNOT_FOUND)
{
wxRichTextStyleDefinition* d = GetStyleSheet()->FindStyle(m_styleNames[i]);
if (d)
{
wxRichTextAttr attr2(d->GetStyleMergedWithBase(GetStyleSheet()));
if (attr2.HasFontSize())
{
stdFontSize = attr2.GetFontSize();
break;
}
}
}
}
wxString name = m_styleNames[i].Lower();
if (name.Find(wxT("normal")) != wxNOT_FOUND || name.Find(normalTranslated) != wxNOT_FOUND ||
name.Find(wxT("default")) != wxNOT_FOUND || name.Find(defaultTranslated) != wxNOT_FOUND)
{
wxRichTextStyleDefinition* d = GetStyleSheet()->FindStyle(m_styleNames[i]);
if (d)
{
wxRichTextAttr attr2(d->GetStyleMergedWithBase(GetStyleSheet()));
if (attr2.HasFontSize())
{
stdFontSize = attr2.GetFontSize();
break;
}
}
}
}
if (stdFontSize == 0)
{
@@ -670,13 +670,13 @@ wxString wxRichTextStyleListBox::CreateHTML(wxRichTextStyleDefinition* def) cons
{
if (sizes[i] > mostCommonSize)
mostCommonSize = i;
}
}
if (mostCommonSize > 0)
stdFontSize = mostCommonSize;
}
if (stdFontSize == 0)
stdFontSize = 12;
stdFontSize = 12;
int thisFontSize = ((attr.GetFlags() & wxTEXT_ATTR_FONT_SIZE) != 0) ? attr.GetFontSize() : stdFontSize;