X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/d14612c6621bf7dd9c711e2f94856137b926e863..c7abc967cda4ca459214626c1f3592e1ac363f81:/src/generic/prntdlgg.cpp

diff --git a/src/generic/prntdlgg.cpp b/src/generic/prntdlgg.cpp
index 3602295dab..10ab2dcf48 100644
--- a/src/generic/prntdlgg.cpp
+++ b/src/generic/prntdlgg.cpp
@@ -113,6 +113,11 @@ wxGenericPrintDialog::wxGenericPrintDialog(wxWindow *parent,
 
 wxGenericPrintDialog::wxGenericPrintDialog(wxWindow *parent,
                                            wxPrintData* data)
+                    : wxDialog(parent, -1, _("Print"),
+                               wxPoint(0, 0), wxSize(600, 600),
+                               wxDEFAULT_DIALOG_STYLE |
+                               wxDIALOG_MODAL |
+                               wxTAB_TRAVERSAL)
 {
     if ( data )
         m_printDialogData = *data;
@@ -120,10 +125,10 @@ wxGenericPrintDialog::wxGenericPrintDialog(wxWindow *parent,
     Init(parent);
 }
 
-void wxGenericPrintDialog::Init(wxWindow *parent)
+void wxGenericPrintDialog::Init(wxWindow * WXUNUSED(parent))
 {
-    wxDialog::Create(parent, -1, _("Print"), wxPoint(0, 0), wxSize(600, 600),
-                     wxDEFAULT_DIALOG_STYLE | wxDIALOG_MODAL | wxTAB_TRAVERSAL);
+  //    wxDialog::Create(parent, -1, _("Print"), wxPoint(0, 0), wxSize(600, 600),
+  //                     wxDEFAULT_DIALOG_STYLE | wxDIALOG_MODAL | wxTAB_TRAVERSAL);
 
     (void)new wxStaticBox( this, -1, _( "Printer options" ), wxPoint( 5, 5), wxSize( 300, 60 ) );
 
@@ -137,7 +142,8 @@ void wxGenericPrintDialog::Init(wxWindow *parent)
 
     m_fromText = (wxTextCtrl*)NULL;
     m_toText = (wxTextCtrl*)NULL;
-
+    m_rangeRadioBox = (wxRadioBox *)NULL;
+    
     if (m_printDialogData.GetFromPage() != 0)
     {
         m_rangeRadioBox = new wxRadioBox(this, wxPRINTID_RANGE, _("Print Range"),
@@ -228,7 +234,7 @@ void wxGenericPrintDialog::OnOK(wxCommandEvent& WXUNUSED(event))
         wxString f = wxFileSelector(_("PostScript file"),
             wxPathOnly(wxThePrintSetupData->GetPrinterFile()),
             wxFileNameFromPath(wxThePrintSetupData->GetPrinterFile()),
-            "ps", "*.ps", 0, this);
+            _T("ps"), _T("*.ps"), 0, this);
         if ( f.IsEmpty() )
             return;
 
@@ -236,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);
 }
@@ -259,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();
@@ -287,17 +297,21 @@ bool wxGenericPrintDialog::TransferDataToWindow()
              m_fromText->SetValue(buf);
              sprintf(buf, "%d", m_printDialogData.GetToPage());
              m_toText->SetValue(buf);
-             if (m_printDialogData.GetAllPages())
-                m_rangeRadioBox->SetSelection(0);
-             else
-                m_rangeRadioBox->SetSelection(1);
+             if(m_rangeRadioBox)
+                if (m_printDialogData.GetAllPages())
+                   m_rangeRadioBox->SetSelection(0);
+                else
+                   m_rangeRadioBox->SetSelection(1);
           }
           else
           {
              m_fromText->Enable(FALSE);
              m_toText->Enable(FALSE);
-             m_rangeRadioBox->SetSelection(0);
-             m_rangeRadioBox->wxRadioBox::Enable(1, FALSE);
+             if(m_rangeRadioBox)
+             {
+                m_rangeRadioBox->SetSelection(0);
+                m_rangeRadioBox->wxRadioBox::Enable(1, FALSE);
+             }
           }
        }
     }
@@ -315,20 +329,23 @@ bool wxGenericPrintDialog::TransferDataFromWindow()
     {
         if (m_printDialogData.GetEnablePageNumbers())
         {
-           if(m_fromText) m_printDialogData.SetFromPage(atoi(m_fromText->GetValue()));
-           if(m_toText)   m_printDialogData.SetToPage(atoi(m_toText->GetValue()));
+           if(m_fromText) m_printDialogData.SetFromPage(wxAtoi(m_fromText->GetValue()));
+           if(m_toText)   m_printDialogData.SetToPage(wxAtoi(m_toText->GetValue()));
+        }
+        if(m_rangeRadioBox)
+        {
+           if (m_rangeRadioBox->GetSelection() == 0)
+              m_printDialogData.SetAllPages(TRUE);
+           else
+              m_printDialogData.SetAllPages(FALSE);
         }
-        if (m_rangeRadioBox->GetSelection() == 0)
-            m_printDialogData.SetAllPages(TRUE);
-        else
-            m_printDialogData.SetAllPages(FALSE);
     }
     else
     { // continuous printing
         m_printDialogData.SetFromPage(1);
         m_printDialogData.SetToPage(32000);
     }
-    m_printDialogData.SetNoCopies(atoi(m_noCopiesText->GetValue()));
+    m_printDialogData.SetNoCopies(wxAtoi(m_noCopiesText->GetValue()));
     m_printDialogData.SetPrintToFile(m_printToFileCheckBox->GetValue());
 
     return TRUE;
@@ -341,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());
 }
 
 // ----------------------------------------------------------------------------
@@ -677,9 +695,9 @@ bool wxGenericPageSetupDialog::TransferDataToWindow()
 bool wxGenericPageSetupDialog::TransferDataFromWindow()
 {
     if (m_marginLeftText && m_marginTopText)
-        m_pageData.SetMarginTopLeft(wxPoint(atoi((const char *)m_marginLeftText->GetValue()),atoi((const char *)m_marginTopText->GetValue())));
+        m_pageData.SetMarginTopLeft(wxPoint(wxAtoi((const wxChar *)m_marginLeftText->GetValue()),wxAtoi((const wxChar *)m_marginTopText->GetValue())));
     if (m_marginRightText && m_marginBottomText)
-        m_pageData.SetMarginBottomRight(wxPoint(atoi((const char *)m_marginRightText->GetValue()),atoi((const char *)m_marginBottomText->GetValue())));
+        m_pageData.SetMarginBottomRight(wxPoint(wxAtoi((const wxChar *)m_marginRightText->GetValue()),wxAtoi((const wxChar *)m_marginBottomText->GetValue())));
 
     if (m_orientationRadioBox)
     {