fix warnings about hiding virtual wxGraphicsContext::DrawText() overloads by using...

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

diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp
index 90ec1c14a4f218976c36f5920f846facc1a7eea5..4a02c492980384c4f437b4bf5bcb5a97a790f58d 100644 (file)
--- a/src/common/cmndata.cpp
+++ b/src/common/cmndata.cpp
@@ -1,11 +1,11 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////

-// Name:        cmndata.cpp
+// Name:        src/common/cmndata.cpp

 // Purpose:     Common GDI data
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Purpose:     Common GDI data
 // Author:      Julian Smart
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
+// Copyright:   (c) Julian Smart

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 


@@ -17,10 +17,6 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
-    #pragma implementation "cmndata.h"
-#endif
-

 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 


@@ -28,63 +24,41 @@
     #pragma hdrstop
 #endif
 
     #pragma hdrstop
 #endif
 

+#include "wx/cmndata.h"
+

 #ifndef WX_PRECOMP
 #ifndef WX_PRECOMP

+    #if defined(__WXMSW__)
+        #include "wx/msw/wrapcdlg.h"
+    #endif // MSW

     #include <stdio.h>
     #include "wx/string.h"
     #include "wx/utils.h"
     #include "wx/app.h"
     #include <stdio.h>
     #include "wx/string.h"
     #include "wx/utils.h"
     #include "wx/app.h"

+    #include "wx/log.h"
+    #include "wx/gdicmn.h"

 #endif
 
 #endif
 

-#include "wx/gdicmn.h"
-#include "wx/cmndata.h"
-#include "wx/log.h"
+#include "wx/tokenzr.h"
+#include "wx/prntbase.h"
+#include "wx/printdlg.h"

 
 

-// For compatibility
-#if (defined(__WXMOTIF__) || defined(__WXGTK__) || defined(__WXPM__)) && wxUSE_POSTSCRIPT
-    #define wxCOMPATIBILITY_WITH_PRINTSETUPDATA 1
-#endif
+#if wxUSE_FONTDLG
+    #include "wx/fontdlg.h"
+#endif // wxUSE_FONTDLG

 
 #if wxUSE_PRINTING_ARCHITECTURE
 
 #if wxUSE_PRINTING_ARCHITECTURE

-    #include "wx/paper.h"
-
-    #if wxCOMPATIBILITY_WITH_PRINTSETUPDATA
-        #include "wx/generic/dcpsg.h"
-    #endif
-#endif // wxUSE_PRINTING_ARCHITECTURE
-
-#ifdef __WXMSW__
-    #include <windows.h>
-    #include "wx/msw/private.h"

 
 

-    #if !defined(__WIN32__)
-        #include <print.h>
-        #include <commdlg.h>
-    #endif // Win16
+#include "wx/paper.h"

 
 

-    #ifdef __WXWINE__
-        #include <cderr.h>
-        #include <commdlg.h>
-    #endif

 
 

-    #if defined(__WATCOMC__) || defined(__SC__) || defined(__SALFORDC__)
-        #include <windowsx.h>
-        #include <commdlg.h>
-    #endif
-#endif // MSW
+IMPLEMENT_DYNAMIC_CLASS(wxPrintData, wxObject)
+IMPLEMENT_DYNAMIC_CLASS(wxPrintDialogData, wxObject)
+IMPLEMENT_DYNAMIC_CLASS(wxPageSetupDialogData, wxObject)

 
 

-    #if wxUSE_PRINTING_ARCHITECTURE
-        IMPLEMENT_DYNAMIC_CLASS(wxPrintData, wxObject)
-        IMPLEMENT_DYNAMIC_CLASS(wxPrintDialogData, wxObject)
-        IMPLEMENT_DYNAMIC_CLASS(wxPageSetupDialogData, wxObject)
-    #endif // wxUSE_PRINTING_ARCHITECTURE
-
-    IMPLEMENT_DYNAMIC_CLASS(wxFontData, wxObject)
-    IMPLEMENT_DYNAMIC_CLASS(wxColourData, wxObject)
+#endif // wxUSE_PRINTING_ARCHITECTURE

 
 

-#ifdef __WXMAC__
-    #define mm2pt            2.83464566929
-    #define pt2mm            0.352777777778
-#endif // Mac
+IMPLEMENT_DYNAMIC_CLASS(wxFontData, wxObject)
+IMPLEMENT_DYNAMIC_CLASS(wxColourData, wxObject)

 
 // ============================================================================
 // implementation
 
 // ============================================================================
 // implementation


@@ -96,15 +70,13 @@
 
 wxColourData::wxColourData()
 {
 
 wxColourData::wxColourData()
 {

-    int i;
-    for (i = 0; i < 16; i++)
-        custColours[i].Set(255, 255, 255);
-
-    chooseFull = FALSE;
-    dataColour.Set(0,0,0);
+    m_chooseFull = false;
+    m_dataColour.Set(0,0,0);
+    // m_custColours are wxNullColours initially

 }
 
 wxColourData::wxColourData(const wxColourData& data)
 }
 
 wxColourData::wxColourData(const wxColourData& data)

+            : wxObject()

 {
     (*this) = data;
 }
 {
     (*this) = data;
 }


@@ -113,30 +85,70 @@ wxColourData::~wxColourData()
 {
 }
 
 {
 }
 

-void wxColourData::SetCustomColour(int i, wxColour& colour)
+void wxColourData::SetCustomColour(int i, const wxColour& colour)

 {
 {

-    if (i > 15 || i < 0)
-        return;
+    wxCHECK_RET( i >= 0 && i < NUM_CUSTOM, _T("custom colour index out of range") );

 
 

-    custColours[i] = colour;
+    m_custColours[i] = colour;

 }
 
 }
 

-wxColour wxColourData::GetCustomColour(int i)
+wxColour wxColourData::GetCustomColour(int i) const

 {
 {

-    if (i > 15 || i < 0)
-        return wxColour(0,0,0);
+    wxCHECK_MSG( i >= 0 && i < NUM_CUSTOM, wxColour(0,0,0),
+                 _T("custom colour index out of range") );

 
 

-    return custColours[i];
+    return m_custColours[i];

 }
 
 }
 

-void wxColourData::operator=(const wxColourData& data)
+wxColourData& wxColourData::operator=(const wxColourData& data)

 {
 {

-    int i;
-    for (i = 0; i < 16; i++)
-        custColours[i] = data.custColours[i];
+    for ( int i = 0; i < NUM_CUSTOM; i++)
+        m_custColours[i] = data.m_custColours[i];
+
+    m_dataColour = data.m_dataColour;
+    m_chooseFull = data.m_chooseFull;

 
 

-    dataColour = (wxColour&)data.dataColour;
-    chooseFull = data.chooseFull;
+    return *this;
+}
+
+// ----------------------------------------------------------------------------
+// [de]serialization
+// ----------------------------------------------------------------------------
+
+// separator used between different fields
+static const char wxCOL_DATA_SEP = ',';
+
+wxString wxColourData::ToString() const
+{
+    wxString str(m_chooseFull ? '1' : '0');
+
+    for ( int i = 0; i < NUM_CUSTOM; i++ )
+    {
+        str += wxCOL_DATA_SEP;
+
+        const wxColour& clr = m_custColours[i];
+        if ( clr.IsOk() )
+            str += clr.GetAsString(wxC2S_HTML_SYNTAX);
+    }
+
+    return str;
+}
+
+bool wxColourData::FromString(const wxString& str)
+{
+    wxStringTokenizer tokenizer(str, wxCOL_DATA_SEP);
+    wxString token = tokenizer.GetNextToken();
+    m_chooseFull = token == '1';
+    bool success = m_chooseFull || token == '0';
+    for (int i = 0; success && i < NUM_CUSTOM; i++)
+    {
+        token = tokenizer.GetNextToken();
+        if (token.empty())
+            m_custColours[i] = wxNullColour;
+        else
+            success = m_custColours[i].Set(token);
+    }
+    return success;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -146,13 +158,13 @@ void wxColourData::operator=(const wxColourData& data)
 wxFontData::wxFontData()
 {
     // Intialize colour to black.
 wxFontData::wxFontData()
 {
     // Intialize colour to black.

-    fontColour.Set(0, 0, 0);
+    m_fontColour = wxNullColour;

 
 

-    showHelp = FALSE;
-    allowSymbols = TRUE;
-    enableEffects = TRUE;
-    minSize = 0;
-    maxSize = 0;
+    m_showHelp = false;
+    m_allowSymbols = true;
+    m_enableEffects = true;
+    m_minSize = 0;
+    m_maxSize = 0;

 
     m_encoding = wxFONTENCODING_SYSTEM;
 }
 
     m_encoding = wxFONTENCODING_SYSTEM;
 }


@@ -161,6 +173,14 @@ wxFontData::~wxFontData()
 {
 }
 
 {
 }
 

+#if wxUSE_FONTDLG
+
+wxFontDialogBase::~wxFontDialogBase()
+{
+}
+
+#endif // wxUSE_FONTDLG
+

 #if wxUSE_PRINTING_ARCHITECTURE
 // ----------------------------------------------------------------------------
 // Print data
 #if wxUSE_PRINTING_ARCHITECTURE
 // ----------------------------------------------------------------------------
 // Print data


@@ -168,611 +188,127 @@ wxFontData::~wxFontData()
 
 wxPrintData::wxPrintData()
 {
 
 wxPrintData::wxPrintData()
 {

-#ifdef __WXMSW__
-    m_devMode = (void*) NULL;
-    m_devNames = (void*) NULL;
-#elif defined( __WXMAC__ )
-       m_macPrintInfo = (THPrint) NewHandleClear( sizeof( TPrint ) ) ;
-       (**m_macPrintInfo).iPrVersion = 0;                                      // something invalid 
-
-       (**m_macPrintInfo).prInfo.iHRes = 72;
-       (**m_macPrintInfo).prInfo.iVRes = 72;
-       Rect r1 = { 0, 0, 8*72 - 2 * 18, 11*72 - 2 * 36 } ;
-       (**m_macPrintInfo).prInfo.rPage = r1;// must have its top left & (0,0)
-
-       Rect r2 = { -18, -36, 8*72 - 18, 11*72 - 36  } ;
-       (**m_macPrintInfo).rPaper = r2;
-       (**m_macPrintInfo).prStl.iPageV = 11 * 120 ;                            // 11 inches in 120th of an inch 
-       (**m_macPrintInfo).prStl.iPageH = 8 * 120 ;                             // 8 inches in 120th of an inch 
-/*
-       UMAPrOpen() ;
-       m_macPrintInfo = (THPrint) NewHandleClear( sizeof( TPrint ) ) ;
-       ::PrintDefault( m_macPrintInfo ) ;
-       OSErr err = PrError() ;
-       UMAPrClose() ;
-       wxASSERT( err == noErr ) ;
-*/
-#endif
+    m_bin = wxPRINTBIN_DEFAULT;
+    m_media = wxPRINTMEDIA_DEFAULT;
+    m_printMode = wxPRINT_MODE_PRINTER;

     m_printOrientation = wxPORTRAIT;
     m_printOrientation = wxPORTRAIT;

+    m_printOrientationReversed = false;

     m_printNoCopies = 1;
     m_printNoCopies = 1;

-    m_printCollate = FALSE;
+    m_printCollate = false;

 
     // New, 24/3/99
 
     // New, 24/3/99

-    m_printerName = "";
-    m_colour = TRUE;
+    m_printerName = wxEmptyString;
+    m_colour = true;

     m_duplexMode = wxDUPLEX_SIMPLEX;
     m_printQuality = wxPRINT_QUALITY_HIGH;
     m_duplexMode = wxDUPLEX_SIMPLEX;
     m_printQuality = wxPRINT_QUALITY_HIGH;

-    m_paperId = wxPAPER_A4;
-    m_paperSize = wxSize(210, 297);
-
-    // PostScript-specific data
-    m_printerCommand = "";
-    m_previewCommand = "";
-    m_printerOptions = "";
-    m_filename = "";
-    m_afmPath = "";
-    m_printerScaleX = 1.0;
-    m_printerScaleY = 1.0;
-    m_printerTranslateX = 0;
-    m_printerTranslateY = 0;
-    m_printMode = wxPRINT_MODE_FILE;
-}

 
 

-wxPrintData::wxPrintData(const wxPrintData& printData)
-{
-#ifdef __WXMSW__
-    m_devMode = (void*) NULL;
-    m_devNames = (void*) NULL;
-#elif defined( __WXMAC__ )
-       m_macPrintInfo = NULL ;
-       /*
-       (THPrint) NewHandleClear( sizeof( TPrint ) ) ;
-       UMAPrOpen() ;
-       m_macPrintInfo = (THPrint) NewHandleClear( sizeof( TPrint ) ) ;
-       ::PrintDefault( m_macPrintInfo ) ;
-       OSErr err = PrError() ;
-       UMAPrClose() ;
-       wxASSERT( err == noErr ) ;
-       */
-#endif
-    (*this) = printData;
-}
+    // we intentionally don't initialize paper id and size at all, like this
+    // the default system settings will be used for them
+    m_paperId = wxPAPER_NONE;
+    m_paperSize = wxDefaultSize;

 
 

-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__)
-       wxASSERT( m_macPrintInfo ) ;
-//     ::DisposeHandle( (Handle) m_macPrintInfo ) ;
-#endif
-}
+    m_privData = NULL;
+    m_privDataLen = 0;

 
 

-#if defined(__WXMSW__) // && defined(__WIN32__)
-
-#if defined(__WXDEBUG__) && defined(__WIN32__)
-static wxString wxGetPrintDlgError()
-{
-    DWORD err = CommDlgExtendedError();
-    wxString msg = wxT("Unknown");
-    switch (err)
-    {
-        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;
-    }
-    return msg;
+    m_nativeData = wxPrintFactory::GetFactory()->CreatePrintNativeData();

 }
 }

-#endif

 
 

-static HGLOBAL wxCreateDevNames(const wxString& driverName, const wxString& printerName, const wxString& portName)
+wxPrintData::wxPrintData(const wxPrintData& printData)
+    : wxObject()

 {
 {

-       HGLOBAL hDev = NULL;
-       // if (!driverName.IsEmpty() && !printerName.IsEmpty() && !portName.IsEmpty())
-    if (driverName.IsEmpty() && printerName.IsEmpty() && portName.IsEmpty())
-    {
-    }
-    else
-       {
-               hDev = GlobalAlloc(GPTR, 4*sizeof(WORD)+
-                       driverName.Length() + 1 +
-                       printerName.Length() + 1 +
-                       portName.Length()+1);
-               LPDEVNAMES lpDev = (LPDEVNAMES)GlobalLock(hDev);
-               lpDev->wDriverOffset = sizeof(WORD)*4;
-               wxStrcpy((wxChar*)lpDev + lpDev->wDriverOffset, driverName);
-
-               lpDev->wDeviceOffset = (WORD)(lpDev->wDriverOffset + driverName.Length()+1);
-               wxStrcpy((wxChar*)lpDev + lpDev->wDeviceOffset, printerName);
-
-               lpDev->wOutputOffset = (WORD)(lpDev->wDeviceOffset + printerName.Length()+1);
-               wxStrcpy((wxChar*)lpDev + lpDev->wOutputOffset, portName);
-
-               lpDev->wDefault = 0;
-
-        GlobalUnlock(hDev);
-       }
-       return hDev;
+    m_nativeData = NULL;
+    m_privData = NULL;
+    (*this) = printData;

 }
 
 }
 

-void wxPrintData::ConvertToNative()
+void wxPrintData::SetPrivData( char *privData, int len )

 {
 {

-    HGLOBAL hDevMode = (HGLOBAL)(DWORD) m_devMode;
-    HGLOBAL hDevNames = (HGLOBAL)(DWORD) m_devNames;
-    if (!hDevMode)
+    if (m_privData)

     {
     {

-        // Use PRINTDLG as a way of creating a DEVMODE object
-        PRINTDLG *pd = new PRINTDLG;
-
-        // 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));
-        pd->lStructSize    = sizeof(PRINTDLG);
-#endif
-
-        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;
-
-        }
-
-        delete pd;
+        delete [] m_privData;
+        m_privData = NULL;

     }
     }

-
-    if ( hDevMode )
+    m_privDataLen = len;
+    if (m_privDataLen > 0)

     {
     {

-        LPDEVMODE devMode = (LPDEVMODE) GlobalLock(hDevMode);
-
-        //// Orientation
-
-#ifndef __WXWINE__
-        devMode->dmOrientation = m_printOrientation;
-#endif
-        devMode->dmFields = DM_ORIENTATION;
-
-        //// Collation
-
-#ifndef __WIN16__
-        devMode->dmCollate = (m_printCollate ? DMCOLLATE_TRUE : DMCOLLATE_FALSE);
-        devMode->dmFields |= DM_COLLATE;
-#endif
-
-        //// Number of copies
-
-        devMode->dmCopies = m_printNoCopies;
-        devMode->dmFields |= DM_COPIES;
-
-        //// Printer name
-
-        if (m_printerName != wxT(""))
-        {
-            // TODO: make this Unicode compatible
-            int len = wxMin(31, m_printerName.Len());
-            int i;
-            for (i = 0; i < len; i++)
-                devMode->dmDeviceName[i] = m_printerName.GetChar(i);
-            devMode->dmDeviceName[i] = 0;
-        }
-
-        //// Colour
-
-        if (m_colour)
-            devMode->dmColor = DMCOLOR_COLOR;
-        else
-            devMode->dmColor = DMCOLOR_MONOCHROME;
-
-        devMode->dmFields |= DM_COLOR;
-
-#ifndef __WXWINE__
-        //// Paper size
-
-        if (m_paperId == wxPAPER_NONE)
-        {
-            devMode->dmPaperWidth = m_paperSize.x * 10;
-            devMode->dmPaperLength = m_paperSize.y * 10;
-            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;
-                }
-            }
-        }
-#endif
-
-        //// 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;
-
-        GlobalUnlock(hDevMode);
-    }
-
-    if ( hDevNames )
-    {
-        GlobalFree(hDevNames);
+        m_privData = new char[m_privDataLen];
+        memcpy( m_privData, privData, m_privDataLen );

     }
     }

-
-    // TODO: I hope it's OK to pass some empty strings to DEVNAMES.
-    m_devNames = (void*) (long) wxCreateDevNames("", m_printerName, "");

 }
 
 }
 

-void wxPrintData::ConvertFromNative()
+wxPrintData::~wxPrintData()

 {
 {

-    HGLOBAL hDevMode = (HGLOBAL)(DWORD) m_devMode;
-    HGLOBAL hDevNames = (HGLOBAL)(DWORD) m_devNames;
-
-    if (!hDevMode)
-        return;
-
-    if ( hDevMode )
-    {
-        LPDEVMODE devMode = (LPDEVMODE)GlobalLock(hDevMode);
-
-#ifndef __WXWINE__
-        //// Orientation
-
-        if (devMode->dmFields & DM_ORIENTATION)
-            m_printOrientation = devMode->dmOrientation;
-#endif
-
-        //// Collation
-
-#ifndef __WIN16__
-        if (devMode->dmFields & DM_COLLATE)
-        {
-            if (devMode->dmCollate == DMCOLLATE_TRUE)
-                m_printCollate = TRUE;
-            else
-                m_printCollate = FALSE;
-        }
-#endif
+    m_nativeData->m_ref--;
+    if (m_nativeData->m_ref == 0)
+        delete m_nativeData;

 
 

-        //// Number of copies
-
-        if (devMode->dmFields & DM_COPIES)
-        {
-            m_printNoCopies = devMode->dmCopies;
-        }
-
-        //// Printer name
-
-        if (devMode->dmDeviceName[0] != 0)
-        {
-            // TODO: make this Unicode compatible
-            char buf[32];
-            int i = 0;
-            while (devMode->dmDeviceName[i] != 0)
-            {
-                buf[i] = devMode->dmDeviceName[i];
-                i ++;
-            }
-            buf[i] = 0;
-
-            m_printerName = buf;
-        }
-
-        //// Colour
-
-        if (devMode->dmFields & DM_COLOR)
-        {
-            if (devMode->dmColor == DMCOLOR_COLOR)
-                m_colour = TRUE;
-            else
-                m_colour = FALSE;
-        }
-        else
-            m_colour = TRUE;
-
-#ifndef __WXWINE__
-        //// Paper size
-
-        if (devMode->dmFields & DM_PAPERSIZE)
-        {
-            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))
-        {
-            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;
-        }
-#endif
-
-        //// 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);
-    }
-
-    if (hDevNames)
-    {
-        LPDEVNAMES lpDevNames = (LPDEVNAMES)GlobalLock(hDevNames);
-        if (lpDevNames)
-        {
-            // TODO: Unicode-ification
-
-            // Get the port name
-            // port is obsolete in WIN32
-            // m_printData.SetPortName((LPSTR)lpDevNames + lpDevNames->wDriverOffset);
-
-            // Get the printer name
-            wxString printerName = (LPSTR)lpDevNames + lpDevNames->wDeviceOffset;
-
-            // 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!");
-
-            if (printerName != wxT(""))
-                m_printerName = printerName;
-
-            GlobalUnlock(hDevNames);
-        }
-    }
+    if (m_privData)
+        delete [] m_privData;

 }
 
 }
 

-#endif
-
-#ifdef __WXMAC__

 void wxPrintData::ConvertToNative()
 {
 void wxPrintData::ConvertToNative()
 {

-       (**m_macPrintInfo).prJob.iCopies = m_printNoCopies ;
+    m_nativeData->TransferFrom( *this ) ;

 }
 
 void wxPrintData::ConvertFromNative()
 {
 }
 
 void wxPrintData::ConvertFromNative()
 {

-       m_printNoCopies = (**m_macPrintInfo).prJob.iCopies ;
+    m_nativeData->TransferTo( *this ) ;

 }
 }

-#endif

 
 

-void wxPrintData::operator=(const wxPrintData& data)
+wxPrintData& wxPrintData::operator=(const wxPrintData& data)

 {
 {

-#ifdef __WXMAC__
-       m_macPrintInfo = data.m_macPrintInfo ;
-       HandToHand( (Handle*) &m_macPrintInfo ) ;       
-#endif
+    if ( &data == this )
+        return *this;
+

     m_printNoCopies = data.m_printNoCopies;
     m_printCollate = data.m_printCollate;
     m_printOrientation = data.m_printOrientation;
     m_printNoCopies = data.m_printNoCopies;
     m_printCollate = data.m_printCollate;
     m_printOrientation = data.m_printOrientation;

+    m_printOrientationReversed = data.m_printOrientationReversed;

     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_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;

-
-    // 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_bin = data.m_bin;
+    m_media = data.m_media;

     m_printMode = data.m_printMode;
     m_printMode = data.m_printMode;

+    m_filename = data.m_filename;
+
+    // UnRef old m_nativeData
+    if (m_nativeData)
+    {
+        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 (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 );
+    }
+
+    return *this;

 }
 
 }
 

-// For compatibility
-#if wxCOMPATIBILITY_WITH_PRINTSETUPDATA
-void wxPrintData::operator=(const wxPrintSetupData& setupData)
+// Is this data OK for showing the print dialog?
+bool wxPrintData::IsOk() const

 {
 {

-    SetPrinterCommand(setupData.GetPrinterCommand());
-    SetPreviewCommand(setupData.GetPrintPreviewCommand());
-    SetPrinterOptions(setupData.GetPrinterOptions());
-
-    long xt, yt;
-    setupData.GetPrinterTranslation(& xt, & yt);
-    SetPrinterTranslation(xt, yt);
-
-    double xs, ys;
-    setupData.GetPrinterScaling(& xs, & ys);
-    SetPrinterScaling(xs, ys);
-
-    SetOrientation(setupData.GetPrinterOrientation());
-    SetPrintMode((wxPrintMode) setupData.GetPrinterMode());
-    SetFontMetricPath(setupData.GetAFMPath());
-    if (setupData.GetPaperName() != "")
-        SetPaperId(wxThePrintPaperDatabase->ConvertNameToId(setupData.GetPaperName()));
-    SetColour(setupData.GetColour());
-    SetFilename(setupData.GetPrinterFile());
-}
-#endif // wxCOMPATIBILITY_WITH_PRINTSETUPDATA
+    m_nativeData->TransferFrom( *this );

 
 

+    return m_nativeData->Ok();
+}

 
 // ----------------------------------------------------------------------------
 // Print dialog data
 
 // ----------------------------------------------------------------------------
 // Print dialog data


@@ -780,258 +316,56 @@ void wxPrintData::operator=(const wxPrintSetupData& setupData)
 
 wxPrintDialogData::wxPrintDialogData()
 {
 
 wxPrintDialogData::wxPrintDialogData()
 {

-#ifdef __WXMSW__
-    m_printDlgData = NULL;
-#endif

     m_printFromPage = 0;
     m_printToPage = 0;
     m_printMinPage = 0;
     m_printMaxPage = 0;
     m_printNoCopies = 1;
     m_printFromPage = 0;
     m_printToPage = 0;
     m_printMinPage = 0;
     m_printMaxPage = 0;
     m_printNoCopies = 1;

-    m_printAllPages = FALSE;
-    m_printCollate = FALSE;
-    m_printToFile = FALSE;
-    m_printSelection = FALSE;
-    m_printEnableSelection = FALSE;
-    m_printEnablePageNumbers = TRUE;
-    m_printEnablePrintToFile = TRUE;
-    m_printEnableHelp = FALSE;
-    m_printSetupDialog = FALSE;
+    m_printAllPages = false;
+    m_printCollate = false;
+    m_printToFile = false;
+    m_printSelection = false;
+    m_printEnableSelection = false;
+    m_printEnablePageNumbers = true;
+
+    wxPrintFactory* factory = wxPrintFactory::GetFactory();
+    m_printEnablePrintToFile = ! factory->HasOwnPrintToFile();
+
+    m_printEnableHelp = false;

 }
 
 wxPrintDialogData::wxPrintDialogData(const wxPrintDialogData& dialogData)
 }
 
 wxPrintDialogData::wxPrintDialogData(const wxPrintDialogData& dialogData)

+    : wxObject()

 {
 {

-#ifdef __WXMSW__
-    m_printDlgData = NULL;
-#endif

     (*this) = dialogData;
 }
 
 wxPrintDialogData::wxPrintDialogData(const wxPrintData& printData)
 {
     (*this) = dialogData;
 }
 
 wxPrintDialogData::wxPrintDialogData(const wxPrintData& printData)
 {

-#ifdef __WXMSW__
-    m_printDlgData = NULL;
-#endif
-    m_printFromPage = 0;
+    m_printFromPage = 1;

     m_printToPage = 0;
     m_printToPage = 0;

-    m_printMinPage = 0;
-    m_printMaxPage = 0;
+    m_printMinPage = 1;
+    m_printMaxPage = 9999;

     m_printNoCopies = 1;
     m_printNoCopies = 1;

-    m_printAllPages = FALSE;
-    m_printCollate = FALSE;
-    m_printToFile = FALSE;
-    m_printSelection = FALSE;
-    m_printEnableSelection = FALSE;
-    m_printEnablePageNumbers = TRUE;
-    m_printEnablePrintToFile = TRUE;
-    m_printEnableHelp = FALSE;
-    m_printSetupDialog = FALSE;
-
-    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;
-        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);
-
-    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 = (UINT)m_printFromPage;
-    pd->nToPage = (UINT)m_printToPage;
-    pd->nMinPage = (UINT)m_printMinPage;
-    pd->nMaxPage = (UINT)m_printMaxPage;
-    pd->nCopies = (UINT)m_printNoCopies;
-
-    pd->Flags = PD_RETURNDC ;
-
-#ifdef __GNUWIN32__
-    pd->lStructSize = 66 ;
+    // On Mac the Print dialog always defaults to "All Pages"
+#ifdef __WXMAC__
+    m_printAllPages = true;

 #else
 #else

-    pd->lStructSize = sizeof( PRINTDLG );
+    m_printAllPages = false;

 #endif
 #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_printAllPages )
-        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;
-    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 wxWindows 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_ALLPAGES) == PD_ALLPAGES);
-    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.m_macPrintInfo).prJob.iFstPage = m_printFromPage ;
-       (**m_printData.m_macPrintInfo).prJob.iLstPage = m_printToPage ;
-       m_printData.ConvertToNative() ;
+    m_printCollate = false;
+    m_printToFile = false;
+    m_printSelection = false;
+    m_printEnableSelection = false;
+    m_printEnablePageNumbers = true;
+    m_printEnablePrintToFile = true;
+    m_printEnableHelp = false;
+    m_printData = printData;

 }
 
 }
 

-void wxPrintDialogData::ConvertFromNative()
+wxPrintDialogData::~wxPrintDialogData()

 {
 {

-       m_printData.ConvertFromNative() ;
-       m_printFromPage = (**m_printData.m_macPrintInfo).prJob.iFstPage ;
-       m_printToPage = (**m_printData.m_macPrintInfo).prJob.iLstPage ;

 }
 }

-#endif
-

 
 void wxPrintDialogData::operator=(const wxPrintDialogData& data)
 {
 
 void wxPrintDialogData::operator=(const wxPrintDialogData& data)
 {


@@ -1048,8 +382,6 @@ void wxPrintDialogData::operator=(const wxPrintDialogData& data)
     m_printEnablePageNumbers = data.m_printEnablePageNumbers;
     m_printEnableHelp = data.m_printEnableHelp;
     m_printEnablePrintToFile = data.m_printEnablePrintToFile;
     m_printEnablePageNumbers = data.m_printEnablePageNumbers;
     m_printEnableHelp = data.m_printEnableHelp;
     m_printEnablePrintToFile = data.m_printEnablePrintToFile;

-    m_printSetupDialog = data.m_printSetupDialog;
-

     m_printData = data.m_printData;
 }
 
     m_printData = data.m_printData;
 }
 


@@ -1064,55 +396,47 @@ void wxPrintDialogData::operator=(const wxPrintData& data)
 
 wxPageSetupDialogData::wxPageSetupDialogData()
 {
 
 wxPageSetupDialogData::wxPageSetupDialogData()
 {

-#if defined(__WIN95__)
-    m_pageSetupData = NULL;
-#endif
-    m_paperSize = wxSize(0, 0);
+    m_paperSize = wxSize(0,0);

 
     CalculatePaperSizeFromId();
 
 
     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
 
     // Flags

-    m_defaultMinMargins = FALSE;
-    m_enableMargins = TRUE;
-    m_enableOrientation = TRUE;
-    m_enablePaper = TRUE;
-    m_enablePrinter = TRUE;
-    m_enableHelp = FALSE;
-    m_getDefaultInfo = FALSE;
+    m_defaultMinMargins = false;
+    m_enableMargins = true;
+    m_enableOrientation = true;
+    m_enablePaper = true;
+    m_enablePrinter = true;
+    m_enableHelp = false;
+    m_getDefaultInfo = false;

 }
 
 wxPageSetupDialogData::wxPageSetupDialogData(const wxPageSetupDialogData& dialogData)
 }
 
 wxPageSetupDialogData::wxPageSetupDialogData(const wxPageSetupDialogData& dialogData)

+    : wxObject()

 {
 {

-#if defined(__WIN95__)
-    m_pageSetupData = NULL;
-#endif

     (*this) = dialogData;
 }
 
 wxPageSetupDialogData::wxPageSetupDialogData(const wxPrintData& printData)
 {
     (*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
 
     // Flags

-    m_defaultMinMargins = FALSE;
-    m_enableMargins = TRUE;
-    m_enableOrientation = TRUE;
-    m_enablePaper = TRUE;
-    m_enablePrinter = TRUE;
-    m_enableHelp = FALSE;
-    m_getDefaultInfo = FALSE;
+    m_defaultMinMargins = false;
+    m_enableMargins = true;
+    m_enableOrientation = true;
+    m_enablePaper = true;
+    m_enablePrinter = true;
+    m_enableHelp = false;
+    m_getDefaultInfo = false;

 
     m_printData = printData;
 
 
     m_printData = printData;
 


@@ -1123,18 +447,9 @@ wxPageSetupDialogData::wxPageSetupDialogData(const wxPrintData& printData)
 
 wxPageSetupDialogData::~wxPageSetupDialogData()
 {
 
 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

 }
 
 }
 

-void wxPageSetupDialogData::operator=(const wxPageSetupDialogData& data)
+wxPageSetupDialogData& wxPageSetupDialogData::operator=(const wxPageSetupDialogData& data)

 {
     m_paperSize = data.m_paperSize;
     m_minMarginTopLeft = data.m_minMarginTopLeft;
 {
     m_paperSize = data.m_paperSize;
     m_minMarginTopLeft = data.m_minMarginTopLeft;


@@ -1146,239 +461,21 @@ void wxPageSetupDialogData::operator=(const wxPageSetupDialogData& data)
     m_enableOrientation = data.m_enableOrientation;
     m_enablePaper = data.m_enablePaper;
     m_enablePrinter = data.m_enablePrinter;
     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;
     m_enableHelp = data.m_enableHelp;
 
     m_printData = data.m_printData;

-}
-
-void wxPageSetupDialogData::operator=(const wxPrintData& data)
-{
-    m_printData = data;
-}
-
-#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);
-
-    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;
-
-    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);
-
-    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();
-    }
+    return *this;

 }
 }

-#endif // Win95

 
 

-#ifdef __WXMAC__
-void wxPageSetupDialogData::ConvertToNative()
+wxPageSetupDialogData& wxPageSetupDialogData::operator=(const wxPrintData& data)

 {
 {

-       m_printData.ConvertToNative() ;
-       // on mac the paper rect has a negative top left corner, because the page rect (printable area) is at 0,0
-       (**m_printData.m_macPrintInfo).rPaper.left = int( ((double) m_minMarginTopLeft.x)*mm2pt ) ;
-       (**m_printData.m_macPrintInfo).rPaper.top = int( ((double) m_minMarginTopLeft.y)*mm2pt ) ;
-
-       (**m_printData.m_macPrintInfo).rPaper.right = int( ((double) m_paperSize.x - m_minMarginTopLeft.x)*mm2pt ) ;
-       (**m_printData.m_macPrintInfo).rPaper.bottom = int( ((double) m_paperSize.y - m_minMarginTopLeft.y)*mm2pt ) ;
-       
-       (**m_printData.m_macPrintInfo).prInfo.rPage.left = 0 ;
-       (**m_printData.m_macPrintInfo).prInfo.rPage.top = 0 ;
-       (**m_printData.m_macPrintInfo).prInfo.rPage.right =  int( ((double) m_paperSize.x - m_minMarginTopLeft.x - m_minMarginBottomRight.x)*mm2pt ) ;
-       (**m_printData.m_macPrintInfo).prInfo.rPage.bottom =  int( ((double) m_paperSize.y - m_minMarginTopLeft.y - m_minMarginBottomRight.y)*mm2pt ) ;
-}
+    m_printData = data;
+    CalculatePaperSizeFromId();

 
 

-void wxPageSetupDialogData::ConvertFromNative()
-{
-       m_printData.ConvertFromNative () ;
-
-       m_paperSize.x = ((double) (**m_printData.m_macPrintInfo).rPaper.right - (**m_printData.m_macPrintInfo).rPaper.left ) * pt2mm ;
-       m_paperSize.y = ((double) (**m_printData.m_macPrintInfo).rPaper.bottom - (**m_printData.m_macPrintInfo).rPaper.top ) * pt2mm ;
-                       
-       m_minMarginTopLeft.x = ((double) -(**m_printData.m_macPrintInfo).rPaper.left ) * pt2mm ;
-       m_minMarginTopLeft.y = ((double) -(**m_printData.m_macPrintInfo).rPaper.top ) * pt2mm ;
-
-       m_minMarginBottomRight.x = ((double) (**m_printData.m_macPrintInfo).rPaper.right - (**m_printData.m_macPrintInfo).prInfo.rPage.right ) * pt2mm ;
-       m_minMarginBottomRight.y = ((double)(**m_printData.m_macPrintInfo).rPaper.bottom - (**m_printData.m_macPrintInfo).prInfo.rPage.bottom ) * pt2mm ;
-
-       // adjust minimal values
-       //TODO add custom fields in dialog for margins
-
-       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 ;
+    return *this;

 }
 }

-#endif
-

 
 // If a corresponding paper type is found in the paper database, will set the m_printData
 // paper size id member as well.
 
 // If a corresponding paper type is found in the paper database, will set the m_printData
 // paper size id member as well.


@@ -1397,6 +494,12 @@ void wxPageSetupDialogData::SetPaperSize(wxPaperSize id)
     CalculatePaperSizeFromId();
 }
 
     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()
 // Use paper size defined in this object to set the wxPrintData
 // paper id
 void wxPageSetupDialogData::CalculateIdFromPaperSize()


@@ -1421,12 +524,9 @@ void wxPageSetupDialogData::CalculatePaperSizeFromId()
 
     wxSize sz = wxThePrintPaperDatabase->GetSize(m_printData.GetPaperId());
 
 
     wxSize sz = wxThePrintPaperDatabase->GetSize(m_printData.GetPaperId());
 

-    if (sz.x != 0)
-    {
-        // sz is in 10ths of a mm, so multiply by 10.
-        m_paperSize.x = sz.x * 10;
-        m_paperSize.y = sz.y * 10;
-    }
+    // sz is in 10ths of a mm, while paper size is in mm
+    m_paperSize.x = sz.x / 10;
+    m_paperSize.y = sz.y / 10;

 }
 
 #endif // wxUSE_PRINTING_ARCHITECTURE
 }
 
 #endif // wxUSE_PRINTING_ARCHITECTURE