X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0423bdc761a76f7d0ccbb91fd5674b9306494d62..f3ba93c1f025870aeda36082acecc87ab277ab7d:/src/html/winpars.cpp diff --git a/src/html/winpars.cpp b/src/html/winpars.cpp index 151573bd3f..9d8209ddfb 100644 --- a/src/html/winpars.cpp +++ b/src/html/winpars.cpp @@ -201,11 +201,11 @@ wxFSFile *wxHtmlWinParser::OpenURL(wxHtmlURLType type, if ( status == wxHTML_BLOCK ) return NULL; - else - return GetFS()->OpenFile(myurl); + + return GetFS()->OpenFile(myurl); } - else - return wxHtmlParser::OpenURL(type, url); + + return wxHtmlParser::OpenURL(type, url); } void wxHtmlWinParser::AddText(const wxChar* txt) @@ -443,27 +443,29 @@ void wxHtmlWinParser::SetInputEncoding(wxFontEncoding enc) IMPLEMENT_ABSTRACT_CLASS(wxHtmlWinTagHandler, wxHtmlTagHandler) - - //----------------------------------------------------------------------------- // wxHtmlTagsModule //----------------------------------------------------------------------------- +// NB: This is *NOT* winpars.cpp's initialization and shutdown code!! +// This module is an ancestor for tag handlers modules defined +// in m_*.cpp files with TAGS_MODULE_BEGIN...TAGS_MODULE_END construct. +// +// Do not add any winpars.cpp shutdown or initialization code to it, +// create a new module instead! IMPLEMENT_DYNAMIC_CLASS(wxHtmlTagsModule, wxModule) - bool wxHtmlTagsModule::OnInit() { wxHtmlWinParser::AddModule(this); return TRUE; } - - void wxHtmlTagsModule::OnExit() { wxHtmlWinParser::RemoveModule(this); } + #endif