Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

moving wxMac to new printing architecture

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@33242 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2005-04-01 16:36:36 +00:00
parent 54c5498d0f
commit dc7ccb9c5d
8 changed files with 116 additions and 541 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
src/common/cmndata.cpp
View File

@@ -158,9 +158,6 @@ wxFontDialogBase::~wxFontDialogBase()
wxPrintData::wxPrintData()
{
#ifdef __WXMAC__
m_nativePrintData = wxNativePrintData::Create() ;
#endif
m_bin = wxPRINTBIN_DEFAULT;
m_printMode = wxPRINT_MODE_PRINTER;
m_printOrientation = wxPORTRAIT;
@@ -212,28 +209,16 @@ wxPrintData::~wxPrintData()
if (m_privData)
delete [] m_privData;
#ifdef __WXMAC__
delete m_nativePrintData ;
#endif
}
void wxPrintData::ConvertToNative()
{
#ifdef __WXMAC__
m_nativePrintData->TransferFrom( this ) ;
#else
m_nativeData->TransferFrom( *this ) ;
#endif
}
void wxPrintData::ConvertFromNative()
{
#ifdef __WXMAC__
m_nativePrintData->TransferTo( this ) ;
#else
m_nativeData->TransferTo( *this ) ;
#endif
}
void wxPrintData::operator=(const wxPrintData& data)
@@ -273,10 +258,6 @@ void wxPrintData::operator=(const wxPrintData& data)
m_privData = new char[m_privDataLen];
memcpy( m_privData, data.GetPrivData(), m_privDataLen );
}
#ifdef __WXMAC__
m_nativePrintData->CopyFrom( data.m_nativePrintData ) ;
#endif
}
// Is this data OK for showing the print dialog?
@@ -510,23 +491,6 @@ wxPrintDialogData::~wxPrintDialogData()
{
}
#ifdef __WXMAC__
void wxPrintDialogData::ConvertToNative()
{
m_printData.ConvertToNative();
m_printData.m_nativePrintData->TransferFrom( this ) ;
}
void wxPrintDialogData::ConvertFromNative()
{
m_printData.ConvertFromNative();
m_printData.m_nativePrintData->TransferTo( this ) ;
}
#endif
void wxPrintDialogData::operator=(const wxPrintDialogData& data)
{
m_printFromPage = data.m_printFromPage;
@@ -640,36 +604,6 @@ wxPageSetupDialogData& wxPageSetupDialogData::operator=(const wxPrintData& data)
return *this;
}
#ifdef __WXMAC__
void wxPageSetupDialogData::ConvertToNative()
{
m_printData.ConvertToNative();
m_printData.m_nativePrintData->TransferFrom( this ) ;
}
void wxPageSetupDialogData::ConvertFromNative()
{
m_printData.ConvertFromNative ();
m_paperSize = m_printData.GetPaperSize() ;
CalculateIdFromPaperSize();
m_printData.m_nativePrintData->TransferTo( this ) ;
// adjust minimal values
if ( m_marginTopLeft.x < m_minMarginTopLeft.x )
m_marginTopLeft.x = m_minMarginTopLeft.x;
if ( m_marginBottomRight.x < m_minMarginBottomRight.x )
m_marginBottomRight.x = m_minMarginBottomRight.x;
if ( m_marginTopLeft.y < m_minMarginTopLeft.y )
m_marginTopLeft.y = m_minMarginTopLeft.y;
if ( m_marginBottomRight.y < m_minMarginBottomRight.y )
m_marginBottomRight.y = m_minMarginBottomRight.y;
}
#endif
// If a corresponding paper type is found in the paper database, will set the m_printData
// paper size id member as well.
void wxPageSetupDialogData::SetPaperSize(const wxSize& sz)