Renamed wxPrintNativeData methods to better match

those of the preexisting wxMac class. This should
    make transition of the wxMac classes to the new
    wxPrintNativeData classes easier.
  Renamed wxWindowsPrintNativeData to a proper name
    that is less confusing (GetNativeData -> GetDevMode).


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@29956 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2004-10-17 23:00:41 +00:00
parent 3692b33c7f
commit fd64de596c
8 changed files with 52 additions and 54 deletions

View File

@@ -113,12 +113,12 @@ wxPostScriptPrintNativeData::~wxPostScriptPrintNativeData()
{
}
bool wxPostScriptPrintNativeData::ConvertTo( wxPrintData &data )
bool wxPostScriptPrintNativeData::TransferTo( wxPrintData &data )
{
return true;
}
bool wxPostScriptPrintNativeData::ConvertFrom( const wxPrintData &data )
bool wxPostScriptPrintNativeData::TransferFrom( const wxPrintData &data )
{
return true;
}
@@ -253,18 +253,16 @@ int wxGenericPrintDialog::ShowModal()
// present, but there might be in future.
// TransferDataFromWindow();
wxGenericPrintSetupDialog *genericPrintSetupDialog =
new wxGenericPrintSetupDialog(this, & m_printDialogData.GetPrintData());
int ret = genericPrintSetupDialog->ShowModal();
if ( ret != wxID_CANCEL )
wxGenericPrintSetupDialog genericPrintSetupDialog( this, &m_printDialogData.GetPrintData() );
int ret = genericPrintSetupDialog.ShowModal();
if (ret != wxID_CANCEL)
{
// Transfer settings to the print dialog's print data.
m_printDialogData.GetPrintData() = genericPrintSetupDialog->GetPrintData();
m_printDialogData.GetPrintData() = genericPrintSetupDialog.GetPrintData();
}
// genericPrintSetupDialog->Destroy();
// Restore the wxPrintData settings again (uncomment if any settings become common
// to both dialogs)
// Restore the wxPrintData settings again (uncomment if any settings become
// common to both dialogs)
// TransferDataToWindow();
return ret;