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

diff --git a/include/wx/cmndata.h b/include/wx/cmndata.h
index b108d557ac4f8813e619ce93a15ea846c325c84a..d495c8d63c3bbc7ef5deaeeaac397bc0a9857ebf 100644 (file)
--- a/include/wx/cmndata.h
+++ b/include/wx/cmndata.h
@@ -216,13 +216,12 @@ public:
     void SetFilename( const wxString &filename ) { m_filename = filename; }
     
     void operator=(const wxPrintData& data);
-    
-    wxPrintNativeDataBase *GetNativeData() const { return m_nativeData; }
 
-#if defined(__WXMAC__)
+    // Convert between wxPrintData and native data
     void ConvertToNative();
     void ConvertFromNative();
-#endif
+    // Holds the native print data
+    wxPrintNativeDataBase *GetNativeData() const { return m_nativeData; }
 
 public:
 #if defined(__WXMAC__)

diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp
index a37373c110b08f53f22777343aebc58894d6cac4..ae0caedd0c2b11f4a261cbcab28384400abdcc79 100644 (file)
--- a/src/common/cmndata.cpp
+++ b/src/common/cmndata.cpp
@@ -205,17 +205,23 @@ wxPrintData::~wxPrintData()
 }
 
 
-#ifdef __WXMAC__
 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)
 {