missing break in ParseFormat() (part of patch 1160117)

[wxWidgets.git] / src / common / cmndata.cpp

diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp
index 171f85d13009034170a1148e5b00952f3b524ef7..9c34396f4f53073fa0a23e2f09010d492366682a 100644 (file)
--- a/src/common/cmndata.cpp
+++ b/src/common/cmndata.cpp
@@ -185,6 +185,9 @@ wxPrintData::wxPrintData()
     m_paperId = wxPAPER_A4;
     m_paperSize = wxSize(210, 297);
 
     m_paperId = wxPAPER_A4;
     m_paperSize = wxSize(210, 297);
 

+    m_privData = NULL;
+    m_privDataLen = 0;
+    

     m_nativeData = wxPrintFactory::GetFactory()->CreatePrintNativeData();
 }
 
     m_nativeData = wxPrintFactory::GetFactory()->CreatePrintNativeData();
 }
 


@@ -195,11 +198,29 @@ wxPrintData::wxPrintData(const wxPrintData& printData)
     (*this) = 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;
 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 ;
 
 #ifdef __WXMAC__
     delete m_nativePrintData ;


@@ -250,6 +271,18 @@ void wxPrintData::operator=(const wxPrintData& data)
     m_nativeData = data.GetNativeData();
     m_nativeData->m_ref++;
 
     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
 #ifdef __WXMAC__
     m_nativePrintData->CopyFrom( data.m_nativePrintData ) ;
 #endif