Next phase of Print Factory code.
Created a mini interface so that the generic wxPrintDialog can show a "printer" and a "status" line if the print factory wants this to be the case. Moved some code (print mode) back from the PostScript only print data to the general print data since it is sort of general. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30101 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1801,10 +1801,7 @@ bool wxPostScriptDC::StartDoc( const wxString& message )
|
||||
{
|
||||
wxCHECK_MSG( m_ok, false, wxT("invalid postscript dc") );
|
||||
|
||||
wxPostScriptPrintNativeData *data =
|
||||
(wxPostScriptPrintNativeData *) m_printData.GetNativeData();
|
||||
|
||||
if (data->GetPrintMode() != wxPRINT_MODE_STREAM )
|
||||
if (m_printData.GetPrintMode() != wxPRINT_MODE_STREAM )
|
||||
{
|
||||
if (m_printData.GetFilename() == wxEmptyString)
|
||||
{
|
||||
@@ -1971,7 +1968,7 @@ void wxPostScriptDC::EndDoc ()
|
||||
wxPostScriptPrintNativeData *data =
|
||||
(wxPostScriptPrintNativeData *) m_printData.GetNativeData();
|
||||
|
||||
if (m_ok && (data->GetPrintMode() == wxPRINT_MODE_PRINTER))
|
||||
if (m_ok && (m_printData.GetPrintMode() == wxPRINT_MODE_PRINTER))
|
||||
{
|
||||
wxString command;
|
||||
command += data->GetPrinterCommand();
|
||||
@@ -2480,8 +2477,8 @@ void wxPostScriptDC::PsPrint( const char* psdata )
|
||||
{
|
||||
wxPostScriptPrintNativeData *data =
|
||||
(wxPostScriptPrintNativeData *) m_printData.GetNativeData();
|
||||
|
||||
switch(data->GetPrintMode())
|
||||
|
||||
switch (m_printData.GetPrintMode())
|
||||
{
|
||||
#if wxUSE_STREAMS
|
||||
// append to output stream
|
||||
@@ -2505,8 +2502,8 @@ void wxPostScriptDC::PsPrint( int ch )
|
||||
{
|
||||
wxPostScriptPrintNativeData *data =
|
||||
(wxPostScriptPrintNativeData *) m_printData.GetNativeData();
|
||||
|
||||
switch (data->GetPrintMode())
|
||||
|
||||
switch (m_printData.GetPrintMode())
|
||||
{
|
||||
#if wxUSE_STREAMS
|
||||
// append to output stream
|
||||
|
Reference in New Issue
Block a user