Fixed VC6-specific compile errors

This commit is contained in:
Chris Danford
2003-01-07 08:16:55 +00:00
parent a1f7624847
commit 471fc08e51
6 changed files with 7 additions and 5 deletions
+1 -1
View File
@@ -216,7 +216,7 @@ void BitmapText::SetText( CString sText, bool DoSubst )
m_iLineWidths.clear(); m_iLineWidths.clear();
m_iLineHeights.clear(); m_iLineHeights.clear();
lstring s; s.push_back('\n'); lstring s; s+='\n';
split(CStringToLstring(sText), s, m_szTextLines, false); split(CStringToLstring(sText), s, m_szTextLines, false);
/* calculate line lengths and widths */ /* calculate line lengths and widths */
+4 -2
View File
@@ -209,11 +209,13 @@ Font::Font()
Font::~Font() Font::~Font()
{ {
for(unsigned i = 0; i < pages.size(); ++i) unsigned i;
for(i = 0; i < pages.size(); ++i)
delete pages[i]; delete pages[i];
/* Free any fonts that we merged into us. */ /* Free any fonts that we merged into us. */
for(unsigned i = 0; i < merged_fonts.size(); ++i) for(i = 0; i < merged_fonts.size(); ++i)
FONT->UnloadFont(merged_fonts[i]); FONT->UnloadFont(merged_fonts[i]);
} }
+2 -2
View File
@@ -915,9 +915,9 @@ lstring CStringToLstring(const CString &str)
{ {
longchar c = utf8_get_char (ptr); longchar c = utf8_get_char (ptr);
if(c == -1) if(c == -1)
ret.push_back(INVALID_CHAR); ret += INVALID_CHAR;
else else
ret.push_back(c); ret += c;
ptr = utf8_find_next_char (ptr, end); ptr = utf8_find_next_char (ptr, end);
} }
Binary file not shown.
Binary file not shown.
Binary file not shown.