Small change to ease Mac transition to common
native data printing code later. git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@30203 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -217,12 +217,11 @@ public:
|
|||||||
|
|
||||||
void operator=(const wxPrintData& data);
|
void operator=(const wxPrintData& data);
|
||||||
|
|
||||||
wxPrintNativeDataBase *GetNativeData() const { return m_nativeData; }
|
// Convert between wxPrintData and native data
|
||||||
|
|
||||||
#if defined(__WXMAC__)
|
|
||||||
void ConvertToNative();
|
void ConvertToNative();
|
||||||
void ConvertFromNative();
|
void ConvertFromNative();
|
||||||
#endif
|
// Holds the native print data
|
||||||
|
wxPrintNativeDataBase *GetNativeData() const { return m_nativeData; }
|
||||||
|
|
||||||
public:
|
public:
|
||||||
#if defined(__WXMAC__)
|
#if defined(__WXMAC__)
|
||||||
|
@@ -205,17 +205,23 @@ wxPrintData::~wxPrintData()
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
#ifdef __WXMAC__
|
|
||||||
void wxPrintData::ConvertToNative()
|
void wxPrintData::ConvertToNative()
|
||||||
{
|
{
|
||||||
|
#ifdef __WXMAC__
|
||||||
m_nativePrintData->TransferFrom( this ) ;
|
m_nativePrintData->TransferFrom( this ) ;
|
||||||
|
#else
|
||||||
|
m_nativeData->TransferFrom( *this ) ;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
void wxPrintData::ConvertFromNative()
|
void wxPrintData::ConvertFromNative()
|
||||||
{
|
{
|
||||||
|
#ifdef __WXMAC__
|
||||||
m_nativePrintData->TransferTo( this ) ;
|
m_nativePrintData->TransferTo( this ) ;
|
||||||
}
|
#else
|
||||||
|
m_nativeData->TransferTo( *this ) ;
|
||||||
#endif
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
void wxPrintData::operator=(const wxPrintData& data)
|
void wxPrintData::operator=(const wxPrintData& data)
|
||||||
{
|
{
|
||||||
|
Reference in New Issue
Block a user