increase worst case for UTF8 to *4

[wxWidgets.git] / src / common / cmndata.cpp

diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp
index 9779d87fdb0a9820ce422018b0b0fcf92ae6417b..a37373c110b08f53f22777343aebc58894d6cac4 100644 (file)
--- a/src/common/cmndata.cpp
+++ b/src/common/cmndata.cpp
@@ -49,7 +49,7 @@
     #include "wx/paper.h"
 #endif // wxUSE_PRINTING_ARCHITECTURE
 
-#ifdef __WXMSW__
+#if defined(__WXMSW__) && !defined(__PALMOS__)
     #include <windowsx.h>
     #include "wx/msw/private.h"
 
@@ -171,6 +171,7 @@ wxPrintData::wxPrintData()
     m_nativePrintData = wxNativePrintData::Create() ;
 #endif
     m_bin = wxPRINTBIN_DEFAULT;
+    m_printMode = wxPRINT_MODE_PRINTER;
     m_printOrientation = wxPORTRAIT;
     m_printNoCopies = 1;
     m_printCollate = false;
@@ -228,6 +229,8 @@ void wxPrintData::operator=(const wxPrintData& data)
     m_paperId = data.m_paperId;
     m_paperSize = data.m_paperSize;
     m_bin = data.m_bin;
+    m_printMode = data.m_printMode;
+    m_filename = data.m_filename;   
     
     m_nativeData = data.GetNativeData();
     m_nativeData->m_ref++;
@@ -265,7 +268,10 @@ wxPrintDialogData::wxPrintDialogData()
     m_printSelection = false;
     m_printEnableSelection = false;
     m_printEnablePageNumbers = true;
-    m_printEnablePrintToFile = true;
+    
+    wxPrintFactory* factory = wxPrintFactory::GetFactory();
+    m_printEnablePrintToFile = ! factory->HasOwnPrintToFile();
+    
     m_printEnableHelp = false;
     m_printSetupDialog = false;
 }