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

some != NULL checks

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@6627 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
2000-03-11 19:31:19 +00:00
parent 86f6187197
commit f5ba273ecd
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/html/helpfrm.cpp
View File

@@ -92,6 +92,7 @@ class wxHtmlHelpHashData : public wxObject
public: public:
wxHtmlHelpHashData(int index, wxTreeItemId id) : wxObject() wxHtmlHelpHashData(int index, wxTreeItemId id) : wxObject()
{ m_Index = index; m_Id = id;} { m_Index = index; m_Id = id;}
~wxHtmlHelpHashData() {}
int m_Index; int m_Index;
wxTreeItemId m_Id; wxTreeItemId m_Id;
@@ -1147,7 +1148,10 @@ void wxHtmlHelpFrame::OnToolbar(wxCommandEvent& event)
{ {
if (m_Printer == NULL) if (m_Printer == NULL)
m_Printer = new wxHtmlEasyPrinting(_("Help Printing"), this); m_Printer = new wxHtmlEasyPrinting(_("Help Printing"), this);
m_Printer -> PrintFile(m_HtmlWin -> GetOpenedPage()); if (!m_HtmlWin -> GetOpenedPage())
wxLogWarning(_("Cannot print empty page."));
else
m_Printer -> PrintFile(m_HtmlWin -> GetOpenedPage());
} }
break; break;
#endif #endif

7
src/html/htmprint.cpp
View File

@@ -266,6 +266,13 @@ void wxHtmlPrintout::SetHtmlFile(const wxString& htmlfile)
{ {
wxFileSystem fs; wxFileSystem fs;
wxFSFile *ff = fs.OpenFile(htmlfile); wxFSFile *ff = fs.OpenFile(htmlfile);
if (ff == NULL)
{
wxLogError(htmlfile + _(": file does not exist!"));
return;
}
wxInputStream *st = ff -> GetStream(); wxInputStream *st = ff -> GetStream();
char *t = new char[st -> GetSize() + 1]; char *t = new char[st -> GetSize() + 1];
st -> Read(t, st -> GetSize()); st -> Read(t, st -> GetSize());