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

reset preview bitmap variable to NULL after deleting it

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@10689 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Gilles Depeyrot
2001-06-27 19:44:56 +00:00
parent 0532484d0f
commit 9eee81a4cf
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/common/prntbase.cpp
View File

@@ -612,7 +612,8 @@ bool wxPrintPreviewBase::SetCurrentPage(int pageNum)
if (m_previewCanvas) if (m_previewCanvas)
{ {
RenderPage(pageNum); if (!RenderPage(pageNum))
return FALSE;
m_previewCanvas->Refresh(); m_previewCanvas->Refresh();
} }
return TRUE; return TRUE;
@@ -623,7 +624,8 @@ bool wxPrintPreviewBase::PaintPage(wxWindow *canvas, wxDC& dc)
DrawBlankPage(canvas, dc); DrawBlankPage(canvas, dc);
if (!m_previewBitmap) if (!m_previewBitmap)
RenderPage(m_currentPage); if (!RenderPage(m_currentPage))
return FALSE;
if (!m_previewBitmap) if (!m_previewBitmap)
return FALSE; return FALSE;
@@ -682,8 +684,10 @@ bool wxPrintPreviewBase::RenderPage(int pageNum)
m_previewBitmap = new wxBitmap((int)actualWidth, (int)actualHeight); m_previewBitmap = new wxBitmap((int)actualWidth, (int)actualHeight);
if (!m_previewBitmap || !m_previewBitmap->Ok()) if (!m_previewBitmap || !m_previewBitmap->Ok())
{ {
if (m_previewBitmap) if (m_previewBitmap) {
delete m_previewBitmap; delete m_previewBitmap;
m_previewBitmap = NULL;
}
wxMessageBox(_("Sorry, not enough memory to create a preview."), _("Print Preview Failure"), wxOK); wxMessageBox(_("Sorry, not enough memory to create a preview."), _("Print Preview Failure"), wxOK);
return FALSE; return FALSE;
} }
@@ -713,6 +717,7 @@ bool wxPrintPreviewBase::RenderPage(int pageNum)
memoryDC.SelectObject(wxNullBitmap); memoryDC.SelectObject(wxNullBitmap);
delete m_previewBitmap; delete m_previewBitmap;
m_previewBitmap = NULL;
return FALSE; return FALSE;
} }