wxHtmlEasyPrinting now uses wxThePrintSetupData - creates local copy

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@4077 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/html/htmprint.cpp b/src/html/htmprint.cpp
index 3131e908b092894da744618f3977a034d7341a28..4565f6cb85420d3544b2d7f287b8f60a056c8cb3 100644 (file)
--- a/src/html/htmprint.cpp
+++ b/src/html/htmprint.cpp
@@ -405,16 +405,13 @@ wxHtmlEasyPrinting::wxHtmlEasyPrinting(const wxString& name, wxFrame *parent_fra
     m_Frame = parent_frame;
     m_Name = name;
     m_PrintData = new wxPrintData;
+    (*m_PrintData) = (*wxThePrintSetupData);
     m_PageSetupData = new wxPageSetupDialogData;
     m_Headers[0] = m_Headers[1] = m_Footers[0] = m_Footers[1] = wxEmptyString;
     
     m_PageSetupData -> EnableMargins(TRUE);
     m_PageSetupData -> SetMarginTopLeft(wxPoint(25, 25));    
     m_PageSetupData -> SetMarginBottomRight(wxPoint(25, 25));
-
-#if defined(__WXGTK__) || defined(__WXMOTIF__)
-    m_PrintData -> SetPrinterCommand("lpr");
-#endif
 }