Added Ok() member for print data, print dialog, page dialog, page dialog data
so we can test in advance whether the print/page setup dialogs will fail. Removed assertions that would fire if the default printer was not found, for example. Added call to Ok() from HTML print code with suitable error message. Commented out my erroneous fix to wxStaticText. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@15438 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -543,6 +543,13 @@ void wxHtmlEasyPrinting::PrinterSetup()
|
||||
|
||||
void wxHtmlEasyPrinting::PageSetup()
|
||||
{
|
||||
if (!m_PrintData->Ok())
|
||||
{
|
||||
wxMessageBox(_("Sorry, there was a problem: you may need to set a default printer."),
|
||||
_("Page Setup Problem"), wxICON_INFORMATION|wxOK, m_Frame);
|
||||
return;
|
||||
}
|
||||
|
||||
m_PageSetupData->SetPrintData(*m_PrintData);
|
||||
wxPageSetupDialog pageSetupDialog(m_Frame, m_PageSetupData);
|
||||
|
||||
|
Reference in New Issue
Block a user