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:
@@ -167,23 +167,23 @@ TAG_HANDLER_BEGIN(BODY, "BODY")
|
||||
unsigned long tmp;
|
||||
wxColour clr;
|
||||
|
||||
if (tag.HasParam("TEXT")) {
|
||||
if (tag.ScanParam("TEXT", "#%lX", &tmp) == 1) {
|
||||
if (tag.HasParam(wxT("TEXT"))) {
|
||||
if (tag.ScanParam(wxT("TEXT"), 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("LINK")) {
|
||||
if (tag.ScanParam("LINK", "#%lX", &tmp) == 1) {
|
||||
if (tag.HasParam(wxT("LINK"))) {
|
||||
if (tag.ScanParam(wxT("LINK"), wxT("#%lX"), &tmp) == 1) {
|
||||
clr = wxColour((tmp & 0xFF0000) >> 16 , (tmp & 0x00FF00) >> 8, (tmp & 0x0000FF));
|
||||
m_WParser -> SetLinkColor(clr);
|
||||
}
|
||||
}
|
||||
|
||||
if (tag.HasParam("BGCOLOR")) {
|
||||
if (tag.ScanParam("BGCOLOR", "#%lX", &tmp) == 1) {
|
||||
if (tag.HasParam(wxT("BGCOLOR"))) {
|
||||
if (tag.ScanParam(wxT("BGCOLOR"), wxT("#%lX"), &tmp) == 1) {
|
||||
clr = wxColour((tmp & 0xFF0000) >> 16 , (tmp & 0x00FF00) >> 8, (tmp & 0x0000FF));
|
||||
m_WParser -> GetContainer() -> InsertCell(new wxHtmlColourCell(clr, wxHTML_CLR_BACKGROUND));
|
||||
if (m_WParser -> GetWindow() != NULL)
|
||||
|
Reference in New Issue
Block a user