don't use annoying and unneeded in C++ casts of NULL to "T *" in all other files neither
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@58227 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -284,7 +284,7 @@ bool wxHtmlHelpData::LoadMSProject(wxHtmlBookRecord *book, wxFileSystem& fsys,
|
||||
HP_TagHandler *handler = new HP_TagHandler(book);
|
||||
parser.AddTagHandler(handler);
|
||||
|
||||
f = ( contentsfile.empty() ? (wxFSFile*) NULL : fsys.OpenFile(contentsfile) );
|
||||
f = ( contentsfile.empty() ? NULL : fsys.OpenFile(contentsfile) );
|
||||
if (f)
|
||||
{
|
||||
buf.clear();
|
||||
@@ -298,7 +298,7 @@ bool wxHtmlHelpData::LoadMSProject(wxHtmlBookRecord *book, wxFileSystem& fsys,
|
||||
wxLogError(_("Cannot open contents file: %s"), contentsfile.c_str());
|
||||
}
|
||||
|
||||
f = ( indexfile.empty() ? (wxFSFile*) NULL : fsys.OpenFile(indexfile) );
|
||||
f = ( indexfile.empty() ? NULL : fsys.OpenFile(indexfile) );
|
||||
if (f)
|
||||
{
|
||||
buf.clear();
|
||||
|
||||
@@ -81,7 +81,7 @@ void wxHtmlHelpFrame::Init(wxHtmlHelpData* data)
|
||||
// Simply pass the pointer on to the help window
|
||||
m_Data = data;
|
||||
m_HtmlHelpWin = NULL;
|
||||
m_helpController = (wxHtmlHelpController*) NULL;
|
||||
m_helpController = NULL;
|
||||
}
|
||||
|
||||
void wxHtmlHelpFrame::SetController(wxHtmlHelpController* controller)
|
||||
|
||||
@@ -297,7 +297,7 @@ void wxHtmlHelpWindow::Init(wxHtmlHelpData* data)
|
||||
m_PagesHash = NULL;
|
||||
m_UpdateContents = true;
|
||||
m_toolBar = NULL;
|
||||
m_helpController = (wxHtmlHelpController*) NULL;
|
||||
m_helpController = NULL;
|
||||
}
|
||||
|
||||
// Create: builds the GUI components.
|
||||
|
||||
Reference in New Issue
Block a user