X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d2b354f9c9f1473b2d6ff0ab643ebf57dcbfb656..824a614c4e5c2aeada7b065ce5fb0b3b760bb218:/src/common/cmndata.cpp

diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp
index 157e32eb14..5f75393a5e 100644
--- a/src/common/cmndata.cpp
+++ b/src/common/cmndata.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "cmndata.h"
 #endif
 
@@ -51,7 +51,7 @@
     #include <windowsx.h>
     #include "wx/msw/private.h"
 
-    #if defined(__WXWINCE__) && !wxUSE_SMARTPHONE
+    #ifndef __SMARTPHONE__
         #include <commdlg.h>
     #endif
 
@@ -213,6 +213,10 @@ wxPrintData::wxPrintData()
     m_printerTranslateX = 0;
     m_printerTranslateY = 0;
     m_printMode = wxPRINT_MODE_FILE;
+
+#ifdef wxUSE_STREAMS
+    m_outputstream = NULL;
+#endif
 }
 
 wxPrintData::wxPrintData(const wxPrintData& printData)
@@ -386,10 +390,8 @@ void wxPrintData::ConvertToNative()
 
         //// Collation
 
-#ifndef __WIN16__
         devMode->dmCollate = (m_printCollate ? DMCOLLATE_TRUE : DMCOLLATE_FALSE);
         devMode->dmFields |= DM_COLLATE;
-#endif
 
         //// Number of copies
 
@@ -512,7 +514,6 @@ void wxPrintData::ConvertFromNative()
 
         //// Collation
 
-#ifndef __WIN16__
         if (devMode->dmFields & DM_COLLATE)
         {
             if (devMode->dmCollate == DMCOLLATE_TRUE)
@@ -520,7 +521,6 @@ void wxPrintData::ConvertFromNative()
             else
                 m_printCollate = FALSE;
         }
-#endif
 
         //// Number of copies
 
@@ -712,6 +712,9 @@ void wxPrintData::operator=(const wxPrintData& data)
     m_printQuality = data.m_printQuality;
     m_paperId = data.m_paperId;
     m_paperSize = data.m_paperSize;
+#ifdef wxUSE_STREAMS
+    m_outputstream = data.m_outputstream;
+#endif
 
     // PostScript-specific data
     m_printerCommand = data.m_printerCommand;