No changes, just removed hard tabs and trailing white space.
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:
@@ -714,9 +714,9 @@ wxString wxHtmlHelpData::FindPageByName(const wxString& x)
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
int cnt = m_bookRecords.GetCount();
|
||||
|
||||
|
||||
if (!has_non_ascii)
|
||||
{
|
||||
wxFileSystem fsys;
|
||||
|
||||
@@ -100,7 +100,7 @@ bool wxHtmlHelpFrame::Create(wxWindow* parent, wxWindowID id,
|
||||
m_HtmlHelpWin->SetController(m_helpController);
|
||||
if ( config)
|
||||
m_HtmlHelpWin->UseConfig(config, rootpath);
|
||||
|
||||
|
||||
wxFrame::Create(parent, id, _("Help"),
|
||||
wxPoint(m_HtmlHelpWin->GetCfgData().x, m_HtmlHelpWin->GetCfgData().y),
|
||||
wxSize(m_HtmlHelpWin->GetCfgData().w, m_HtmlHelpWin->GetCfgData().h),
|
||||
|
||||
@@ -1126,7 +1126,7 @@ void wxHtmlContainerCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2,
|
||||
|
||||
if (m_Border == 1)
|
||||
{
|
||||
// draw thin border using lines
|
||||
// draw thin border using lines
|
||||
wxPen mypen1(m_BorderColour1, 1, wxPENSTYLE_SOLID);
|
||||
wxPen mypen2(m_BorderColour2, 1, wxPENSTYLE_SOLID);
|
||||
|
||||
@@ -1138,10 +1138,10 @@ void wxHtmlContainerCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2,
|
||||
dc.DrawLine(xlocal, ylocal + m_Height - 1, xlocal + m_Width, ylocal + m_Height - 1);
|
||||
}
|
||||
else if (m_Border> 0)
|
||||
{
|
||||
{
|
||||
wxBrush mybrush1(m_BorderColour1, wxBRUSHSTYLE_SOLID);
|
||||
wxBrush mybrush2(m_BorderColour2, wxBRUSHSTYLE_SOLID);
|
||||
|
||||
|
||||
// draw upper left corner
|
||||
// 0---------------5
|
||||
// | /
|
||||
@@ -1149,7 +1149,7 @@ void wxHtmlContainerCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2,
|
||||
// | |
|
||||
// | 2
|
||||
// |/
|
||||
// 1
|
||||
// 1
|
||||
|
||||
wxPoint poly[6];
|
||||
poly[0].x =m_PosX; poly[0].y = m_PosY ;
|
||||
@@ -1162,7 +1162,7 @@ void wxHtmlContainerCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2,
|
||||
dc.SetBrush(mybrush1);
|
||||
dc.SetPen(*wxTRANSPARENT_PEN);
|
||||
dc.DrawPolygon(6, poly, x, y);
|
||||
|
||||
|
||||
// draw lower right corner reusing point 1,2,4 and 5
|
||||
// 5
|
||||
// /|
|
||||
@@ -1176,11 +1176,11 @@ void wxHtmlContainerCell::Draw(wxDC& dc, int x, int y, int view_y1, int view_y2,
|
||||
poly[3].x = poly[4].x; poly[3].y = poly[2].y;
|
||||
dc.DrawPolygon(6, poly, x, y);
|
||||
|
||||
// smooth color transition like firefox
|
||||
// smooth color transition like firefox
|
||||
wxColour borderMediumColour(
|
||||
(m_BorderColour1.Red() + m_BorderColour2.Red()) /2 ,
|
||||
(m_BorderColour1.Green() + m_BorderColour2.Green()) /2 ,
|
||||
(m_BorderColour1.Blue() + m_BorderColour2.Blue()) /2
|
||||
(m_BorderColour1.Blue() + m_BorderColour2.Blue()) /2
|
||||
);
|
||||
wxPen mypen3(borderMediumColour, 1, wxPENSTYLE_SOLID);
|
||||
dc.SetPen(mypen3);
|
||||
|
||||
@@ -158,7 +158,7 @@ wxString wxHtmlFilterHTML::ReadFile(const wxFSFile& file) const
|
||||
s->Read( buf.data(), size );
|
||||
*(buf.data() + size) = 0;
|
||||
wxString tmpdoc( buf, wxConvISO8859_1);
|
||||
|
||||
|
||||
wxString charset = wxHtmlParser::ExtractCharsetInformation(tmpdoc);
|
||||
if (charset.empty())
|
||||
doc = tmpdoc;
|
||||
|
||||
@@ -202,7 +202,7 @@ void wxHtmlWinParser::InitParser(const wxString& source)
|
||||
m_FontBold = m_FontItalic = m_FontUnderlined = m_FontFixed = FALSE;
|
||||
m_FontSize = 3; //default one
|
||||
CreateCurrentFont(); // we're selecting default font into
|
||||
|
||||
|
||||
// we're not using GetCharWidth/Height() because of
|
||||
// differences under X and win
|
||||
wxCoord w,h;
|
||||
|
||||
Reference in New Issue
Block a user