]> git.saurik.com Git - wxWidgets.git/blobdiff - src/common/cmndata.cpp
Include wx/dialog.h according to precompiled headers of wx/wx.h (with other minor...
[wxWidgets.git] / src / common / cmndata.cpp
index 7c646141cfbf5a2f56c84564370c60437e8c9f2b..1e3ca85951ea639a100f95209f499a04eed25bea 100644 (file)
@@ -1,5 +1,5 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        cmndata.cpp
+// Name:        src/common/cmndata.cpp
 // Purpose:     Common GDI data
 // Author:      Julian Smart
 // Modified by:
 // 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"
 
     #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"
 #endif
 
 #include "wx/gdicmn.h"
-#include "wx/cmndata.h"
-#include "wx/log.h"
+#include "wx/prntbase.h"
+#include "wx/printdlg.h"
 
 #if wxUSE_FONTDLG
     #include "wx/fontdlg.h"
     #include "wx/paper.h"
 #endif // wxUSE_PRINTING_ARCHITECTURE
 
-#ifdef __WXMSW__
-    #include <windowsx.h>
-    #include "wx/msw/private.h"
-
-    #ifndef __SMARTPHONE__
-        #include <commdlg.h>
-    #endif
-
-    #if defined(__WATCOMC__) || defined(__SYMANTEC__) || defined(__SALFORDC__)
-        #include <windowsx.h>
-        #include <commdlg.h>
-    #endif
+#if defined(__WXMSW__)
+    #include "wx/msw/wrapcdlg.h"
 #endif // MSW
 
-#ifdef __WXMAC__
+    #if wxUSE_PRINTING_ARCHITECTURE
+
+#if defined(__WXMAC__)
     #include "wx/mac/private/print.h"
 #endif
 
-    #if wxUSE_PRINTING_ARCHITECTURE
         IMPLEMENT_DYNAMIC_CLASS(wxPrintData, wxObject)
         IMPLEMENT_DYNAMIC_CLASS(wxPrintDialogData, wxObject)
         IMPLEMENT_DYNAMIC_CLASS(wxPageSetupDialogData, wxObject)
     IMPLEMENT_DYNAMIC_CLASS(wxFontData, wxObject)
     IMPLEMENT_DYNAMIC_CLASS(wxColourData, wxObject)
 
-#ifndef DMPAPER_USER
-     #define DMPAPER_USER                256
-#endif
-
 // ============================================================================
 // implementation
 // ============================================================================
@@ -165,609 +151,280 @@ wxFontDialogBase::~wxFontDialogBase()
 
 wxPrintData::wxPrintData()
 {
-#ifdef __WXMSW__
-    m_devMode = (void*) NULL;
-    m_devNames = (void*) NULL;
-#elif defined( __WXMAC__ )
-    m_nativePrintData = wxNativePrintData::Create() ;
-#endif
     m_bin = wxPRINTBIN_DEFAULT;
+    m_printMode = wxPRINT_MODE_PRINTER;
     m_printOrientation = wxPORTRAIT;
     m_printNoCopies = 1;
     m_printCollate = false;
 
     // New, 24/3/99
-    m_printerName = wxT("");
+    m_printerName = wxEmptyString;
     m_colour = true;
     m_duplexMode = wxDUPLEX_SIMPLEX;
     m_printQuality = wxPRINT_QUALITY_HIGH;
     m_paperId = wxPAPER_A4;
     m_paperSize = wxSize(210, 297);
 
-    // PostScript-specific data
-    m_previewCommand = wxT("");
-    m_filename = wxT("");
-#ifdef __VMS__
-    m_printerCommand = wxT("print");
-    m_printerOptions = wxT("/nonotify/queue=psqueue");
-    m_afmPath = wxT("sys$ps_font_metrics:");
-#endif
-
-#ifdef __WXMSW__
-    m_printerCommand = wxT("print");
-    m_printerOptions = wxT("");
-    m_afmPath = wxT("c:\\windows\\system\\");
-#endif
-
-#if !defined(__VMS__) && !defined(__WXMSW__)
-    m_printerCommand = wxT("lpr");
-    m_printerOptions = wxT("");
-    m_afmPath = wxT("");
-#endif
+    m_privData = NULL;
+    m_privDataLen = 0;
 
-    m_printerScaleX = 1.0;
-    m_printerScaleY = 1.0;
-    m_printerTranslateX = 0;
-    m_printerTranslateY = 0;
-    m_printMode = wxPRINT_MODE_FILE;
-
-#ifdef wxUSE_STREAMS
-    m_outputstream = NULL;
-#endif
+    m_nativeData = wxPrintFactory::GetFactory()->CreatePrintNativeData();
 }
 
 wxPrintData::wxPrintData(const wxPrintData& printData)
     : wxObject()
 {
-#ifdef __WXMSW__
-    m_devMode = (void*) NULL;
-    m_devNames = (void*) NULL;
-#elif defined( __WXMAC__ )
-    m_nativePrintData = wxNativePrintData::Create() ;
-#endif
+    m_nativeData = NULL;
+    m_privData = NULL;
     (*this) = printData;
 }
 
-wxPrintData::~wxPrintData()
-{
-#ifdef __WXMSW__
-    HGLOBAL hDevMode = (HGLOBAL)(DWORD) m_devMode;
-    if ( hDevMode )
-        GlobalFree(hDevMode);
-    HGLOBAL hDevNames = (HGLOBAL)(DWORD) m_devNames;
-    if ( hDevNames )
-        GlobalFree(hDevNames);
-#elif defined(__WXMAC__)
-    delete m_nativePrintData ;
-#endif
-}
-
-#if defined(__WXMSW__) // && defined(__WIN32__)
-
-#if defined(__WXDEBUG__) && defined(__WIN32__)
-static wxString wxGetPrintDlgError()
+void wxPrintData::SetPrivData( char *privData, int len )
 {
-    DWORD err = CommDlgExtendedError();
-    wxString msg = wxT("Unknown");
-    switch (err)
+    if (m_privData)
     {
-        case CDERR_FINDRESFAILURE: msg = wxT("CDERR_FINDRESFAILURE"); break;
-        case CDERR_INITIALIZATION: msg = wxT("CDERR_INITIALIZATION"); break;
-        case CDERR_LOADRESFAILURE: msg = wxT("CDERR_LOADRESFAILURE"); break;
-        case CDERR_LOADSTRFAILURE: msg = wxT("CDERR_LOADSTRFAILURE"); break;
-        case CDERR_LOCKRESFAILURE: msg = wxT("CDERR_LOCKRESFAILURE"); break;
-        case CDERR_MEMALLOCFAILURE: msg = wxT("CDERR_MEMALLOCFAILURE"); break;
-        case CDERR_MEMLOCKFAILURE: msg = wxT("CDERR_MEMLOCKFAILURE"); break;
-        case CDERR_NOHINSTANCE: msg = wxT("CDERR_NOHINSTANCE"); break;
-        case CDERR_NOHOOK: msg = wxT("CDERR_NOHOOK"); break;
-        case CDERR_NOTEMPLATE: msg = wxT("CDERR_NOTEMPLATE"); break;
-        case CDERR_STRUCTSIZE: msg = wxT("CDERR_STRUCTSIZE"); break;
-        case  PDERR_RETDEFFAILURE: msg = wxT("PDERR_RETDEFFAILURE"); break;
-        case  PDERR_PRINTERNOTFOUND: msg = wxT("PDERR_PRINTERNOTFOUND"); break;
-        case  PDERR_PARSEFAILURE: msg = wxT("PDERR_PARSEFAILURE"); break;
-        case  PDERR_NODEVICES: msg = wxT("PDERR_NODEVICES"); break;
-        case  PDERR_NODEFAULTPRN: msg = wxT("PDERR_NODEFAULTPRN"); break;
-        case  PDERR_LOADDRVFAILURE: msg = wxT("PDERR_LOADDRVFAILURE"); break;
-        case  PDERR_INITFAILURE: msg = wxT("PDERR_INITFAILURE"); break;
-        case  PDERR_GETDEVMODEFAIL: msg = wxT("PDERR_GETDEVMODEFAIL"); break;
-        case  PDERR_DNDMMISMATCH: msg = wxT("PDERR_DNDMMISMATCH"); break;
-        case  PDERR_DEFAULTDIFFERENT: msg = wxT("PDERR_DEFAULTDIFFERENT"); break;
-        case  PDERR_CREATEICFAILURE: msg = wxT("PDERR_CREATEICFAILURE"); break;
-        default: break;
+        delete [] m_privData;
+        m_privData = NULL;
     }
-    return msg;
-}
-#endif
-
-static HGLOBAL wxCreateDevNames(const wxString& driverName, const wxString& printerName, const wxString& portName)
-{
-    HGLOBAL hDev = NULL;
-    // if (!driverName.IsEmpty() && !printerName.IsEmpty() && !portName.IsEmpty())
-    if (driverName.IsEmpty() && printerName.IsEmpty() && portName.IsEmpty())
+    m_privDataLen = len;
+    if (m_privDataLen > 0)
     {
+        m_privData = new char[m_privDataLen];
+        memcpy( m_privData, privData, m_privDataLen );
     }
-    else
-    {
-        hDev = GlobalAlloc(GPTR, 4*sizeof(WORD)+
-                           ( driverName.Length() + 1 +
-            printerName.Length() + 1 +
-                             portName.Length()+1 ) * sizeof(wxChar) );
-        LPDEVNAMES lpDev = (LPDEVNAMES)GlobalLock(hDev);
-        lpDev->wDriverOffset = sizeof(WORD)*4;
-        wxStrcpy((wxChar*)((char*)lpDev + lpDev->wDriverOffset ), driverName);
-
-        lpDev->wDeviceOffset = (WORD)( lpDev->wDriverOffset +
-                                       sizeof(wxChar) * ( driverName.Length() + 1 ) );
-        wxStrcpy((wxChar*)((char*)lpDev + lpDev->wDeviceOffset ), printerName);
-
-        lpDev->wOutputOffset = (WORD)( lpDev->wDeviceOffset +
-                                       sizeof(wxChar) * ( printerName.Length() + 1 ) );
-        wxStrcpy((wxChar*)((char*) lpDev + lpDev->wOutputOffset ), portName);
-
-        lpDev->wDefault = 0;
+}
 
-        GlobalUnlock(hDev);
-    }
+wxPrintData::~wxPrintData()
+{
+    m_nativeData->m_ref--;
+    if (m_nativeData->m_ref == 0)
+        delete m_nativeData;
 
-    return hDev;
+    if (m_privData)
+        delete [] m_privData;
 }
 
 void wxPrintData::ConvertToNative()
 {
-    HGLOBAL hDevMode = (HGLOBAL)(DWORD) m_devMode;
-    HGLOBAL hDevNames = (HGLOBAL)(DWORD) m_devNames;
-    if (!hDevMode)
-    {
-        // Use PRINTDLG as a way of creating a DEVMODE object
-        PRINTDLG pd;
+    m_nativeData->TransferFrom( *this ) ;
+}
 
-        // GNU-WIN32 has the wrong size PRINTDLG - can't work out why.
-#ifdef __GNUWIN32__
-        memset(&pd, 0, 66);
-        pd.lStructSize    = 66;
-#else
-        memset(&pd, 0, sizeof(PRINTDLG));
-#ifdef __WXWINCE__
-        pd.cbStruct    = sizeof(PRINTDLG);
-#else
-        pd.lStructSize    = sizeof(PRINTDLG);
-#endif
-#endif
+void wxPrintData::ConvertFromNative()
+{
+    m_nativeData->TransferTo( *this ) ;
+}
 
-        pd.hwndOwner      = (HWND)NULL;
-        pd.hDevMode       = NULL; // Will be created by PrintDlg
-        pd.hDevNames      = NULL; // Ditto
-        //pd.hInstance      = (HINSTANCE) wxGetInstance();
-
-        pd.Flags          = PD_RETURNDEFAULT;
-        pd.nCopies        = 1;
-
-        // Fill out the DEVMODE structure
-        // so we can use it as input in the 'real' PrintDlg
-        if (!PrintDlg(&pd))
-        {
-            if ( pd.hDevMode )
-                GlobalFree(pd.hDevMode);
-            if ( pd.hDevNames )
-                GlobalFree(pd.hDevNames);
-            pd.hDevMode = NULL;
-            pd.hDevNames = NULL;
-
-#if defined(__WXDEBUG__) && defined(__WIN32__)
-            wxString str(wxT("Printing error: "));
-            str += wxGetPrintDlgError();
-            wxLogDebug(str);
-#endif
-        }
-        else
-        {
-            hDevMode = pd.hDevMode;
-            m_devMode = (void*)(long) hDevMode;
-            pd.hDevMode = NULL;
-
-            // We'll create a new DEVNAMEs structure below.
-            if ( pd.hDevNames )
-                GlobalFree(pd.hDevNames);
-            pd.hDevNames = NULL;
-
-            // hDevNames = pd->hDevNames;
-            // m_devNames = (void*)(long) hDevNames;
-            // pd->hDevnames = NULL;
-
-        }
-    }
+void wxPrintData::operator=(const wxPrintData& data)
+{
+    m_printNoCopies = data.m_printNoCopies;
+    m_printCollate = data.m_printCollate;
+    m_printOrientation = data.m_printOrientation;
+    m_printerName = data.m_printerName;
+    m_colour = data.m_colour;
+    m_duplexMode = data.m_duplexMode;
+    m_printQuality = data.m_printQuality;
+    m_paperId = data.m_paperId;
+    m_paperSize = data.m_paperSize;
+    m_bin = data.m_bin;
+    m_printMode = data.m_printMode;
+    m_filename = data.m_filename;
 
-    if ( hDevMode )
+    // UnRef old m_nativeData
+    if (m_nativeData)
     {
-        LPDEVMODE devMode = (LPDEVMODE) GlobalLock(hDevMode);
-
-        //// Orientation
-
-        devMode->dmOrientation = m_printOrientation;
-
-        //// Collation
-
-        devMode->dmCollate = (m_printCollate ? DMCOLLATE_TRUE : DMCOLLATE_FALSE);
-        devMode->dmFields |= DM_COLLATE;
-
-        //// Number of copies
-
-        devMode->dmCopies = m_printNoCopies;
-        devMode->dmFields |= DM_COPIES;
-
-        //// Printer name
-
-        if (m_printerName != wxT(""))
-        {
-            //int len = wxMin(31, m_printerName.Len());
-            wxStrncpy((wxChar*)devMode->dmDeviceName,m_printerName.c_str(),31);
-            devMode->dmDeviceName[31] = wxT('\0');
-        }
-
-        //// Colour
-
-        if (m_colour)
-            devMode->dmColor = DMCOLOR_COLOR;
-        else
-            devMode->dmColor = DMCOLOR_MONOCHROME;
-
-        devMode->dmFields |= DM_COLOR;
-
-        //// Paper size
-
-        if (m_paperId == wxPAPER_NONE)
-        {
-            // DEVMODE is in tenths of a milimeter
-            devMode->dmPaperWidth = m_paperSize.x * 10;
-            devMode->dmPaperLength = m_paperSize.y * 10;
-            devMode->dmPaperSize = DMPAPER_USER;
-            devMode->dmFields |= DM_PAPERWIDTH;
-            devMode->dmFields |= DM_PAPERLENGTH;
-        }
-        else
-        {
-            if (wxThePrintPaperDatabase)
-            {
-                wxPrintPaperType* paper = wxThePrintPaperDatabase->FindPaperType(m_paperId);
-                if (paper)
-                {
-                    devMode->dmPaperSize = paper->GetPlatformId();
-                    devMode->dmFields |= DM_PAPERSIZE;
-                }
-            }
-        }
-
-        //// Duplex
-
-        int duplex;
-        switch (m_duplexMode)
-        {
-        case wxDUPLEX_HORIZONTAL: {
-            duplex = DMDUP_HORIZONTAL; break;
-                                  }
-        case wxDUPLEX_VERTICAL: {
-            duplex = DMDUP_VERTICAL; break;
-                                }
-        default:
-        case wxDUPLEX_SIMPLEX: {
-            duplex = DMDUP_SIMPLEX; break;
-                               }
-        }
-        devMode->dmDuplex = duplex;
-        devMode->dmFields |= DM_DUPLEX;
-
-        //// Quality
-
-        int quality;
-        switch (m_printQuality)
-        {
-        case wxPRINT_QUALITY_MEDIUM: {
-            quality = DMRES_MEDIUM; break;
-                                     }
-        case wxPRINT_QUALITY_LOW: {
-            quality = DMRES_LOW; break;
-                                  }
-        case wxPRINT_QUALITY_DRAFT: {
-            quality = DMRES_DRAFT; break;
-                                    }
-        case wxPRINT_QUALITY_HIGH: {
-            quality = DMRES_HIGH; break;
-                                   }
-        default: {
-            quality = m_printQuality; break;
-                 }
-        }
-        devMode->dmPrintQuality = quality;
-        devMode->dmFields |= DM_PRINTQUALITY;
-
-        if ( m_bin != wxPRINTBIN_DEFAULT )
-        {
-            switch ( m_bin )
-            {
-                case wxPRINTBIN_ONLYONE:        devMode->dmDefaultSource = DMBIN_ONLYONE;       break;
-                case wxPRINTBIN_LOWER:          devMode->dmDefaultSource = DMBIN_LOWER;         break;
-                case wxPRINTBIN_MIDDLE:         devMode->dmDefaultSource = DMBIN_MIDDLE;        break;
-                case wxPRINTBIN_MANUAL:         devMode->dmDefaultSource = DMBIN_MANUAL;        break;
-                case wxPRINTBIN_ENVELOPE:       devMode->dmDefaultSource = DMBIN_ENVELOPE;      break;
-                case wxPRINTBIN_ENVMANUAL:      devMode->dmDefaultSource = DMBIN_ENVMANUAL;     break;
-                case wxPRINTBIN_AUTO:           devMode->dmDefaultSource = DMBIN_AUTO,;         break;
-                case wxPRINTBIN_TRACTOR:        devMode->dmDefaultSource = DMBIN_TRACTOR;       break;
-                case wxPRINTBIN_SMALLFMT:       devMode->dmDefaultSource = DMBIN_SMALLFMT;      break;
-                case wxPRINTBIN_LARGEFMT:       devMode->dmDefaultSource = DMBIN_LARGEFMT;      break;
-                case wxPRINTBIN_LARGECAPACITY:  devMode->dmDefaultSource = DMBIN_LARGECAPACITY; break;
-                case wxPRINTBIN_CASSETTE:       devMode->dmDefaultSource = DMBIN_CASSETTE;      break;
-                case wxPRINTBIN_FORMSOURCE:     devMode->dmDefaultSource = DMBIN_FORMSOURCE;    break;
-
-                default:
-                    devMode->dmDefaultSource = DMBIN_USER + m_bin - wxPRINTBIN_USER;
-                    break;
-            }
-
-            devMode->dmFields |= DM_DEFAULTSOURCE;
-        }
-
-        GlobalUnlock(hDevMode);
+        m_nativeData->m_ref--;
+        if (m_nativeData->m_ref == 0)
+            delete m_nativeData;
     }
+    // Set Ref new one
+    m_nativeData = data.GetNativeData();
+    m_nativeData->m_ref++;
 
-    if ( hDevNames )
+    if (m_privData)
+    {
+        delete [] m_privData;
+        m_privData = NULL;
+    }
+    m_privDataLen = data.GetPrivDataLen();
+    if (m_privDataLen > 0)
     {
-        GlobalFree(hDevNames);
+        m_privData = new char[m_privDataLen];
+        memcpy( m_privData, data.GetPrivData(), m_privDataLen );
     }
+}
+
+// Is this data OK for showing the print dialog?
+bool wxPrintData::Ok() const
+{
+    m_nativeData->TransferFrom( *this );
 
-    // TODO: I hope it's OK to pass some empty strings to DEVNAMES.
-    m_devNames = (void*) (long) wxCreateDevNames(wxT(""), m_printerName, wxT(""));
+    return m_nativeData->Ok();
 }
 
-void wxPrintData::ConvertFromNative()
+// What should happen here?  wxPostScriptPrintNativeData is not
+// defined unless all this is true on MSW.
+#if WXWIN_COMPATIBILITY_2_4 && wxUSE_PRINTING_ARCHITECTURE && (!defined(__WXMSW__) || wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW)
+
+#include "wx/generic/prntdlgg.h"
+
+#if wxUSE_POSTSCRIPT
+    #define WXUNUSED_WITHOUT_PS(name) name
+#else
+    #define WXUNUSED_WITHOUT_PS(name) WXUNUSED(name)
+#endif
+
+wxString wxPrintData::GetPrinterCommand() const
 {
-    HGLOBAL hDevMode = (HGLOBAL)(DWORD) m_devMode;
-    HGLOBAL hDevNames = (HGLOBAL)(DWORD) m_devNames;
+#if wxUSE_POSTSCRIPT
+    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
+        return ((wxPostScriptPrintNativeData*)m_nativeData)->GetPrinterCommand();
+#endif
+    return wxEmptyString;
+}
 
-    if (!hDevMode)
-        return;
+wxString wxPrintData::GetPrinterOptions() const
+{
+#if wxUSE_POSTSCRIPT
+    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
+        return ((wxPostScriptPrintNativeData*)m_nativeData)->GetPrinterOptions();
+#endif
+    return wxEmptyString;
+}
 
-    if ( hDevMode )
-    {
-        LPDEVMODE devMode = (LPDEVMODE)GlobalLock(hDevMode);
-
-        //// Orientation
-
-        if (devMode->dmFields & DM_ORIENTATION)
-            m_printOrientation = devMode->dmOrientation;
-
-        //// Collation
-
-        if (devMode->dmFields & DM_COLLATE)
-        {
-            if (devMode->dmCollate == DMCOLLATE_TRUE)
-                m_printCollate = true;
-            else
-                m_printCollate = false;
-        }
-
-        //// Number of copies
-
-        if (devMode->dmFields & DM_COPIES)
-        {
-            m_printNoCopies = devMode->dmCopies;
-        }
-
-        if (devMode->dmFields & DM_DEFAULTSOURCE)
-        {
-            m_bin = devMode->dmDefaultSource;
-        }
-
-        //// Printer name
-
-        if (devMode->dmDeviceName[0] != 0)
-        {
-            m_printerName = devMode->dmDeviceName;
-        }
-
-        //// Colour
-
-        if (devMode->dmFields & DM_COLOR)
-        {
-            if (devMode->dmColor == DMCOLOR_COLOR)
-                m_colour = true;
-            else
-                m_colour = false;
-        }
-        else
-            m_colour = true;
-
-        //// Paper size
-
-        // We don't know size of user defined paper and some buggy drivers
-        // set both DM_PAPERSIZE and DM_PAPERWIDTH & DM_PAPERLENGTH. Since
-        // dmPaperSize >= DMPAPER_USER wouldn't be in wxWin's database, this
-        // code wouldn't set m_paperSize correctly.
-        if ((devMode->dmFields & DM_PAPERSIZE) && (devMode->dmPaperSize < DMPAPER_USER))
-        {
-            if (wxThePrintPaperDatabase)
-            {
-                wxPrintPaperType* paper = wxThePrintPaperDatabase->FindPaperTypeByPlatformId(devMode->dmPaperSize);
-                if (paper)
-                {
-                    m_paperId = paper->GetId();
-                    m_paperSize.x = paper->GetWidth() / 10;
-                    m_paperSize.y = paper->GetHeight() / 10;
-                }
-                else
-                {
-                    // Shouldn't really get here
-                    wxFAIL_MSG(wxT("Couldn't find paper size in paper database."));
-
-                    m_paperId = wxPAPER_NONE;
-                    m_paperSize.x = 0;
-                    m_paperSize.y = 0;
-                }
-            }
-            else
-            {
-                // Shouldn't really get here
-                wxFAIL_MSG(wxT("Paper database wasn't initialized in wxPrintData::ConvertFromNative."));
-
-                m_paperId = wxPAPER_NONE;
-                m_paperSize.x = 0;
-                m_paperSize.y = 0;
-            }
-        }
-        else if ((devMode->dmFields & DM_PAPERWIDTH) && (devMode->dmFields & DM_PAPERLENGTH))
-        {
-            // DEVMODE is in tenths of a milimeter
-            m_paperSize.x = devMode->dmPaperWidth / 10;
-            m_paperSize.y = devMode->dmPaperLength / 10;
-            m_paperId = wxPAPER_NONE;
-        }
-        else
-        {
-            // Shouldn't really get here
-            wxFAIL_MSG(wxT("Couldn't find paper size from DEVMODE."));
-
-            m_paperSize.x = 0;
-            m_paperSize.y = 0;
-            m_paperId = wxPAPER_NONE;
-        }
-
-        //// Duplex
-
-        if (devMode->dmFields & DM_DUPLEX)
-        {
-            switch (devMode->dmDuplex)
-            {
-            case DMDUP_HORIZONTAL: {
-                m_duplexMode = wxDUPLEX_HORIZONTAL; break;
-                                   }
-            case DMDUP_VERTICAL: {
-                m_duplexMode = wxDUPLEX_VERTICAL; break;
-                                 }
-            default:
-            case DMDUP_SIMPLEX: {
-                m_duplexMode = wxDUPLEX_SIMPLEX; break;
-                                }
-            }
-        }
-        else
-            m_duplexMode = wxDUPLEX_SIMPLEX;
-
-        //// Quality
-
-        if (devMode->dmFields & DM_PRINTQUALITY)
-        {
-            switch (devMode->dmPrintQuality)
-            {
-            case DMRES_MEDIUM: {
-                m_printQuality = wxPRINT_QUALITY_MEDIUM; break;
-                               }
-            case DMRES_LOW: {
-                m_printQuality = wxPRINT_QUALITY_LOW; break;
-                            }
-            case DMRES_DRAFT: {
-                m_printQuality = wxPRINT_QUALITY_DRAFT; break;
-                              }
-            case DMRES_HIGH: {
-                m_printQuality = wxPRINT_QUALITY_HIGH; break;
-                             }
-            default:
-                {
-                    // TODO: if the printer fills in the resolution in DPI, how
-                    // will the application know if it's high, low, draft etc.??
-                    //                    wxFAIL_MSG("Warning: DM_PRINTQUALITY was not one of the standard values.");
-                    m_printQuality = devMode->dmPrintQuality; break;
-
-                }
-            }
-        }
-        else
-            m_printQuality = wxPRINT_QUALITY_HIGH;
-
-        GlobalUnlock(hDevMode);
-    }
+wxString wxPrintData::GetPreviewCommand() const
+{
+#if wxUSE_POSTSCRIPT
+    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
+        return ((wxPostScriptPrintNativeData*)m_nativeData)->GetPreviewCommand();
+#endif
+    return wxEmptyString;
+}
 
-    if (hDevNames)
-    {
-        LPDEVNAMES lpDevNames = (LPDEVNAMES)GlobalLock(hDevNames);
-        if (lpDevNames)
-        {
-            // TODO: Unicode-ification
+wxString wxPrintData::GetFontMetricPath() const
+{
+#if wxUSE_POSTSCRIPT
+    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
+        return ((wxPostScriptPrintNativeData*)m_nativeData)->GetFontMetricPath();
+#endif
+    return wxEmptyString;
+}
 
-            // Get the port name
-            // port is obsolete in WIN32
-            // m_printData.SetPortName((LPSTR)lpDevNames + lpDevNames->wDriverOffset);
+double wxPrintData::GetPrinterScaleX() const
+{
+#if wxUSE_POSTSCRIPT
+    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
+        return ((wxPostScriptPrintNativeData*)m_nativeData)->GetPrinterScaleX();
+#endif
+    return 1.0;
+}
 
-            // Get the printer name
-            wxString printerName = (LPTSTR)lpDevNames + lpDevNames->wDeviceOffset;
+double wxPrintData::GetPrinterScaleY() const
+{
+#if wxUSE_POSTSCRIPT
+    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
+        return ((wxPostScriptPrintNativeData*)m_nativeData)->GetPrinterScaleY();
+#endif
+    return 1.0;
+}
 
-            // Not sure if we should check for this mismatch
-//            wxASSERT_MSG( (m_printerName == "" || (devName == m_printerName)), "Printer name obtained from DEVMODE and DEVNAMES were different!");
+long wxPrintData::GetPrinterTranslateX() const
+{
+#if wxUSE_POSTSCRIPT
+    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
+        return ((wxPostScriptPrintNativeData*)m_nativeData)->GetPrinterTranslateX();
+#endif
+    return 0;
+}
 
-            if (printerName != wxT(""))
-                m_printerName = printerName;
+long wxPrintData::GetPrinterTranslateY() const
+{
+#if wxUSE_POSTSCRIPT
+    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
+        return ((wxPostScriptPrintNativeData*)m_nativeData)->GetPrinterTranslateY();
+#endif
+    return 0;
+}
 
-            GlobalUnlock(hDevNames);
-        }
-    }
+void wxPrintData::SetPrinterCommand(const wxString& WXUNUSED_WITHOUT_PS(command))
+{
+#if wxUSE_POSTSCRIPT
+    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
+        ((wxPostScriptPrintNativeData*)m_nativeData)->SetPrinterCommand( command );
+#endif
 }
 
+void wxPrintData::SetPrinterOptions(const wxString& WXUNUSED_WITHOUT_PS(options))
+{
+#if wxUSE_POSTSCRIPT
+    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
+        ((wxPostScriptPrintNativeData*)m_nativeData)->SetPrinterOptions( options );
 #endif
+}
 
-#ifdef __WXMAC__
+void wxPrintData::SetPreviewCommand(const wxString& WXUNUSED_WITHOUT_PS(command))
+{
+#if wxUSE_POSTSCRIPT
+    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
+        ((wxPostScriptPrintNativeData*)m_nativeData)->SetPreviewCommand( command );
+#endif
+}
 
-void wxPrintData::ConvertToNative()
+void wxPrintData::SetFontMetricPath(const wxString& WXUNUSED_WITHOUT_PS(path))
 {
-    m_nativePrintData->TransferFrom( this ) ;
+#if wxUSE_POSTSCRIPT
+    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
+        ((wxPostScriptPrintNativeData*)m_nativeData)->SetFontMetricPath( path );
+#endif
 }
 
-void wxPrintData::ConvertFromNative()
+void wxPrintData::SetPrinterScaleX(double WXUNUSED_WITHOUT_PS(x))
 {
-    m_nativePrintData->TransferTo( this ) ;
+#if wxUSE_POSTSCRIPT
+    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
+        ((wxPostScriptPrintNativeData*)m_nativeData)->SetPrinterScaleX( x );
+#endif
 }
 
+void wxPrintData::SetPrinterScaleY(double WXUNUSED_WITHOUT_PS(y))
+{
+#if wxUSE_POSTSCRIPT
+    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
+        ((wxPostScriptPrintNativeData*)m_nativeData)->SetPrinterScaleY( y );
 #endif
+}
 
-void wxPrintData::operator=(const wxPrintData& data)
+void wxPrintData::SetPrinterScaling(double WXUNUSED_WITHOUT_PS(x), double WXUNUSED_WITHOUT_PS(y))
 {
-#ifdef __WXMAC__
-    m_nativePrintData->CopyFrom( data.m_nativePrintData ) ;
+#if wxUSE_POSTSCRIPT
+    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
+        ((wxPostScriptPrintNativeData*)m_nativeData)->SetPrinterScaling( x, y );
 #endif
-    m_printNoCopies = data.m_printNoCopies;
-    m_printCollate = data.m_printCollate;
-    m_printOrientation = data.m_printOrientation;
-    m_printerName = data.m_printerName;
-    m_colour = data.m_colour;
-    m_duplexMode = data.m_duplexMode;
-    m_printQuality = data.m_printQuality;
-    m_paperId = data.m_paperId;
-    m_paperSize = data.m_paperSize;
-    m_bin = data.m_bin;
-#ifdef wxUSE_STREAMS
-    m_outputstream = data.m_outputstream;
+}
+
+void wxPrintData::SetPrinterTranslateX(long WXUNUSED_WITHOUT_PS(x))
+{
+#if wxUSE_POSTSCRIPT
+    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
+        ((wxPostScriptPrintNativeData*)m_nativeData)->SetPrinterTranslateX( x );
 #endif
+}
 
-    // PostScript-specific data
-    m_printerCommand = data.m_printerCommand;
-    m_previewCommand = data.m_previewCommand;
-    m_printerOptions = data.m_printerOptions;
-    m_filename = data.m_filename;
-    m_afmPath = data.m_afmPath;
-    m_printerScaleX = data.m_printerScaleX;
-    m_printerScaleY = data.m_printerScaleY;
-    m_printerTranslateX = data.m_printerTranslateX;
-    m_printerTranslateY = data.m_printerTranslateY;
-    m_printMode = data.m_printMode;
+void wxPrintData::SetPrinterTranslateY(long WXUNUSED_WITHOUT_PS(y))
+{
+#if wxUSE_POSTSCRIPT
+    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
+        ((wxPostScriptPrintNativeData*)m_nativeData)->SetPrinterTranslateY( y );
+#endif
 }
 
-// Is this data OK for showing the print dialog?
-bool wxPrintData::Ok() const
+void wxPrintData::SetPrinterTranslation(long WXUNUSED_WITHOUT_PS(x), long WXUNUSED_WITHOUT_PS(y))
 {
-#ifdef __WXMSW__
-    ((wxPrintData*)this)->ConvertToNative();
-    return (m_devMode != NULL) ;
-#else
-    return true;
+#if wxUSE_POSTSCRIPT
+    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
+        ((wxPostScriptPrintNativeData*)m_nativeData)->SetPrinterTranslation( x, y );
 #endif
 }
+#endif
 
 // ----------------------------------------------------------------------------
 // Print dialog data
@@ -775,9 +432,6 @@ bool wxPrintData::Ok() const
 
 wxPrintDialogData::wxPrintDialogData()
 {
-#ifdef __WXMSW__
-    m_printDlgData = NULL;
-#endif
     m_printFromPage = 0;
     m_printToPage = 0;
     m_printMinPage = 0;
@@ -789,25 +443,24 @@ wxPrintDialogData::wxPrintDialogData()
     m_printSelection = false;
     m_printEnableSelection = false;
     m_printEnablePageNumbers = true;
-    m_printEnablePrintToFile = true;
+
+    wxPrintFactory* factory = wxPrintFactory::GetFactory();
+    m_printEnablePrintToFile = ! factory->HasOwnPrintToFile();
+
     m_printEnableHelp = false;
+#if WXWIN_COMPATIBILITY_2_4
     m_printSetupDialog = false;
+#endif
 }
 
 wxPrintDialogData::wxPrintDialogData(const wxPrintDialogData& dialogData)
     : wxObject()
 {
-#ifdef __WXMSW__
-    m_printDlgData = NULL;
-#endif
     (*this) = dialogData;
 }
 
 wxPrintDialogData::wxPrintDialogData(const wxPrintData& printData)
 {
-#ifdef __WXMSW__
-    m_printDlgData = NULL;
-#endif
     m_printFromPage = 1;
     m_printToPage = 0;
     m_printMinPage = 1;
@@ -821,218 +474,16 @@ wxPrintDialogData::wxPrintDialogData(const wxPrintData& printData)
     m_printEnablePageNumbers = true;
     m_printEnablePrintToFile = true;
     m_printEnableHelp = false;
+#if WXWIN_COMPATIBILITY_2_4
     m_printSetupDialog = false;
-
+#endif
     m_printData = printData;
 }
 
 wxPrintDialogData::~wxPrintDialogData()
 {
-#ifdef __WXMSW__
-    PRINTDLG *pd = (PRINTDLG *) m_printDlgData;
-    if ( pd && pd->hDevMode )
-        GlobalFree(pd->hDevMode);
-    if ( pd )
-        delete pd;
-#endif
 }
 
-#ifdef __WXMSW__
-void wxPrintDialogData::ConvertToNative()
-{
-    m_printData.ConvertToNative();
-
-    PRINTDLG *pd = (PRINTDLG*) m_printDlgData;
-
-    if (!pd)
-    {
-        pd = new PRINTDLG;
-        memset( pd, 0, sizeof(PRINTDLG) );
-        m_printDlgData = (void*) pd;
-
-        // GNU-WIN32 has the wrong size PRINTDLG - can't work out why.
-#ifdef __GNUWIN32__
-        pd->lStructSize    = 66;
-#else
-        pd->lStructSize    = sizeof(PRINTDLG);
-#endif
-        pd->hwndOwner      = (HWND)NULL;
-        pd->hDevMode       = NULL; // Will be created by PrintDlg
-        pd->hDevNames      = NULL; // Ditto
-
-        pd->Flags          = PD_RETURNDEFAULT;
-        pd->nCopies        = 1;
-    }
-
-    // Pass the devmode data to the PRINTDLG structure, since it'll
-    // be needed when PrintDlg is called.
-    if (pd->hDevMode)
-    {
-        GlobalFree(pd->hDevMode);
-    }
-
-    // Pass the devnames data to the PRINTDLG structure, since it'll
-    // be needed when PrintDlg is called.
-    if (pd->hDevNames)
-    {
-        GlobalFree(pd->hDevNames);
-    }
-
-    pd->hDevMode = (HGLOBAL)(DWORD) m_printData.GetNativeData();
-
-    m_printData.SetNativeData((void*) NULL);
-
-    // Shouldn't assert; we should be able to test Ok-ness at a higher level
-    //wxASSERT_MSG( (pd->hDevMode), wxT("hDevMode must be non-NULL in ConvertToNative!"));
-
-    pd->hDevNames = (HGLOBAL)(DWORD) m_printData.GetNativeDataDevNames();
-
-    m_printData.SetNativeDataDevNames((void*) NULL);
-
-    pd->hDC = (HDC) NULL;
-    pd->nFromPage = (WORD)m_printFromPage;
-    pd->nToPage = (WORD)m_printToPage;
-    pd->nMinPage = (WORD)m_printMinPage;
-    pd->nMaxPage = (WORD)m_printMaxPage;
-    pd->nCopies = (WORD)m_printNoCopies;
-
-    pd->Flags = PD_RETURNDC;
-
-#ifdef __GNUWIN32__
-    pd->lStructSize = 66;
-#else
-    pd->lStructSize = sizeof( PRINTDLG );
-#endif
-
-    pd->hwndOwner=(HWND)NULL;
-//    pd->hDevNames=(HANDLE)NULL;
-    pd->hInstance=(HINSTANCE)NULL;
-    pd->lCustData = (LPARAM) NULL;
-    pd->lpfnPrintHook = NULL;
-    pd->lpfnSetupHook = NULL;
-    pd->lpPrintTemplateName = NULL;
-    pd->lpSetupTemplateName = NULL;
-    pd->hPrintTemplate = (HGLOBAL) NULL;
-    pd->hSetupTemplate = (HGLOBAL) NULL;
-
-    if ( m_printAllPages )
-        pd->Flags |= PD_ALLPAGES;
-    if ( m_printSelection )
-        pd->Flags |= PD_SELECTION;
-    if ( m_printCollate )
-        pd->Flags |= PD_COLLATE;
-    if ( m_printToFile )
-        pd->Flags |= PD_PRINTTOFILE;
-    if ( !m_printEnablePrintToFile )
-        pd->Flags |= PD_DISABLEPRINTTOFILE;
-    if ( !m_printEnableSelection )
-        pd->Flags |= PD_NOSELECTION;
-    if ( !m_printEnablePageNumbers )
-        pd->Flags |= PD_NOPAGENUMS;
-    else if ( (!m_printAllPages) && (!m_printSelection) && (m_printFromPage != 0) && (m_printToPage != 0))
-        pd->Flags |= PD_PAGENUMS;
-    if ( m_printEnableHelp )
-        pd->Flags |= PD_SHOWHELP;
-    if ( m_printSetupDialog )
-        pd->Flags |= PD_PRINTSETUP;
-}
-
-void wxPrintDialogData::ConvertFromNative()
-{
-    PRINTDLG *pd = (PRINTDLG*) m_printDlgData;
-    if ( pd == NULL )
-        return;
-
-    // Pass the devmode data back to the wxPrintData structure where it really belongs.
-    if (pd->hDevMode)
-    {
-        if (m_printData.GetNativeData())
-        {
-            // Make sure we don't leak memory
-            GlobalFree((HGLOBAL)(DWORD) m_printData.GetNativeData());
-        }
-        m_printData.SetNativeData((void*)(long) pd->hDevMode);
-        pd->hDevMode = NULL;
-    }
-
-    // Pass the devnames data back to the wxPrintData structure where it really belongs.
-    if (pd->hDevNames)
-    {
-        if (m_printData.GetNativeDataDevNames())
-        {
-            // Make sure we don't leak memory
-            GlobalFree((HGLOBAL)(DWORD) m_printData.GetNativeDataDevNames());
-        }
-        m_printData.SetNativeDataDevNames((void*)(long) pd->hDevNames);
-        pd->hDevNames = NULL;
-    }
-
-    // Now convert the DEVMODE object, passed down from the PRINTDLG object,
-    // into wxWidgets form.
-    m_printData.ConvertFromNative();
-
-    m_printFromPage = pd->nFromPage;
-    m_printToPage = pd->nToPage;
-    m_printMinPage = pd->nMinPage;
-    m_printMaxPage = pd->nMaxPage;
-    m_printNoCopies = pd->nCopies;
-
-    m_printAllPages = (((pd->Flags & PD_PAGENUMS) != PD_PAGENUMS) && ((pd->Flags & PD_SELECTION) != PD_SELECTION));
-    m_printSelection = ((pd->Flags & PD_SELECTION) == PD_SELECTION);
-    m_printCollate = ((pd->Flags & PD_COLLATE) == PD_COLLATE);
-    m_printToFile = ((pd->Flags & PD_PRINTTOFILE) == PD_PRINTTOFILE);
-    m_printEnablePrintToFile = ((pd->Flags & PD_DISABLEPRINTTOFILE) != PD_DISABLEPRINTTOFILE);
-    m_printEnableSelection = ((pd->Flags & PD_NOSELECTION) != PD_NOSELECTION);
-    m_printEnablePageNumbers = ((pd->Flags & PD_NOPAGENUMS) != PD_NOPAGENUMS);
-    m_printEnableHelp = ((pd->Flags & PD_SHOWHELP) == PD_SHOWHELP);
-    m_printSetupDialog = ((pd->Flags & PD_PRINTSETUP) == PD_PRINTSETUP);
-
-/* port is obsolete in WIN32
-    // Get the port name
-    if (pd->hDevNames)
-    {
-        LPDEVNAMES lpDevNames = (LPDEVNAMES)GlobalLock(pd->hDevNames);
-        if (lpDevNames) {
-            m_printData.SetPortName((LPSTR)lpDevNames + lpDevNames->wDriverOffset);
-            wxString devName = (LPSTR)lpDevNames + lpDevNames->wDeviceOffset;
-            GlobalUnlock(pd->hDevNames);
-
-//            wxASSERT_MSG( (m_printerName == "" || (devName == m_printerName)), "Printer name obtained from DEVMODE and DEVNAMES were different!");
-        }
-    }
-*/
-}
-
-void wxPrintDialogData::SetOwnerWindow(wxWindow* win)
-{
-    if ( m_printDlgData == NULL )
-        ConvertToNative();
-
-    if ( m_printDlgData != NULL && win != NULL)
-    {
-        PRINTDLG *pd = (PRINTDLG *) m_printDlgData;
-        pd->hwndOwner=(HWND) win->GetHWND();
-    }
-}
-#endif // MSW
-
-#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;
@@ -1048,8 +499,9 @@ void wxPrintDialogData::operator=(const wxPrintDialogData& data)
     m_printEnablePageNumbers = data.m_printEnablePageNumbers;
     m_printEnableHelp = data.m_printEnableHelp;
     m_printEnablePrintToFile = data.m_printEnablePrintToFile;
+#if WXWIN_COMPATIBILITY_2_4
     m_printSetupDialog = data.m_printSetupDialog;
-
+#endif
     m_printData = data.m_printData;
 }
 
@@ -1064,17 +516,14 @@ void wxPrintDialogData::operator=(const wxPrintData& data)
 
 wxPageSetupDialogData::wxPageSetupDialogData()
 {
-#if defined(__WIN95__)
-    m_pageSetupData = NULL;
-#endif
-    m_paperSize = wxSize(0, 0);
+    m_paperSize = wxSize(0,0);
 
     CalculatePaperSizeFromId();
 
-    m_minMarginTopLeft = wxPoint(0, 0);
-    m_minMarginBottomRight = wxPoint(0, 0);
-    m_marginTopLeft = wxPoint(0, 0);
-    m_marginBottomRight = wxPoint(0, 0);
+    m_minMarginTopLeft =
+    m_minMarginBottomRight =
+    m_marginTopLeft =
+    m_marginBottomRight = wxPoint(0,0);
 
     // Flags
     m_defaultMinMargins = false;
@@ -1089,22 +538,16 @@ wxPageSetupDialogData::wxPageSetupDialogData()
 wxPageSetupDialogData::wxPageSetupDialogData(const wxPageSetupDialogData& dialogData)
     : wxObject()
 {
-#if defined(__WIN95__)
-    m_pageSetupData = NULL;
-#endif
     (*this) = dialogData;
 }
 
 wxPageSetupDialogData::wxPageSetupDialogData(const wxPrintData& printData)
 {
-#if defined(__WIN95__)
-    m_pageSetupData = NULL;
-#endif
-    m_paperSize = wxSize(0, 0);
-    m_minMarginTopLeft = wxPoint(0, 0);
-    m_minMarginBottomRight = wxPoint(0, 0);
-    m_marginTopLeft = wxPoint(0, 0);
-    m_marginBottomRight = wxPoint(0, 0);
+    m_paperSize = wxSize(0,0);
+    m_minMarginTopLeft =
+    m_minMarginBottomRight =
+    m_marginTopLeft =
+    m_marginBottomRight = wxPoint(0,0);
 
     // Flags
     m_defaultMinMargins = false;
@@ -1124,15 +567,6 @@ wxPageSetupDialogData::wxPageSetupDialogData(const wxPrintData& printData)
 
 wxPageSetupDialogData::~wxPageSetupDialogData()
 {
-#if defined(__WIN95__) && defined(__WXMSW__)
-    PAGESETUPDLG *pd = (PAGESETUPDLG *)m_pageSetupData;
-    if ( pd && pd->hDevMode )
-        GlobalFree(pd->hDevMode);
-    if ( pd && pd->hDevNames )
-        GlobalFree(pd->hDevNames);
-    if ( pd )
-        delete pd;
-#endif
 }
 
 wxPageSetupDialogData& wxPageSetupDialogData::operator=(const wxPageSetupDialogData& data)
@@ -1147,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;
@@ -1158,217 +592,11 @@ wxPageSetupDialogData& wxPageSetupDialogData::operator=(const wxPageSetupDialogD
 wxPageSetupDialogData& wxPageSetupDialogData::operator=(const wxPrintData& data)
 {
     m_printData = data;
+    CalculatePaperSizeFromId();
 
     return *this;
 }
 
-#if defined(__WIN95__)
-void wxPageSetupDialogData::ConvertToNative()
-{
-    m_printData.ConvertToNative();
-
-    PAGESETUPDLG *pd = (PAGESETUPDLG*) m_pageSetupData;
-
-    if ( m_pageSetupData == NULL )
-    {
-        pd = new PAGESETUPDLG;
-        pd->hDevMode = NULL;
-        pd->hDevNames = NULL;
-        m_pageSetupData = (void *)pd;
-    }
-
-    // Pass the devmode data (created in m_printData.ConvertToNative)
-    // to the PRINTDLG structure, since it'll
-    // be needed when PrintDlg is called.
-
-    if (pd->hDevMode)
-    {
-        GlobalFree(pd->hDevMode);
-        pd->hDevMode = NULL;
-    }
-
-    pd->hDevMode = (HGLOBAL) m_printData.GetNativeData();
-
-    m_printData.SetNativeData((void*) NULL);
-
-    // Shouldn't assert; we should be able to test Ok-ness at a higher level
-    //wxASSERT_MSG( (pd->hDevMode), wxT("hDevMode must be non-NULL in ConvertToNative!"));
-
-    // Pass the devnames data (created in m_printData.ConvertToNative)
-    // to the PRINTDLG structure, since it'll
-    // be needed when PrintDlg is called.
-
-    if (pd->hDevNames)
-    {
-        GlobalFree(pd->hDevNames);
-        pd->hDevNames = NULL;
-    }
-
-    pd->hDevNames = (HGLOBAL) m_printData.GetNativeDataDevNames();
-
-    m_printData.SetNativeDataDevNames((void*) NULL);
-
-//        pd->hDevMode = GlobalAlloc(GMEM_MOVEABLE, sizeof(DEVMODE));
-
-    pd->Flags = PSD_MARGINS|PSD_MINMARGINS;
-
-    if ( m_defaultMinMargins )
-        pd->Flags |= PSD_DEFAULTMINMARGINS;
-    if ( !m_enableMargins )
-        pd->Flags |= PSD_DISABLEMARGINS;
-    if ( !m_enableOrientation )
-        pd->Flags |= PSD_DISABLEORIENTATION;
-    if ( !m_enablePaper )
-        pd->Flags |= PSD_DISABLEPAPER;
-    if ( !m_enablePrinter )
-        pd->Flags |= PSD_DISABLEPRINTER;
-    if ( m_getDefaultInfo )
-        pd->Flags |= PSD_RETURNDEFAULT;
-    if ( m_enableHelp )
-        pd->Flags |= PSD_SHOWHELP;
-
-    // We want the units to be in hundredths of a millimetre
-    pd->Flags |= PSD_INHUNDREDTHSOFMILLIMETERS;
-
-    pd->lStructSize = sizeof( PAGESETUPDLG );
-    pd->hwndOwner=(HWND)NULL;
-//    pd->hDevNames=(HWND)NULL;
-    pd->hInstance=(HINSTANCE)NULL;
-    //   PAGESETUPDLG is in hundreds of a mm
-    pd->ptPaperSize.x = m_paperSize.x * 100;
-    pd->ptPaperSize.y = m_paperSize.y * 100;
-
-    pd->rtMinMargin.left = m_minMarginTopLeft.x * 100;
-    pd->rtMinMargin.top = m_minMarginTopLeft.y * 100;
-    pd->rtMinMargin.right = m_minMarginBottomRight.x * 100;
-    pd->rtMinMargin.bottom = m_minMarginBottomRight.y * 100;
-
-    pd->rtMargin.left = m_marginTopLeft.x * 100;
-    pd->rtMargin.top = m_marginTopLeft.y * 100;
-    pd->rtMargin.right = m_marginBottomRight.x * 100;
-    pd->rtMargin.bottom = m_marginBottomRight.y * 100;
-
-    pd->lCustData = 0;
-    pd->lpfnPageSetupHook = NULL;
-    pd->lpfnPagePaintHook = NULL;
-    pd->hPageSetupTemplate = NULL;
-    pd->lpPageSetupTemplateName = NULL;
-
-/*
-    if ( pd->hDevMode )
-    {
-        DEVMODE *devMode = (DEVMODE*) GlobalLock(pd->hDevMode);
-        memset(devMode, 0, sizeof(DEVMODE));
-        devMode->dmSize = sizeof(DEVMODE);
-        devMode->dmOrientation = m_orientation;
-        devMode->dmFields = DM_ORIENTATION;
-        GlobalUnlock(pd->hDevMode);
-    }
-*/
-}
-
-void wxPageSetupDialogData::ConvertFromNative()
-{
-    PAGESETUPDLG *pd = (PAGESETUPDLG *) m_pageSetupData;
-    if ( !pd )
-        return;
-
-    // Pass the devmode data back to the wxPrintData structure where it really belongs.
-    if (pd->hDevMode)
-    {
-        if (m_printData.GetNativeData())
-        {
-            // Make sure we don't leak memory
-            GlobalFree((HGLOBAL) m_printData.GetNativeData());
-        }
-        m_printData.SetNativeData((void*) pd->hDevMode);
-        pd->hDevMode = NULL;
-    }
-
-    m_printData.ConvertFromNative();
-
-    // Pass the devnames data back to the wxPrintData structure where it really belongs.
-    if (pd->hDevNames)
-    {
-        if (m_printData.GetNativeDataDevNames())
-        {
-            // Make sure we don't leak memory
-            GlobalFree((HGLOBAL) m_printData.GetNativeDataDevNames());
-        }
-        m_printData.SetNativeDataDevNames((void*) pd->hDevNames);
-        pd->hDevNames = NULL;
-    }
-
-    m_printData.ConvertFromNative();
-
-    pd->Flags = PSD_MARGINS|PSD_MINMARGINS;
-
-    m_defaultMinMargins = ((pd->Flags & PSD_DEFAULTMINMARGINS) == PSD_DEFAULTMINMARGINS);
-    m_enableMargins = ((pd->Flags & PSD_DISABLEMARGINS) != PSD_DISABLEMARGINS);
-    m_enableOrientation = ((pd->Flags & PSD_DISABLEORIENTATION) != PSD_DISABLEORIENTATION);
-    m_enablePaper = ((pd->Flags & PSD_DISABLEPAPER) != PSD_DISABLEPAPER);
-    m_enablePrinter = ((pd->Flags & PSD_DISABLEPRINTER) != PSD_DISABLEPRINTER);
-    m_getDefaultInfo = ((pd->Flags & PSD_RETURNDEFAULT) == PSD_RETURNDEFAULT);
-    m_enableHelp = ((pd->Flags & PSD_SHOWHELP) == PSD_SHOWHELP);
-
-    //   PAGESETUPDLG is in hundreds of a mm
-    m_paperSize.x = pd->ptPaperSize.x / 100;
-    m_paperSize.y = pd->ptPaperSize.y / 100;
-
-    m_minMarginTopLeft.x = pd->rtMinMargin.left / 100;
-    m_minMarginTopLeft.y = pd->rtMinMargin.top / 100;
-    m_minMarginBottomRight.x = pd->rtMinMargin.right / 100;
-    m_minMarginBottomRight.y = pd->rtMinMargin.bottom / 100;
-
-    m_marginTopLeft.x = pd->rtMargin.left / 100;
-    m_marginTopLeft.y = pd->rtMargin.top / 100;
-    m_marginBottomRight.x = pd->rtMargin.right / 100;
-    m_marginBottomRight.y = pd->rtMargin.bottom / 100;
-}
-
-void wxPageSetupDialogData::SetOwnerWindow(wxWindow* win)
-{
-    if ( m_pageSetupData == NULL )
-        ConvertToNative();
-
-    if ( m_pageSetupData != NULL && win != NULL)
-    {
-        PAGESETUPDLG *pd = (PAGESETUPDLG *) m_pageSetupData;
-        pd->hwndOwner=(HWND) win->GetHWND();
-    }
-}
-#endif // Win95
-
-#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)
@@ -1386,6 +614,12 @@ void wxPageSetupDialogData::SetPaperSize(wxPaperSize id)
     CalculatePaperSizeFromId();
 }
 
+void wxPageSetupDialogData::SetPrintData(const wxPrintData& printData)
+{
+    m_printData = printData;
+    CalculatePaperSizeFromId();
+}
+
 // Use paper size defined in this object to set the wxPrintData
 // paper id
 void wxPageSetupDialogData::CalculateIdFromPaperSize()