AuroraMiddleware/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Applied [ 872574 ] fix of fatal error of preview without printer

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@25090 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Julian Smart 2004-01-08 08:29:59 +00:00
parent 7d5ae6695b
commit 3f8b4a3fbe
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/common/docview.cpp
View File

@ -953,6 +953,12 @@ void wxDocManager::OnPreview(wxCommandEvent& WXUNUSED(event))
{ {
// Pass two printout objects: for preview, and possible printing. // Pass two printout objects: for preview, and possible printing.
wxPrintPreviewBase *preview = new wxPrintPreview(printout, view->OnCreatePrintout()); wxPrintPreviewBase *preview = new wxPrintPreview(printout, view->OnCreatePrintout());
if ( !preview->Ok() )
{
delete preview;
wxMessageBox( _("Sorry, print preview needs a printer to be installed.") );
return;
}
wxPreviewFrame *frame = new wxPreviewFrame(preview, (wxFrame *)wxTheApp->GetTopWindow(), _("Print Preview"), wxPreviewFrame *frame = new wxPreviewFrame(preview, (wxFrame *)wxTheApp->GetTopWindow(), _("Print Preview"),
wxPoint(100, 100), wxSize(600, 650)); wxPoint(100, 100), wxSize(600, 650));

13
src/msw/dcprint.cpp
View File

@ -309,15 +309,10 @@ WXHDC WXDLLEXPORT wxGetPrinterDC(const wxPrintData& printDataConst)
{ {
// Retrieve the default device name // Retrieve the default device name
wxString portName; wxString portName;
#ifdef __WXDEBUG__ if ( !wxGetDefaultDeviceName(devNameStr, portName) )
bool ret = {
#else // !Debug return 0; // Could not get default device name
(void) }
#endif // Debug/Release
wxGetDefaultDeviceName(devNameStr, portName);
wxASSERT_MSG( ret, wxT("Could not get default device name.") );
deviceName = devNameStr.c_str(); deviceName = devNameStr.c_str();
} }