Well, wxHTML compiles in Unicode mode now. But if it works (without
further changes), it shall be considered proof that there is such a thing as a divine intervention. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4250 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -37,19 +37,19 @@ TAG_HANDLER_BEGIN(FONT, "FONT")
|
||||
wxColour oldclr = m_WParser -> GetActualColor();
|
||||
int oldsize = m_WParser -> GetFontSize();
|
||||
|
||||
if (tag.HasParam("COLOR")) {
|
||||
if (tag.HasParam(wxT("COLOR"))) {
|
||||
unsigned long tmp = 0;
|
||||
wxColour clr;
|
||||
if (tag.ScanParam("COLOR", "#%lX", &tmp) == 1) {
|
||||
if (tag.ScanParam(wxT("COLOR"), wxT("#%lX"), &tmp) == 1) {
|
||||
clr = wxColour((tmp & 0xFF0000) >> 16 , (tmp & 0x00FF00) >> 8, (tmp & 0x0000FF));
|
||||
m_WParser -> SetActualColor(clr);
|
||||
m_WParser -> GetContainer() -> InsertCell(new wxHtmlColourCell(clr));
|
||||
}
|
||||
}
|
||||
|
||||
if (tag.HasParam("SIZE")) {
|
||||
if (tag.HasParam(wxT("SIZE"))) {
|
||||
long tmp = 0;
|
||||
if (tag.ScanParam("SIZE", "%li", &tmp) == 1) {
|
||||
if (tag.ScanParam(wxT("SIZE"), wxT("%li"), &tmp) == 1) {
|
||||
m_WParser -> SetFontSize(oldsize+tmp);
|
||||
m_WParser -> GetContainer() -> InsertCell(new wxHtmlFontCell(m_WParser -> CreateCurrentFont()));
|
||||
}
|
||||
|
Reference in New Issue
Block a user