Implemented flat toolbars

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

diff --git a/src/generic/prntdlgg.cpp b/src/generic/prntdlgg.cpp
index 6270c0f62f811b2ec1cc103b762bc68147cd7ffd..45682912d36f105755d839a4a5444745afefca2b 100644 (file)
--- a/src/generic/prntdlgg.cpp
+++ b/src/generic/prntdlgg.cpp
@@ -242,7 +242,10 @@ void wxGenericPrintDialog::OnOK(wxCommandEvent& WXUNUSED(event))
         wxThePrintSetupData->SetPrinterFile(f);
     }
     else
+    {
+        m_printDialogData.GetPrintData().SetPrintMode(wxPRINT_MODE_PRINTER);
         wxThePrintSetupData->SetPrinterMode(wxPRINT_MODE_PRINTER);
+    }
 
     EndModal(wxID_OK);
 }
@@ -265,6 +268,7 @@ void wxGenericPrintDialog::OnRange(wxCommandEvent& event)
 
 void wxGenericPrintDialog::OnSetup(wxCommandEvent& WXUNUSED(event))
 {
+   *wxThePrintSetupData = m_printDialogData.GetPrintData();
     wxGenericPrintSetupDialog *genericPrintSetupDialog =
         new wxGenericPrintSetupDialog(this, wxThePrintSetupData);
     int ret = genericPrintSetupDialog->ShowModal();
@@ -354,7 +358,8 @@ TODO: collate and noCopies should be duplicated across dialog data and print dat
 
 wxDC *wxGenericPrintDialog::GetPrintDC()
 {
-    return new wxPostScriptDC(wxThePrintSetupData->GetPrinterFile(), FALSE, (wxWindow *) NULL);
+  //    return new wxPostScriptDC(wxThePrintSetupData->GetPrinterFile(), FALSE, (wxWindow *) NULL);
+  return new wxPostScriptDC(GetPrintDialogData().GetPrintData());
 }
 
 // ----------------------------------------------------------------------------