do take the toolbar into account for Windows CE, otherwise the menus overlap with...

[wxWidgets.git] / src / generic / dcpsg.cpp

diff --git a/src/generic/dcpsg.cpp b/src/generic/dcpsg.cpp
index ed4bf8e189706d79f894bb6e5f9fd8bbdb70646d..0cfafaaabc6b3425ddfe58fc444ddd907eec05f3 100644 (file)
--- a/src/generic/dcpsg.cpp
+++ b/src/generic/dcpsg.cpp
@@ -1011,6 +1011,10 @@ void wxPostScriptDC::SetFont( const wxFont& font )
         }
     }
 
+    // We may legitimately call SetFont before BeginDoc
+    if (!m_pstream)
+        return;
+    
     PsPrint( name );
     PsPrint( " reencodeISO def\n" );
     PsPrint( name );
@@ -1775,7 +1779,7 @@ bool wxPostScriptDC::StartDoc( const wxString& message )
 {
     wxCHECK_MSG( m_ok, FALSE, wxT("invalid postscript dc") );
 
-    if ( m_printData.GetPrintMode() == wxPRINT_MODE_FILE )
+    if ( m_printData.GetPrintMode() != wxPRINT_MODE_STREAM )
     {
         if (m_printData.GetFilename() == wxT(""))
         {