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

Add PrivData() field to wxPrintData since MSW's printer

Browse Source 
sometimes seem to save data in an extra field. The
    original author of the patch chose to save it in char*
    so I kept that, although void* would probably be correct.
    The patch is against 2.4.2 and the code has been reshuffled
    since then so that the patch had to be redone entirely.


git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32443 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Robert Roebling
2005-02-28 01:51:59 +00:00
parent 74124ea961
commit aa96f01c02
4 changed files with 53 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/common/cmndata.cpp
View File

@@ -185,6 +185,9 @@ wxPrintData::wxPrintData()
m_paperId = wxPAPER_A4;
m_paperSize = wxSize(210, 297);
m_privData = NULL;
m_privDataLen = 0;
m_nativeData = wxPrintFactory::GetFactory()->CreatePrintNativeData();
}
@@ -195,11 +198,29 @@ wxPrintData::wxPrintData(const wxPrintData& printData)
(*this) = printData;
}
void wxPrintData::SetPrivData( char *privData, int len )
{
if (m_privData)
{
delete [] m_privData;
m_privData = NULL;
}
m_privDataLen = len;
if (m_privDataLen > 0)
{
m_privData = new char[m_privDataLen];
memcpy( m_privData, privData, m_privDataLen );
}
}
wxPrintData::~wxPrintData()
{
m_nativeData->m_ref--;
if (m_nativeData->m_ref == 0)
delete m_nativeData;
if (m_privData)
delete [] m_privData;
#ifdef __WXMAC__
delete m_nativePrintData ;
@@ -250,6 +271,18 @@ void wxPrintData::operator=(const wxPrintData& data)
m_nativeData = data.GetNativeData();
m_nativeData->m_ref++;
if (m_privData)
{
delete [] m_privData;
m_privData = NULL;
}
m_privDataLen = data.GetPrivDataLen();
if (m_privDataLen > 0)
{
m_privData = new char[m_privDataLen];
memcpy( m_privData, data.GetPrivData(), m_privDataLen );
}
#ifdef __WXMAC__
m_nativePrintData->CopyFrom( data.m_nativePrintData ) ;
#endif