X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7cc52cd8ddf618163923e0171a87b7dff2c4c869..5ac1d44aa499901b1a2e194292ba7a93112196ae:/src/common/cmndata.cpp

diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp
index b0bc37a2fb..eb69bdb766 100644
--- a/src/common/cmndata.cpp
+++ b/src/common/cmndata.cpp
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        cmndata.cpp
+// Name:        src/common/cmndata.cpp
 // Purpose:     Common GDI data
 // Author:      Julian Smart
 // Modified by:
@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
-    #pragma implementation "cmndata.h"
-#endif
-
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
@@ -28,16 +24,17 @@
     #pragma hdrstop
 #endif
 
+#include "wx/cmndata.h"
+
 #ifndef WX_PRECOMP
     #include <stdio.h>
     #include "wx/string.h"
     #include "wx/utils.h"
     #include "wx/app.h"
+    #include "wx/log.h"
+    #include "wx/gdicmn.h"
 #endif
 
-#include "wx/gdicmn.h"
-#include "wx/cmndata.h"
-#include "wx/log.h"
 #include "wx/prntbase.h"
 #include "wx/printdlg.h"
 
@@ -67,10 +64,6 @@
     IMPLEMENT_DYNAMIC_CLASS(wxFontData, wxObject)
     IMPLEMENT_DYNAMIC_CLASS(wxColourData, wxObject)
 
-#ifndef DMPAPER_USER
-     #define DMPAPER_USER                256
-#endif
-
 // ============================================================================
 // implementation
 // ============================================================================
@@ -158,9 +151,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 +202,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 +251,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 +484,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;
@@ -624,7 +581,7 @@ wxPageSetupDialogData& wxPageSetupDialogData::operator=(const wxPageSetupDialogD
     m_enableOrientation = data.m_enableOrientation;
     m_enablePaper = data.m_enablePaper;
     m_enablePrinter = data.m_enablePrinter;
-    m_getDefaultInfo = data.m_getDefaultInfo;;
+    m_getDefaultInfo = data.m_getDefaultInfo;
     m_enableHelp = data.m_enableHelp;
 
     m_printData = data.m_printData;
@@ -640,36 +597,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)