Applied patch [ 603104 ] wxX11 wxClientDC, wxPaintDC fix

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

diff --git a/src/generic/prntdlgg.cpp b/src/generic/prntdlgg.cpp
index 75ce62c8e36b9a2c748f06df96123b4d508b43fa..6f4584b82a70ccdae0ff10192c306f26d14ddd1b 100644 (file)
--- a/src/generic/prntdlgg.cpp
+++ b/src/generic/prntdlgg.cpp
@@ -46,6 +46,7 @@
     #include "wx/combobox.h"
     #include "wx/intl.h"
     #include "wx/sizer.h"
     #include "wx/combobox.h"
     #include "wx/intl.h"
     #include "wx/sizer.h"

+    #include "wx/cmndata.h"

 #endif
 
 #if wxUSE_STATLINE
 #endif
 
 #if wxUSE_STATLINE


@@ -60,6 +61,7 @@
 
 #include "wx/printdlg.h"
 #include "wx/paper.h"
 
 #include "wx/printdlg.h"
 #include "wx/paper.h"

+#include "wx/filename.h"

 
 // For print paper things
 #include "wx/prntbase.h"
 
 // For print paper things
 #include "wx/prntbase.h"


@@ -99,10 +101,6 @@ extern wxPrintPaperDatabase *wxThePrintPaperDatabase;
 
 #if wxUSE_POSTSCRIPT
 
 
 #if wxUSE_POSTSCRIPT
 

-// ============================================================================
-// implementation
-// ============================================================================
-

 // ----------------------------------------------------------------------------
 // Generic print dialog for non-Windows printing use.
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // Generic print dialog for non-Windows printing use.
 // ----------------------------------------------------------------------------


@@ -174,7 +172,7 @@ void wxGenericPrintDialog::Init(wxWindow * WXUNUSED(parent))
                                          1, wxRA_VERTICAL);
         m_rangeRadioBox->SetSelection(1);
        
                                          1, wxRA_VERTICAL);
         m_rangeRadioBox->SetSelection(1);
        

-       mainsizer->Add( m_rangeRadioBox, 0, wxLEFT|wxTOP|wxRIGHT, 10 );
+        mainsizer->Add( m_rangeRadioBox, 0, wxLEFT|wxTOP|wxRIGHT, 10 );

     }
 
     // 3) bottom row
     }
 
     // 3) bottom row


@@ -185,11 +183,11 @@ void wxGenericPrintDialog::Init(wxWindow * WXUNUSED(parent))
     {
         bottomsizer->Add( new wxStaticText(this, wxPRINTID_STATIC, _("From:") ), 0, wxCENTER|wxALL, 5 );
         m_fromText = new wxTextCtrl(this, wxPRINTID_FROM, "", wxDefaultPosition, wxSize(40, -1));
     {
         bottomsizer->Add( new wxStaticText(this, wxPRINTID_STATIC, _("From:") ), 0, wxCENTER|wxALL, 5 );
         m_fromText = new wxTextCtrl(this, wxPRINTID_FROM, "", wxDefaultPosition, wxSize(40, -1));

-       bottomsizer->Add( m_fromText, 1, wxCENTER|wxRIGHT, 10 );
+        bottomsizer->Add( m_fromText, 1, wxCENTER|wxRIGHT, 10 );

 
         bottomsizer->Add( new wxStaticText(this, wxPRINTID_STATIC, _("To:") ), 0, wxCENTER|wxALL, 5);
         m_toText = new wxTextCtrl(this, wxPRINTID_TO, "", wxDefaultPosition, wxSize(40, -1));
 
         bottomsizer->Add( new wxStaticText(this, wxPRINTID_STATIC, _("To:") ), 0, wxCENTER|wxALL, 5);
         m_toText = new wxTextCtrl(this, wxPRINTID_TO, "", wxDefaultPosition, wxSize(40, -1));

-       bottomsizer->Add( m_toText, 1, wxCENTER|wxRIGHT, 10 );
+        bottomsizer->Add( m_toText, 1, wxCENTER|wxRIGHT, 10 );

     }
 
     bottomsizer->Add( new wxStaticText(this, wxPRINTID_STATIC, _("Copies:") ), 0, wxCENTER|wxALL, 5 );
     }
 
     bottomsizer->Add( new wxStaticText(this, wxPRINTID_STATIC, _("Copies:") ), 0, wxCENTER|wxALL, 5 );


@@ -232,9 +230,7 @@ int wxGenericPrintDialog::ShowModal()
         int ret = genericPrintSetupDialog->ShowModal();
         if ( ret != wxID_CANCEL )
         {
         int ret = genericPrintSetupDialog->ShowModal();
         if ( ret != wxID_CANCEL )
         {

-            // Transfer settings to the global object (for compatibility) and to
-            // the print dialog's print data.
-            *wxThePrintSetupData = genericPrintSetupDialog->GetPrintData();
+            // Transfer settings to  the print dialog's print data.

             m_printDialogData.GetPrintData() = genericPrintSetupDialog->GetPrintData();
         }
         genericPrintSetupDialog->Destroy();
             m_printDialogData.GetPrintData() = genericPrintSetupDialog->GetPrintData();
         }
         genericPrintSetupDialog->Destroy();


@@ -266,22 +262,18 @@ void wxGenericPrintDialog::OnOK(wxCommandEvent& WXUNUSED(event))
     if (m_printDialogData.GetPrintToFile())
     {
         m_printDialogData.GetPrintData().SetPrintMode(wxPRINT_MODE_FILE);
     if (m_printDialogData.GetPrintToFile())
     {
         m_printDialogData.GetPrintData().SetPrintMode(wxPRINT_MODE_FILE);

-        wxThePrintSetupData->SetPrinterMode(wxPRINT_MODE_FILE);
-
-        wxString f = wxFileSelector(_("PostScript file"),
-            wxPathOnly(wxThePrintSetupData->GetPrinterFile()),
-            wxFileNameFromPath(wxThePrintSetupData->GetPrinterFile()),
-            wxT("ps"), wxT("*.ps"), 0, this);
-        if ( f.IsEmpty() )
-            return;
+        
+        wxFileName fname( m_printDialogData.GetPrintData().GetFilename() );
+        
+        wxFileDialog dialog( this, _("PostScript file"),
+            fname.GetPath(), fname.GetFullName(), wxT("*.ps"), wxOPEN | wxOVERWRITE_PROMPT );
+        if (dialog.ShowModal() != wxID_OK) return;

 
 

-        m_printDialogData.GetPrintData().SetFilename(f);
-        wxThePrintSetupData->SetPrinterFile(f);
+        m_printDialogData.GetPrintData().SetFilename( dialog.GetPath() );

     }
     else
     {
         m_printDialogData.GetPrintData().SetPrintMode(wxPRINT_MODE_PRINTER);
     }
     else
     {
         m_printDialogData.GetPrintData().SetPrintMode(wxPRINT_MODE_PRINTER);

-        wxThePrintSetupData->SetPrinterMode(wxPRINT_MODE_PRINTER);

     }
 
     EndModal(wxID_OK);
     }
 
     EndModal(wxID_OK);


@@ -305,17 +297,11 @@ void wxGenericPrintDialog::OnRange(wxCommandEvent& event)
 
 void wxGenericPrintDialog::OnSetup(wxCommandEvent& WXUNUSED(event))
 {
 
 void wxGenericPrintDialog::OnSetup(wxCommandEvent& WXUNUSED(event))
 {

-   *wxThePrintSetupData = m_printDialogData.GetPrintData();
-    wxGenericPrintSetupDialog *genericPrintSetupDialog =
-        new wxGenericPrintSetupDialog(this, wxThePrintSetupData);
-    int ret = genericPrintSetupDialog->ShowModal();
-    if ( ret != wxID_CANCEL )
+    wxGenericPrintSetupDialog dialog( this, &m_printDialogData.GetPrintData() );
+    if (dialog.ShowModal() != wxID_CANCEL)

     {
     {

-        *wxThePrintSetupData = genericPrintSetupDialog->GetPrintData();
-        m_printDialogData = genericPrintSetupDialog->GetPrintData();
+        m_printDialogData = dialog.GetPrintData();

     }
     }

-
-    genericPrintSetupDialog->Close(TRUE);

 }
 
 bool wxGenericPrintDialog::TransferDataToWindow()
 }
 
 bool wxGenericPrintDialog::TransferDataToWindow()


@@ -422,19 +408,6 @@ wxDialog(parent, -1, _("Print Setup"), wxPoint(0, 0), wxSize(600, 600), wxDEFAUL
     Init(data);
 }
 
     Init(data);
 }
 

-// Convert wxPrintSetupData to standard wxPrintData object
-wxGenericPrintSetupDialog::wxGenericPrintSetupDialog(wxWindow *parent, wxPrintSetupData* data):
-wxDialog(parent, -1, _("Print Setup"), wxPoint(0, 0), wxSize(600, 600), wxDEFAULT_DIALOG_STYLE|wxDIALOG_MODAL|wxTAB_TRAVERSAL)
-{
-    wxPrintData printData;
-    if (data)
-        printData = * data;
-    else
-        printData = * wxThePrintSetupData;
-
-    Init(& printData);
-}
-

 void wxGenericPrintSetupDialog::Init(wxPrintData* data)
 {
     if ( data )
 void wxGenericPrintSetupDialog::Init(wxPrintData* data)
 {
     if ( data )


@@ -481,7 +454,7 @@ void wxGenericPrintSetupDialog::Init(wxPrintData* data)
 
     okButton->SetDefault();
     okButton->SetFocus();
 
     okButton->SetDefault();
     okButton->SetFocus();

-
+    

     Fit();
     Centre(wxBOTH);
 
     Fit();
     Centre(wxBOTH);
 


@@ -535,8 +508,6 @@ bool wxGenericPrintSetupDialog::TransferDataFromWindow()
             m_printData.SetPaperId(wxThePrintPaperDatabase->ConvertNameToId(val));
     }
 
             m_printData.SetPaperId(wxThePrintPaperDatabase->ConvertNameToId(val));
     }
 

-    // This is for backward compatibility only
-    *wxThePrintSetupData = GetPrintData();

     return TRUE;
 }
 
     return TRUE;
 }
 


@@ -755,32 +726,35 @@ bool wxGenericPageSetupDialog::TransferDataToWindow()
 bool wxGenericPageSetupDialog::TransferDataFromWindow()
 {
     if (m_marginLeftText && m_marginTopText)
 bool wxGenericPageSetupDialog::TransferDataFromWindow()
 {
     if (m_marginLeftText && m_marginTopText)

-        m_pageData.SetMarginTopLeft(wxPoint(wxAtoi((const wxChar *)m_marginLeftText->GetValue()),wxAtoi((const wxChar *)m_marginTopText->GetValue())));
+    {
+        int left = wxAtoi( m_marginLeftText->GetValue().c_str() );
+        int top = wxAtoi( m_marginTopText->GetValue().c_str() );
+        m_pageData.SetMarginTopLeft( wxPoint(left,top) );
+    }

     if (m_marginRightText && m_marginBottomText)
     if (m_marginRightText && m_marginBottomText)

-        m_pageData.SetMarginBottomRight(wxPoint(wxAtoi((const wxChar *)m_marginRightText->GetValue()),wxAtoi((const wxChar *)m_marginBottomText->GetValue())));
+    {
+        int right = wxAtoi( m_marginRightText->GetValue().c_str() );
+        int bottom = wxAtoi( m_marginBottomText->GetValue().c_str() );
+        m_pageData.SetMarginBottomRight( wxPoint(right,bottom) );
+    }

 
     if (m_orientationRadioBox)
     {
         int sel = m_orientationRadioBox->GetSelection();
         if (sel == 0)
         {
 
     if (m_orientationRadioBox)
     {
         int sel = m_orientationRadioBox->GetSelection();
         if (sel == 0)
         {

-#if wxUSE_POSTSCRIPT
-            wxThePrintSetupData->SetPrinterOrientation(wxPORTRAIT);
-#endif

             m_pageData.GetPrintData().SetOrientation(wxPORTRAIT);
         }
         else
         {
             m_pageData.GetPrintData().SetOrientation(wxPORTRAIT);
         }
         else
         {

-#if wxUSE_POSTSCRIPT
-            wxThePrintSetupData->SetPrinterOrientation(wxLANDSCAPE);
-#endif

             m_pageData.GetPrintData().SetOrientation(wxLANDSCAPE);
         }
     }
             m_pageData.GetPrintData().SetOrientation(wxLANDSCAPE);
         }
     }

+    

     if (m_paperTypeChoice)
     {
         wxString val(m_paperTypeChoice->GetStringSelection());
     if (m_paperTypeChoice)
     {
         wxString val(m_paperTypeChoice->GetStringSelection());

-        if (!val.IsNull() && val != "")
+        if (!val.IsEmpty())

         {
             wxPrintPaperType* paper = wxThePrintPaperDatabase->FindPaperType(val);
             if ( paper )
         {
             wxPrintPaperType* paper = wxThePrintPaperDatabase->FindPaperType(val);
             if ( paper )


@@ -828,3 +802,4 @@ wxComboBox *wxGenericPageSetupDialog::CreatePaperTypeChoice(int *x, int *y)
 }
 
 #endif
 }
 
 #endif

+