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

Unicode compilation fixes for BC++ 5

Browse Source 
(BC++ 5 mostly doesn't cope with the wxString == char* operation)


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@5215 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Ove Kaaven
2000-01-03 18:58:57 +00:00
parent 08298395b2
commit 0413cec527
11 changed files with 1068 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/html/htmlcell.cpp
View File

@@ -397,14 +397,14 @@ void wxHtmlContainerCell::InsertCell(wxHtmlCell *f)
void wxHtmlContainerCell::SetAlign(const wxHtmlTag& tag)
{
if (tag.HasParam("ALIGN")) {
wxString alg = tag.GetParam("ALIGN");
if (tag.HasParam(wxT("ALIGN"))) {
wxString alg = tag.GetParam(wxT("ALIGN"));
alg.MakeUpper();
if (alg == "CENTER")
if (alg == wxT("CENTER"))
SetAlignHor(wxHTML_ALIGN_CENTER);
else if (alg == "LEFT")
else if (alg == wxT("LEFT"))
SetAlignHor(wxHTML_ALIGN_LEFT);
else if (alg == "RIGHT")
else if (alg == wxT("RIGHT"))
SetAlignHor(wxHTML_ALIGN_RIGHT);
}
}
@@ -413,11 +413,11 @@ void wxHtmlContainerCell::SetAlign(const wxHtmlTag& tag)
void wxHtmlContainerCell::SetWidthFloat(const wxHtmlTag& tag, double pixel_scale)
{
if (tag.HasParam("WIDTH")) {
if (tag.HasParam(wxT("WIDTH"))) {
int wdi;
wxString wd = tag.GetParam("WIDTH");
wxString wd = tag.GetParam(wxT("WIDTH"));
if (wd[wd.Length()-1] == '%') {
if (wd[wd.Length()-1] == wxT('%')) {
wxSscanf(wd.c_str(), wxT("%i%%"), &wdi);
SetWidthFloat(wdi, wxHTML_UNITS_PERCENT);
}