]> git.saurik.com Git - wxWidgets.git/blobdiff - src/common/cmndata.cpp
Also allow key events for Shift-Tab when wxWANTS_CHARS style is used
[wxWidgets.git] / src / common / cmndata.cpp
index 08bd0fa4de9751f78c4495a059efa9c1b31c03d2..0595eacc2720b912c74e51d77fff3901787720ac 100644 (file)
@@ -5,75 +5,99 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
-// Copyright:   (c) Julian Smart and Markus Holzem
+// Copyright:   (c) Julian Smart
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
-#ifdef __GNUG__
-#pragma implementation "cmndata.h"
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// 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"
 
 #ifdef __BORLANDC__
-#pragma hdrstop
+    #pragma hdrstop
 #endif
 
 #ifndef WX_PRECOMP
-#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"
 #endif
 
 #include "wx/gdicmn.h"
 #include "wx/cmndata.h"
-#include "wx/paper.h"
+#include "wx/log.h"
 
-// For compatibility
-#if (defined(__WXMOTIF__) || defined(__WXGTK__)) && wxUSE_POSTSCRIPT
-#include "wx/generic/dcpsg.h"
-#endif
+#if wxUSE_FONTDLG
+    #include "wx/fontdlg.h"
+#endif // wxUSE_FONTDLG
+
+#if wxUSE_PRINTING_ARCHITECTURE
+    #include "wx/paper.h"
+#endif // wxUSE_PRINTING_ARCHITECTURE
 
 #ifdef __WXMSW__
-#include <windows.h>
+    #include <windowsx.h>
+    #include "wx/msw/private.h"
 
-#if !defined(__WIN32__)
-#include <print.h>
-#include <commdlg.h>
-#endif
+    #if defined(__WXWINCE__) && !wxUSE_SMARTPHONE
+        #include <commdlg.h>
+    #endif
 
-#if defined(__WATCOMC__) || defined(__SC__) || defined(__SALFORDC__)
-#include <windowsx.h>
-#include <commdlg.h>
-#endif
+    #if defined(__WATCOMC__) || defined(__SYMANTEC__) || defined(__SALFORDC__)
+        #include <windowsx.h>
+        #include <commdlg.h>
+    #endif
+#endif // MSW
 
+#ifdef __WXMAC__
+    #include "wx/mac/private/print.h"
 #endif
 
-#if !USE_SHARED_LIBRARY
-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)
+    #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)
+
+#ifndef DMPAPER_USER
+     #define DMPAPER_USER                256
 #endif
 
-/*
-* wxColourData
-*/
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// 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_custColours[i].Set(255, 255, 255);
+
+    m_chooseFull = FALSE;
+    m_dataColour.Set(0,0,0);
 }
 
 wxColourData::wxColourData(const wxColourData& data)
+    : wxObject()
 {
     (*this) = data;
 }
@@ -82,84 +106,81 @@ wxColourData::~wxColourData()
 {
 }
 
-void wxColourData::SetCustomColour(int i, wxColour& colour)
+void wxColourData::SetCustomColour(int i, const wxColour& colour)
 {
     if (i > 15 || i < 0)
         return;
-    
-    custColours[i] = colour;
+
+    m_custColours[i] = colour;
 }
 
 wxColour wxColourData::GetCustomColour(int i)
 {
     if (i > 15 || i < 0)
         return wxColour(0,0,0);
-    
-    return custColours[i];
+
+    return m_custColours[i];
 }
 
 void wxColourData::operator=(const wxColourData& data)
 {
     int i;
     for (i = 0; i < 16; i++)
-        custColours[i] = data.custColours[i];
-    
-    dataColour = (wxColour&)data.dataColour;
-    chooseFull = data.chooseFull;
+        m_custColours[i] = data.m_custColours[i];
+
+    m_dataColour = (wxColour&)data.m_dataColour;
+    m_chooseFull = data.m_chooseFull;
 }
 
-/*
-* Font data
-*/
+// ----------------------------------------------------------------------------
+// Font data
+// ----------------------------------------------------------------------------
 
 wxFontData::wxFontData()
 {
     // Intialize colour to black.
-    fontColour.Set(0, 0, 0);
-    
-    showHelp = FALSE;
-    allowSymbols = TRUE;
-    enableEffects = TRUE;
-    minSize = 0;
-    maxSize = 0;
-}
+    m_fontColour = wxNullColour;
 
-wxFontData::wxFontData(const wxFontData& data)
-{
-    (*this) = data;
+    m_showHelp = FALSE;
+    m_allowSymbols = TRUE;
+    m_enableEffects = TRUE;
+    m_minSize = 0;
+    m_maxSize = 0;
+
+    m_encoding = wxFONTENCODING_SYSTEM;
 }
 
 wxFontData::~wxFontData()
 {
 }
 
-void wxFontData::operator=(const wxFontData& data)
+#if wxUSE_FONTDLG
+
+wxFontDialogBase::~wxFontDialogBase()
 {
-    fontColour = data.fontColour;
-    showHelp = data.showHelp;
-    allowSymbols = data.allowSymbols;
-    enableEffects = data.enableEffects;
-    initialFont = data.initialFont;
-    chosenFont = data.chosenFont;
-    minSize = data.minSize;
-    maxSize = data.maxSize;
 }
 
-/*
-* Print data
-*/
+#endif // wxUSE_FONTDLG
+
+#if wxUSE_PRINTING_ARCHITECTURE
+// ----------------------------------------------------------------------------
+// Print data
+// ----------------------------------------------------------------------------
 
 wxPrintData::wxPrintData()
 {
 #ifdef __WXMSW__
-    m_devMode = NULL;
+    m_devMode = (void*) NULL;
+    m_devNames = (void*) NULL;
+#elif defined( __WXMAC__ )
+    m_nativePrintData = wxNativePrintData::Create() ;
 #endif
     m_printOrientation = wxPORTRAIT;
     m_printNoCopies = 1;
     m_printCollate = FALSE;
-    
+
     // New, 24/3/99
-    m_printerName = "";
+    m_printerName = wxT("");
     m_colour = TRUE;
     m_duplexMode = wxDUPLEX_SIMPLEX;
     m_printQuality = wxPRINT_QUALITY_HIGH;
@@ -167,11 +188,26 @@ wxPrintData::wxPrintData()
     m_paperSize = wxSize(210, 297);
 
     // PostScript-specific data
-    m_printerCommand = "";
-    m_previewCommand = "";
-    m_printerOptions = "";
-    m_filename = "";
-    m_afmPath = "";
+    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_printerScaleX = 1.0;
     m_printerScaleY = 1.0;
     m_printerTranslateX = 0;
@@ -180,123 +216,212 @@ wxPrintData::wxPrintData()
 }
 
 wxPrintData::wxPrintData(const wxPrintData& printData)
+    : wxObject()
 {
+#ifdef __WXMSW__
+    m_devMode = (void*) NULL;
+    m_devNames = (void*) NULL;
+#elif defined( __WXMAC__ )
+    m_nativePrintData = wxNativePrintData::Create() ;
+#endif
     (*this) = printData;
 }
 
 wxPrintData::~wxPrintData()
 {
 #ifdef __WXMSW__
-    HGLOBAL hDevMode = (HGLOBAL) hDevMode;
-    if (hDevMode )
+    HGLOBAL hDevMode = (HGLOBAL)(DWORD) m_devMode;
+    if ( hDevMode )
         GlobalFree(hDevMode);
-   /*
-        PRINTDLG *pd = (PRINTDLG *) m_printData;
-        if ( pd && pd->hDevMode )
-        GlobalFree(pd->hDevMode);
-        if ( pd )
-        delete pd;
-    */
+    HGLOBAL hDevNames = (HGLOBAL)(DWORD) m_devNames;
+    if ( hDevNames )
+        GlobalFree(hDevNames);
+#elif defined(__WXMAC__)
+    delete m_nativePrintData ;
 #endif
 }
 
-#ifdef __WXMSW__
+#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;
+}
+#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())
+    {
+    }
+    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);
+    }
+
+    return hDev;
+}
 
 void wxPrintData::ConvertToNative()
 {
-    HGLOBAL hDevMode = (HGLOBAL) m_devMode;
+    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 = new PRINTDLG;
-        
+        PRINTDLG pd;
+
         // GNU-WIN32 has the wrong size PRINTDLG - can't work out why.
 #ifdef __GNUWIN32__
-        pd->lStructSize    = 66 ;
-        memset(pd, 0, sizeof(PRINTDLG));
+        memset(&pd, 0, 66);
+        pd.lStructSize    = 66;
 #else
-        pd->lStructSize    = sizeof(PRINTDLG);
-        memset(pd, 0, sizeof(PRINTDLG));
+        memset(&pd, 0, sizeof(PRINTDLG));
+#ifdef __WXWINCE__
+        pd.cbStruct    = sizeof(PRINTDLG);
+#else
+        pd.lStructSize    = sizeof(PRINTDLG);
+#endif
 #endif
 
-        pd->hwndOwner      = (HWND)NULL;
-        pd->hDevMode       = NULL; // Will be created by PrintDlg
-        pd->hDevNames      = NULL; // Ditto
-        
-        pd->Flags          = PD_RETURNDEFAULT;
-        pd->nCopies        = 1;
-        
+        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 (!PrintDlg(&pd))
         {
-            if ( pd->hDevMode )
-                GlobalFree(pd->hDevMode);
-            if ( pd->hDevNames )
-                GlobalFree(pd->hDevNames);
-            pd->hDevMode = NULL;
-            pd->hDevNames = NULL;
+            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
         {
-            if ( pd->hDevNames )
-                GlobalFree(pd->hDevNames);
-            pd->hDevNames = NULL;
+            hDevMode = pd.hDevMode;
+            m_devMode = (void*)(long) hDevMode;
+            pd.hDevMode = NULL;
 
-            hDevMode = pd->hDevMode;
-            m_devMode = (void*) hDevMode;
-            pd->hDevMode = NULL;
-        }
+            // We'll create a new DEVNAMEs structure below.
+            if ( pd.hDevNames )
+                GlobalFree(pd.hDevNames);
+            pd.hDevNames = NULL;
 
-        delete pd;
+            // hDevNames = pd->hDevNames;
+            // m_devNames = (void*)(long) hDevNames;
+            // pd->hDevnames = NULL;
+
+        }
     }
-    
+
     if ( hDevMode )
     {
-        DEVMODE *devMode = (DEVMODE*) GlobalLock(hDevMode);
-        
+        LPDEVMODE devMode = (LPDEVMODE) GlobalLock(hDevMode);
+
         //// Orientation
-        
+
         devMode->dmOrientation = m_printOrientation;
-        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 != "")
+
+        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;
+            //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;
         }
@@ -312,9 +437,9 @@ void wxPrintData::ConvertToNative()
                 }
             }
         }
-        
+
         //// Duplex
-        
+
         int duplex;
         switch (m_duplexMode)
         {
@@ -331,9 +456,9 @@ void wxPrintData::ConvertToNative()
         }
         devMode->dmDuplex = duplex;
         devMode->dmFields |= DM_DUPLEX;
-        
+
         //// Quality
-        
+
         int quality;
         switch (m_printQuality)
         {
@@ -355,29 +480,39 @@ void wxPrintData::ConvertToNative()
         }
         devMode->dmPrintQuality = quality;
         devMode->dmFields |= DM_PRINTQUALITY;
-        
+
         GlobalUnlock(hDevMode);
     }
+
+    if ( hDevNames )
+    {
+        GlobalFree(hDevNames);
+    }
+
+    // TODO: I hope it's OK to pass some empty strings to DEVNAMES.
+    m_devNames = (void*) (long) wxCreateDevNames(wxT(""), m_printerName, wxT(""));
 }
 
 void wxPrintData::ConvertFromNative()
 {
-    HGLOBAL hDevMode = (HGLOBAL) m_devMode;
+    HGLOBAL hDevMode = (HGLOBAL)(DWORD) m_devMode;
+    HGLOBAL hDevNames = (HGLOBAL)(DWORD) m_devNames;
 
     if (!hDevMode)
         return;
 
     if ( hDevMode )
     {
-        DEVMODE *devMode = (DEVMODE*) GlobalLock(hDevMode);
-        
+        LPDEVMODE devMode = (LPDEVMODE)GlobalLock(hDevMode);
+
         //// Orientation
-        
+
         if (devMode->dmFields & DM_ORIENTATION)
             m_printOrientation = devMode->dmOrientation;
-        
+
         //// Collation
-        
+
+#ifndef __WIN16__
         if (devMode->dmFields & DM_COLLATE)
         {
             if (devMode->dmCollate == DMCOLLATE_TRUE)
@@ -385,33 +520,24 @@ void wxPrintData::ConvertFromNative()
             else
                 m_printCollate = FALSE;
         }
-        
+#endif
+
         //// 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;
+            m_printerName = devMode->dmDeviceName;
         }
-        
+
         //// Colour
-        
+
         if (devMode->dmFields & DM_COLOR)
         {
             if (devMode->dmColor == DMCOLOR_COLOR)
@@ -421,10 +547,14 @@ void wxPrintData::ConvertFromNative()
         }
         else
             m_colour = TRUE;
-        
+
         //// Paper size
-        
-        if (devMode->dmFields & DM_PAPERSIZE)
+
+        // 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)
             {
@@ -432,14 +562,14 @@ void wxPrintData::ConvertFromNative()
                 if (paper)
                 {
                     m_paperId = paper->GetId();
-                    m_paperSize.x = paper->GetWidth() / 10 ;
-                    m_paperSize.y = paper->GetHeight() / 10 ;
+                    m_paperSize.x = paper->GetWidth() / 10;
+                    m_paperSize.y = paper->GetHeight() / 10;
                 }
                 else
                 {
                     // Shouldn't really get here
-                    wxFAIL_MSG("Couldn't find paper size in paper database.");
-                    
+                    wxFAIL_MSG(wxT("Couldn't find paper size in paper database."));
+
                     m_paperId = wxPAPER_NONE;
                     m_paperSize.x = 0;
                     m_paperSize.y = 0;
@@ -448,8 +578,8 @@ void wxPrintData::ConvertFromNative()
             else
             {
                 // Shouldn't really get here
-                wxFAIL_MSG("Paper database wasn't initialized in wxPrintData::ConvertFromNative.");
-                
+                wxFAIL_MSG(wxT("Paper database wasn't initialized in wxPrintData::ConvertFromNative."));
+
                 m_paperId = wxPAPER_NONE;
                 m_paperSize.x = 0;
                 m_paperSize.y = 0;
@@ -457,6 +587,7 @@ void wxPrintData::ConvertFromNative()
         }
         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;
@@ -464,16 +595,15 @@ void wxPrintData::ConvertFromNative()
         else
         {
             // Shouldn't really get here
-            wxFAIL_MSG("Couldn't find paper size from DEVMODE.");
-            
+            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)
@@ -492,9 +622,9 @@ void wxPrintData::ConvertFromNative()
         }
         else
             m_duplexMode = wxDUPLEX_SIMPLEX;
-        
+
         //// Quality
-        
+
         if (devMode->dmFields & DM_PRINTQUALITY)
         {
             switch (devMode->dmPrintQuality)
@@ -517,21 +647,62 @@ void wxPrintData::ConvertFromNative()
                     // 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 = (LPTSTR)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);
+        }
+    }
+}
+
+#endif
+
+#ifdef __WXMAC__
+
+void wxPrintData::ConvertToNative()
+{
+    m_nativePrintData->TransferFrom( this ) ;
+}
+
+void wxPrintData::ConvertFromNative()
+{
+    m_nativePrintData->TransferTo( this ) ;
 }
 
 #endif
 
 void wxPrintData::operator=(const wxPrintData& data)
 {
+#ifdef __WXMAC__
+    m_nativePrintData->CopyFrom( data.m_nativePrintData ) ;
+#endif
     m_printNoCopies = data.m_printNoCopies;
     m_printCollate = data.m_printCollate;
     m_printOrientation = data.m_printOrientation;
@@ -555,36 +726,20 @@ void wxPrintData::operator=(const wxPrintData& data)
     m_printMode = data.m_printMode;
 }
 
-// For compatibility
-#if (defined(__WXMOTIF__) || defined(__WXGTK__)) && wxUSE_POSTSCRIPT
-void wxPrintData::operator=(const wxPrintSetupData& setupData)
+// Is this data OK for showing the print dialog?
+bool wxPrintData::Ok() 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());
-}
+#ifdef __WXMSW__
+    ((wxPrintData*)this)->ConvertToNative();
+    return (m_devMode != NULL) ;
+#else
+    return TRUE;
 #endif
-    
+}
 
-/*
- * Print dialog data
- */
+// ----------------------------------------------------------------------------
+// Print dialog data
+// ----------------------------------------------------------------------------
 
 wxPrintDialogData::wxPrintDialogData()
 {
@@ -599,6 +754,7 @@ wxPrintDialogData::wxPrintDialogData()
     m_printAllPages = FALSE;
     m_printCollate = FALSE;
     m_printToFile = FALSE;
+    m_printSelection = FALSE;
     m_printEnableSelection = FALSE;
     m_printEnablePageNumbers = TRUE;
     m_printEnablePrintToFile = TRUE;
@@ -607,7 +763,11 @@ wxPrintDialogData::wxPrintDialogData()
 }
 
 wxPrintDialogData::wxPrintDialogData(const wxPrintDialogData& dialogData)
+    : wxObject()
 {
+#ifdef __WXMSW__
+    m_printDlgData = NULL;
+#endif
     (*this) = dialogData;
 }
 
@@ -616,14 +776,15 @@ wxPrintDialogData::wxPrintDialogData(const wxPrintData& printData)
 #ifdef __WXMSW__
     m_printDlgData = NULL;
 #endif
-    m_printFromPage = 0;
+    m_printFromPage = 1;
     m_printToPage = 0;
-    m_printMinPage = 0;
-    m_printMaxPage = 0;
+    m_printMinPage = 1;
+    m_printMaxPage = 9999;
     m_printNoCopies = 1;
     m_printAllPages = FALSE;
     m_printCollate = FALSE;
     m_printToFile = FALSE;
+    m_printSelection = FALSE;
     m_printEnableSelection = FALSE;
     m_printEnablePageNumbers = TRUE;
     m_printEnablePrintToFile = TRUE;
@@ -654,14 +815,15 @@ void wxPrintDialogData::ConvertToNative()
     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 ;
+        pd->lStructSize    = 66;
 #else
-#endif
         pd->lStructSize    = sizeof(PRINTDLG);
+#endif
         pd->hwndOwner      = (HWND)NULL;
         pd->hDevMode       = NULL; // Will be created by PrintDlg
         pd->hDevNames      = NULL; // Ditto
@@ -677,29 +839,41 @@ void wxPrintDialogData::ConvertToNative()
         GlobalFree(pd->hDevMode);
     }
 
-    pd->hDevMode = (HGLOBAL) m_printData.GetNativeData();
+    // 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), "hDevMode must be non-NULL in ConvertToNative!");
+    // 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 = (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 ;
+    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 ;
+    pd->lStructSize = 66;
 #else
     pd->lStructSize = sizeof( PRINTDLG );
 #endif
 
     pd->hwndOwner=(HWND)NULL;
-    pd->hDevNames=(HANDLE)NULL;
+//    pd->hDevNames=(HANDLE)NULL;
     pd->hInstance=(HINSTANCE)NULL;
     pd->lCustData = (LPARAM) NULL;
     pd->lpfnPrintHook = NULL;
@@ -708,9 +882,11 @@ void wxPrintDialogData::ConvertToNative()
     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 )
@@ -721,6 +897,8 @@ void wxPrintDialogData::ConvertToNative()
         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 )
@@ -739,23 +917,36 @@ void wxPrintDialogData::ConvertFromNative()
         if (m_printData.GetNativeData())
         {
             // Make sure we don't leak memory
-            GlobalFree((HGLOBAL) m_printData.GetNativeData());
+            GlobalFree((HGLOBAL)(DWORD) m_printData.GetNativeData());
         }
-        m_printData.SetNativeData((void*) pd->hDevMode);
+        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_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);
@@ -773,7 +964,7 @@ void wxPrintDialogData::ConvertFromNative()
             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!");
         }
     }
@@ -784,15 +975,32 @@ void wxPrintDialogData::SetOwnerWindow(wxWindow* win)
 {
     if ( m_printDlgData == NULL )
         ConvertToNative();
-    
+
     if ( m_printDlgData != NULL && win != NULL)
     {
-        PRINTDLG *pd = (PRINTDLG *) m_printDlgData ;
+        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;
@@ -803,6 +1011,7 @@ void wxPrintDialogData::operator=(const wxPrintDialogData& data)
     m_printAllPages = data.m_printAllPages;
     m_printCollate = data.m_printCollate;
     m_printToFile = data.m_printToFile;
+    m_printSelection = data.m_printSelection;
     m_printEnableSelection = data.m_printEnableSelection;
     m_printEnablePageNumbers = data.m_printEnablePageNumbers;
     m_printEnableHelp = data.m_printEnableHelp;
@@ -817,9 +1026,9 @@ void wxPrintDialogData::operator=(const wxPrintData& data)
     m_printData = data;
 }
 
-/*
- * wxPageSetupDialogData
- */
+// ----------------------------------------------------------------------------
+// wxPageSetupDialogData
+// ----------------------------------------------------------------------------
 
 wxPageSetupDialogData::wxPageSetupDialogData()
 {
@@ -846,7 +1055,11 @@ wxPageSetupDialogData::wxPageSetupDialogData()
 }
 
 wxPageSetupDialogData::wxPageSetupDialogData(const wxPageSetupDialogData& dialogData)
+    : wxObject()
 {
+#if defined(__WIN95__)
+    m_pageSetupData = NULL;
+#endif
     (*this) = dialogData;
 }
 
@@ -883,12 +1096,14 @@ wxPageSetupDialogData::~wxPageSetupDialogData()
     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;
@@ -904,14 +1119,18 @@ void wxPageSetupDialogData::operator=(const wxPageSetupDialogData& data)
     m_enableHelp = data.m_enableHelp;
 
     m_printData = data.m_printData;
+
+    return *this;
 }
 
-void wxPageSetupDialogData::operator=(const wxPrintData& data)
+wxPageSetupDialogData& wxPageSetupDialogData::operator=(const wxPrintData& data)
 {
     m_printData = data;
+
+    return *this;
 }
 
-#if defined(__WXMSW__) && defined(__WIN95__)
+#if defined(__WIN95__)
 void wxPageSetupDialogData::ConvertToNative()
 {
     m_printData.ConvertToNative();
@@ -922,6 +1141,7 @@ void wxPageSetupDialogData::ConvertToNative()
     {
         pd = new PAGESETUPDLG;
         pd->hDevMode = NULL;
+        pd->hDevNames = NULL;
         m_pageSetupData = (void *)pd;
     }
 
@@ -935,17 +1155,31 @@ void wxPageSetupDialogData::ConvertToNative()
         pd->hDevMode = NULL;
     }
 
-
     pd->hDevMode = (HGLOBAL) m_printData.GetNativeData();
 
     m_printData.SetNativeData((void*) NULL);
 
-    wxASSERT_MSG( (pd->hDevMode), "hDevMode must be non-NULL in ConvertToNative!");
+    // 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 )
@@ -966,29 +1200,29 @@ void wxPageSetupDialogData::ConvertToNative()
 
     pd->lStructSize = sizeof( PAGESETUPDLG );
     pd->hwndOwner=(HWND)NULL;
-    pd->hDevNames=(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);
@@ -1003,10 +1237,10 @@ void wxPageSetupDialogData::ConvertToNative()
 
 void wxPageSetupDialogData::ConvertFromNative()
 {
-    PAGESETUPDLG *pd = (PAGESETUPDLG *) m_pageSetupData ;
+    PAGESETUPDLG *pd = (PAGESETUPDLG *) m_pageSetupData;
     if ( !pd )
         return;
-    
+
     // Pass the devmode data back to the wxPrintData structure where it really belongs.
     if (pd->hDevMode)
     {
@@ -1021,8 +1255,22 @@ void wxPageSetupDialogData::ConvertFromNative()
 
     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);
@@ -1030,34 +1278,65 @@ void wxPageSetupDialogData::ConvertFromNative()
     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 ;
+
+    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 ;
+        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)
@@ -1079,7 +1358,8 @@ void wxPageSetupDialogData::SetPaperSize(wxPaperSize id)
 // paper id
 void wxPageSetupDialogData::CalculateIdFromPaperSize()
 {
-    wxASSERT_MSG( (wxThePrintPaperDatabase != (wxPrintPaperDatabase*) NULL), "wxThePrintPaperDatabase should not be NULL. Do not create global print dialog data objects." );
+    wxASSERT_MSG( (wxThePrintPaperDatabase != (wxPrintPaperDatabase*) NULL),
+                  wxT("wxThePrintPaperDatabase should not be NULL. Do not create global print dialog data objects.") );
 
     wxSize sz = GetPaperSize();
 
@@ -1089,18 +1369,18 @@ void wxPageSetupDialogData::CalculateIdFromPaperSize()
         m_printData.SetPaperId(id);
     }
 }
-    
+
 // Use paper id in wxPrintData to set this object's paper size
 void wxPageSetupDialogData::CalculatePaperSizeFromId()
 {
-    wxASSERT_MSG( (wxThePrintPaperDatabase != (wxPrintPaperDatabase*) NULL), "wxThePrintPaperDatabase should not be NULL. Do not create global print dialog data objects." );
+    wxASSERT_MSG( (wxThePrintPaperDatabase != (wxPrintPaperDatabase*) NULL),
+                  wxT("wxThePrintPaperDatabase should not be NULL. Do not create global print dialog data objects.") );
 
     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