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

fixed a warning and detabified

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@11119 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2001-07-20 08:55:08 +00:00
parent f7ba097de4
commit 3c8c8da2aa
1 changed files with 44 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/html/winpars.cpp
View File

@@ -59,7 +59,7 @@ wxHtmlWinParser::wxHtmlWinParser(wxWindow *wnd) : wxHtmlParser()
for (k = 0; k < 2; k++) for (k = 0; k < 2; k++)
for (l = 0; l < 2; l++) for (l = 0; l < 2; l++)
for (m = 0; m < 7; m++) for (m = 0; m < 7; m++)
{ {
m_FontsTable[i][j][k][l][m] = NULL; m_FontsTable[i][j][k][l][m] = NULL;
m_FontsFacesTable[i][j][k][l][m] = wxEmptyString; m_FontsFacesTable[i][j][k][l][m] = wxEmptyString;
m_FontsEncTable[i][j][k][l][m] = wxFONTENCODING_DEFAULT; m_FontsEncTable[i][j][k][l][m] = wxFONTENCODING_DEFAULT;
@@ -94,7 +94,7 @@ wxHtmlWinParser::~wxHtmlWinParser()
for (k = 0; k < 2; k++) for (k = 0; k < 2; k++)
for (l = 0; l < 2; l++) for (l = 0; l < 2; l++)
for (m = 0; m < 7; m++) for (m = 0; m < 7; m++)
{ {
if (m_FontsTable[i][j][k][l][m] != NULL) if (m_FontsTable[i][j][k][l][m] != NULL)
delete m_FontsTable[i][j][k][l][m]; delete m_FontsTable[i][j][k][l][m];
} }
@@ -133,7 +133,7 @@ void wxHtmlWinParser::SetFonts(wxString normal_face, wxString fixed_face, const
for (l = 0; l < 2; l++) for (l = 0; l < 2; l++)
for (m = 0; m < 7; m++) { for (m = 0; m < 7; m++) {
if (m_FontsTable[i][j][k][l][m] != NULL) if (m_FontsTable[i][j][k][l][m] != NULL)
{ {
delete m_FontsTable[i][j][k][l][m]; delete m_FontsTable[i][j][k][l][m];
m_FontsTable[i][j][k][l][m] = NULL; m_FontsTable[i][j][k][l][m] = NULL;
} }
@@ -196,7 +196,8 @@ wxObject* wxHtmlWinParser::GetProduct()
void wxHtmlWinParser::AddText(const wxChar* txt) void wxHtmlWinParser::AddText(const wxChar* txt)
{ {
wxHtmlCell *c; wxHtmlCell *c;
int i = 0, x, lng = wxStrlen(txt); int i = 0, x;
size_t lng = wxStrlen(txt);
register wxChar d; register wxChar d;
int templen = 0; int templen = 0;
@@ -220,7 +221,7 @@ void wxHtmlWinParser::AddText(const wxChar* txt)
x = 0; x = 0;
d = temp[templen++] = txt[i]; d = temp[templen++] = txt[i];
if ((d == wxT('\n')) || (d == wxT('\r')) || (d == wxT(' ')) || (d == wxT('\t'))) if ((d == wxT('\n')) || (d == wxT('\r')) || (d == wxT(' ')) || (d == wxT('\t')))
{ {
i++, x++; i++, x++;
while ((i < lng) && ((txt[i] == wxT('\n')) || (txt[i] == wxT('\r')) || while ((i < lng) && ((txt[i] == wxT('\n')) || (txt[i] == wxT('\r')) ||
(txt[i] == wxT(' ')) || (txt[i] == wxT('\t')))) i++, x++; (txt[i] == wxT(' ')) || (txt[i] == wxT('\t')))) i++, x++;
@@ -228,7 +229,7 @@ void wxHtmlWinParser::AddText(const wxChar* txt)
else i++; else i++;
if (x) if (x)
{ {
temp[templen-1] = wxT(' '); temp[templen-1] = wxT(' ');
temp[templen] = 0; temp[templen] = 0;
templen = 0; templen = 0;
@@ -398,7 +399,7 @@ void wxHtmlWinParser::SetInputEncoding(wxFontEncoding enc)
wxCONVERT_SUBSTITUTE)) wxCONVERT_SUBSTITUTE))
{ // total failture :-( { // total failture :-(
wxLogError(_("Failed to display HTML document in %s encoding"), wxLogError(_("Failed to display HTML document in %s encoding"),
wxFontMapper::GetEncodingName(enc).c_str()); wxFontMapper::GetEncodingName(enc).c_str());
m_InputEnc = m_OutputEnc = wxFONTENCODING_DEFAULT; m_InputEnc = m_OutputEnc = wxFONTENCODING_DEFAULT;
delete m_EncConv; delete m_EncConv;
m_EncConv = NULL; m_EncConv = NULL;