better spacing

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

diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp
index f8195c8a2320403edc1bfbaa269a5434367ffa3e..45718f159f086bb94929f848015fe489976bb96e 100644 (file)
--- a/src/common/cmndata.cpp
+++ b/src/common/cmndata.cpp
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // 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
 /////////////////////////////////////////////////////////////////////////////
 


@@ -39,17 +39,12 @@
 #include "wx/cmndata.h"
 #include "wx/log.h"
 
 #include "wx/cmndata.h"
 #include "wx/log.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
     #include "wx/paper.h"
 
 #if wxUSE_PRINTING_ARCHITECTURE
     #include "wx/paper.h"

-
-    #if wxCOMPATIBILITY_WITH_PRINTSETUPDATA
-        #include "wx/generic/dcpsg.h"
-    #endif

 #endif // wxUSE_PRINTING_ARCHITECTURE
 
 #ifdef __WXMSW__
 #endif // wxUSE_PRINTING_ARCHITECTURE
 
 #ifdef __WXMSW__


@@ -61,11 +56,6 @@
         #include <commdlg.h>
     #endif // Win16
 
         #include <commdlg.h>
     #endif // Win16
 

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

     #if defined(__WATCOMC__) || defined(__SC__) || defined(__SALFORDC__)
         #include <windowsx.h>
         #include <commdlg.h>
     #if defined(__WATCOMC__) || defined(__SC__) || defined(__SALFORDC__)
         #include <windowsx.h>
         #include <commdlg.h>


@@ -82,10 +72,26 @@
     IMPLEMENT_DYNAMIC_CLASS(wxColourData, wxObject)
 
 #ifdef __WXMAC__
     IMPLEMENT_DYNAMIC_CLASS(wxColourData, wxObject)
 
 #ifdef __WXMAC__

+    #include "wx/mac/uma.h"
+
+#if defined(TARGET_CARBON) && !defined(__DARWIN__)
+#  if PM_USE_SESSION_APIS
+#    include <PMCore.h>
+#  endif
+#  include <PMApplication.h>
+#endif
+
+#ifndef __DARWIN__
+    #include "Printing.h"
+#endif

     #define mm2pt            2.83464566929
     #define pt2mm            0.352777777778
 #endif // Mac
 
     #define mm2pt            2.83464566929
     #define pt2mm            0.352777777778
 #endif // Mac
 

+#ifndef DMPAPER_USER
+     #define DMPAPER_USER                256
+#endif
+

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


@@ -105,6 +111,7 @@ wxColourData::wxColourData()
 }
 
 wxColourData::wxColourData(const wxColourData& data)
 }
 
 wxColourData::wxColourData(const wxColourData& data)

+    : wxObject()

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


@@ -113,7 +120,7 @@ wxColourData::~wxColourData()
 {
 }
 
 {
 }
 

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

 {
     if (i > 15 || i < 0)
         return;
 {
     if (i > 15 || i < 0)
         return;


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

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

 
     showHelp = FALSE;
     allowSymbols = TRUE;
 
     showHelp = FALSE;
     allowSymbols = TRUE;


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

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

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


@@ -175,19 +190,52 @@ wxPrintData::wxPrintData()
 #if TARGET_CARBON
     m_macPageFormat = kPMNoPageFormat;
     m_macPrintSettings = kPMNoPrintSettings;
 #if TARGET_CARBON
     m_macPageFormat = kPMNoPageFormat;
     m_macPrintSettings = kPMNoPrintSettings;

+    m_macPrintSession = kPMNoReference ;
+
+  #if PM_USE_SESSION_APIS
+    OSStatus       err;
+    
+       err = PMCreateSession((PMPrintSession *)&m_macPrintSession) ;
+
+    if ( err == noErr )
+    {  
+        err = PMCreatePageFormat((PMPageFormat *)&m_macPageFormat);
+        
+        //  Note that PMPageFormat is not session-specific, but calling
+        //  PMSessionDefaultPageFormat assigns values specific to the printer
+        //  associated with the current printing session.
+        if ((err == noErr) && (m_macPageFormat != kPMNoPageFormat))
+        {
+            err = PMSessionDefaultPageFormat((PMPrintSession)m_macPrintSession,
+                                             (PMPageFormat)m_macPageFormat);
+        }
+        
+        err = PMCreatePrintSettings((PMPrintSettings *)&m_macPrintSettings);
+        
+        //  Note that PMPrintSettings is not session-specific, but calling
+        //  PMSessionDefaultPrintSettings assigns values specific to the printer
+        //  associated with the current printing session.
+        if ((err == noErr) && (m_macPrintSettings != kPMNoPrintSettings))
+        {
+            err = PMSessionDefaultPrintSettings((PMPrintSession)m_macPrintSession,
+                                                (PMPrintSettings)m_macPrintSettings);
+        }
+    }
+
+  #endif

 #else
 #else

-       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 
+    m_macPrintSettings = (THPrint) NewHandleClear( sizeof( TPrint ) );
+    (**(THPrint)m_macPrintSettings).iPrVersion = 0;                    // something invalid
+
+    (**(THPrint)m_macPrintSettings).prInfo.iHRes = 72;
+    (**(THPrint)m_macPrintSettings).prInfo.iVRes = 72;
+    Rect r1 = { 0, 0, 8*72 - 2 * 18, 11*72 - 2 * 36 };
+    (**(THPrint)m_macPrintSettings).prInfo.rPage = r1;// must have its top left & (0,0)
+
+    Rect r2 = { -18, -36, 8*72 - 18, 11*72 - 36  };
+    (**(THPrint)m_macPrintSettings).rPaper = r2;
+    (**(THPrint)m_macPrintSettings).prStl.iPageV = 11 * 120 ;                // 11 inches in 120th of an inch
+    (**(THPrint)m_macPrintSettings).prStl.iPageH = 8 * 120 ;                // 8 inches in 120th of an inch

 #endif
 #endif
     m_printOrientation = wxPORTRAIT;
 #endif
 #endif
     m_printOrientation = wxPORTRAIT;


@@ -195,7 +243,7 @@ wxPrintData::wxPrintData()
     m_printCollate = FALSE;
 
     // New, 24/3/99
     m_printCollate = FALSE;
 
     // New, 24/3/99

-    m_printerName = "";
+    m_printerName = wxT("");

     m_colour = TRUE;
     m_duplexMode = wxDUPLEX_SIMPLEX;
     m_printQuality = wxPRINT_QUALITY_HIGH;
     m_colour = TRUE;
     m_duplexMode = wxDUPLEX_SIMPLEX;
     m_printQuality = wxPRINT_QUALITY_HIGH;


@@ -203,11 +251,26 @@ wxPrintData::wxPrintData()
     m_paperSize = wxSize(210, 297);
 
     // PostScript-specific data
     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;
     m_printerScaleX = 1.0;
     m_printerScaleY = 1.0;
     m_printerTranslateX = 0;


@@ -216,16 +279,18 @@ wxPrintData::wxPrintData()
 }
 
 wxPrintData::wxPrintData(const wxPrintData& printData)
 }
 
 wxPrintData::wxPrintData(const wxPrintData& printData)

+    : wxObject()

 {
 #ifdef __WXMSW__
     m_devMode = (void*) NULL;
     m_devNames = (void*) NULL;
 #elif defined( __WXMAC__ )
 #if TARGET_CARBON
 {
 #ifdef __WXMSW__
     m_devMode = (void*) NULL;
     m_devNames = (void*) NULL;
 #elif defined( __WXMAC__ )
 #if TARGET_CARBON

-    m_macPageFormat = kPMNoPageFormat;
+    m_macPageFormat    = kPMNoPageFormat;

     m_macPrintSettings = kPMNoPrintSettings;
     m_macPrintSettings = kPMNoPrintSettings;

+    m_macPrintSession = kPMNoReference ;

 #else
 #else

-       m_macPrintInfo = NULL ;
+    m_macPrintSettings = NULL;

 #endif
 #endif
     (*this) = printData;
 #endif
 #endif
     (*this) = printData;


@@ -244,18 +309,36 @@ wxPrintData::~wxPrintData()
 #if TARGET_CARBON
     if (m_macPageFormat != kPMNoPageFormat)
     {
 #if TARGET_CARBON
     if (m_macPageFormat != kPMNoPageFormat)
     {

-       (void)PMDisposePageFormat(m_macPageFormat);
-       m_macPageFormat = kPMNoPageFormat;
+  #if PM_USE_SESSION_APIS
+        (void)PMRelease(m_macPageFormat);
+  #else
+        (void)PMDisposePageFormat(m_macPageFormat);
+  #endif
+        m_macPageFormat = kPMNoPageFormat;

     }
 
     if (m_macPrintSettings != kPMNoPrintSettings)
     {
     }
 
     if (m_macPrintSettings != kPMNoPrintSettings)
     {

+  #if PM_USE_SESSION_APIS
+        (void)PMRelease(m_macPrintSettings);
+  #else

         (void)PMDisposePrintSettings(m_macPrintSettings);
         (void)PMDisposePrintSettings(m_macPrintSettings);

+  #endif

         m_macPrintSettings = kPMNoPrintSettings;
     }
         m_macPrintSettings = kPMNoPrintSettings;
     }

+    
+    if ( m_macPrintSession != kPMNoReference )
+    {
+  #if PM_USE_SESSION_APIS
+        (void)PMRelease(m_macPrintSession);
+  #else
+        (void)PMDisposePrintSession(m_macPrintSession);
+  #endif
+        m_macPrintSession = kPMNoReference;
+    }

 #else
 #else

-       wxASSERT( m_macPrintInfo ) ;
-       // we should perhaps delete 
+    wxASSERT( m_macPrintSettings );
+    // we should perhaps delete

 #endif
 #endif
 }
 #endif
 #endif
 }


@@ -299,32 +382,35 @@ static wxString wxGetPrintDlgError()
 
 static HGLOBAL wxCreateDevNames(const wxString& driverName, const wxString& printerName, const wxString& portName)
 {
 
 static HGLOBAL wxCreateDevNames(const wxString& driverName, const wxString& printerName, const wxString& portName)
 {

-       HGLOBAL hDev = NULL;
-       // if (!driverName.IsEmpty() && !printerName.IsEmpty() && !portName.IsEmpty())
+    HGLOBAL hDev = NULL;
+    // if (!driverName.IsEmpty() && !printerName.IsEmpty() && !portName.IsEmpty())

     if (driverName.IsEmpty() && printerName.IsEmpty() && portName.IsEmpty())
     {
     }
     else
     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);
+    {
+        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 + driverName.Length()+1);
-               wxStrcpy((wxChar*)lpDev + lpDev->wDeviceOffset, printerName);
+        lpDev->wDeviceOffset = (WORD)( lpDev->wDriverOffset +
+                                       sizeof(wxChar) * ( driverName.Length() + 1 ) );
+        wxStrcpy((wxChar*)((char*)lpDev + lpDev->wDeviceOffset ), printerName);

 
 

-               lpDev->wOutputOffset = (WORD)(lpDev->wDeviceOffset + printerName.Length()+1);
-               wxStrcpy((wxChar*)lpDev + lpDev->wOutputOffset, portName);
+        lpDev->wOutputOffset = (WORD)( lpDev->wDeviceOffset +
+                                       sizeof(wxChar) * ( printerName.Length() + 1 ) );
+        wxStrcpy((wxChar*)((char*) lpDev + lpDev->wOutputOffset ), portName);

 
 

-               lpDev->wDefault = 0;
+        lpDev->wDefault = 0;

 
         GlobalUnlock(hDev);
 
         GlobalUnlock(hDev);

-       }
-       return hDev;
+    }
+
+    return hDev;

 }
 
 void wxPrintData::ConvertToNative()
 }
 
 void wxPrintData::ConvertToNative()


@@ -334,35 +420,35 @@ void wxPrintData::ConvertToNative()
     if (!hDevMode)
     {
         // Use PRINTDLG as a way of creating a DEVMODE object
     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__
 
         // GNU-WIN32 has the wrong size PRINTDLG - can't work out why.
 #ifdef __GNUWIN32__

-        memset(pd, 0, 66);
-        pd->lStructSize    = 66 ;
+        memset(&pd, 0, 66);
+        pd.lStructSize    = 66;

 #else
 #else

-        memset(pd, 0, sizeof(PRINTDLG));
-        pd->lStructSize    = sizeof(PRINTDLG);
+        memset(&pd, 0, sizeof(PRINTDLG));
+        pd.lStructSize    = sizeof(PRINTDLG);

 #endif
 
 #endif
 

-        pd->hwndOwner      = (HWND)NULL;
-        pd->hDevMode       = NULL; // Will be created by PrintDlg
-        pd->hDevNames      = NULL; // Ditto
-        pd->hInstance      = (HINSTANCE) wxGetInstance();
+        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;
+        pd.Flags          = PD_RETURNDEFAULT;
+        pd.nCopies        = 1;

 
         // Fill out the DEVMODE structure
         // so we can use it as input in the 'real' PrintDlg
 
         // 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: "));
 
 #if defined(__WXDEBUG__) && defined(__WIN32__)
             wxString str(wxT("Printing error: "));


@@ -372,22 +458,20 @@ void wxPrintData::ConvertToNative()
         }
         else
         {
         }
         else
         {

-            hDevMode = pd->hDevMode;
+            hDevMode = pd.hDevMode;

             m_devMode = (void*)(long) hDevMode;
             m_devMode = (void*)(long) hDevMode;

-            pd->hDevMode = NULL;
+            pd.hDevMode = NULL;

 
             // We'll create a new DEVNAMEs structure below.
 
             // We'll create a new DEVNAMEs structure below.

-            if ( pd->hDevNames )
-                GlobalFree(pd->hDevNames);
-            pd->hDevNames = NULL;
+            if ( pd.hDevNames )
+                GlobalFree(pd.hDevNames);
+            pd.hDevNames = NULL;

 
             // hDevNames = pd->hDevNames;
             // m_devNames = (void*)(long) hDevNames;
             // pd->hDevnames = NULL;
 
         }
 
             // hDevNames = pd->hDevNames;
             // m_devNames = (void*)(long) hDevNames;
             // pd->hDevnames = NULL;
 
         }

-
-        delete pd;

     }
 
     if ( hDevMode )
     }
 
     if ( hDevMode )


@@ -396,10 +480,7 @@ void wxPrintData::ConvertToNative()
 
         //// Orientation
 
 
         //// Orientation
 

-#ifndef __WXWINE__

         devMode->dmOrientation = m_printOrientation;
         devMode->dmOrientation = m_printOrientation;

-#endif
-        devMode->dmFields = DM_ORIENTATION;

 
         //// Collation
 
 
         //// Collation
 


@@ -417,12 +498,9 @@ void wxPrintData::ConvertToNative()
 
         if (m_printerName != wxT(""))
         {
 
         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
         }
 
         //// Colour


@@ -434,14 +512,14 @@ void wxPrintData::ConvertToNative()
 
         devMode->dmFields |= DM_COLOR;
 
 
         devMode->dmFields |= DM_COLOR;
 

-#ifndef __WXWINE__

         //// Paper size
 
         if (m_paperId == wxPAPER_NONE)
         {
         //// Paper size
 
         if (m_paperId == wxPAPER_NONE)
         {

-               // DEVMODE is in tenths of a milimeter
+            // DEVMODE is in tenths of a milimeter

             devMode->dmPaperWidth = m_paperSize.x * 10;
             devMode->dmPaperLength = m_paperSize.y * 10;
             devMode->dmPaperWidth = m_paperSize.x * 10;
             devMode->dmPaperLength = m_paperSize.y * 10;

+            devMode->dmPaperSize = DMPAPER_USER;

             devMode->dmFields |= DM_PAPERWIDTH;
             devMode->dmFields |= DM_PAPERLENGTH;
         }
             devMode->dmFields |= DM_PAPERWIDTH;
             devMode->dmFields |= DM_PAPERLENGTH;
         }


@@ -457,7 +535,6 @@ void wxPrintData::ConvertToNative()
                 }
             }
         }
                 }
             }
         }

-#endif

 
         //// Duplex
 
 
         //// Duplex
 


@@ -511,7 +588,7 @@ void wxPrintData::ConvertToNative()
     }
 
     // TODO: I hope it's OK to pass some empty strings to DEVNAMES.
     }
 
     // TODO: I hope it's OK to pass some empty strings to DEVNAMES.

-    m_devNames = (void*) (long) wxCreateDevNames("", m_printerName, "");
+    m_devNames = (void*) (long) wxCreateDevNames(wxT(""), m_printerName, wxT(""));

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


@@ -526,12 +603,10 @@ void wxPrintData::ConvertFromNative()
     {
         LPDEVMODE devMode = (LPDEVMODE)GlobalLock(hDevMode);
 
     {
         LPDEVMODE devMode = (LPDEVMODE)GlobalLock(hDevMode);
 

-#ifndef __WXWINE__

         //// Orientation
 
         if (devMode->dmFields & DM_ORIENTATION)
             m_printOrientation = devMode->dmOrientation;
         //// Orientation
 
         if (devMode->dmFields & DM_ORIENTATION)
             m_printOrientation = devMode->dmOrientation;

-#endif

 
         //// Collation
 
 
         //// Collation
 


@@ -556,17 +631,7 @@ void wxPrintData::ConvertFromNative()
 
         if (devMode->dmDeviceName[0] != 0)
         {
 
         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
         }
 
         //// Colour


@@ -581,10 +646,13 @@ void wxPrintData::ConvertFromNative()
         else
             m_colour = TRUE;
 
         else
             m_colour = TRUE;
 

-#ifndef __WXWINE__

         //// Paper size
 
         //// 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)
             {
         {
             if (wxThePrintPaperDatabase)
             {


@@ -592,8 +660,8 @@ void wxPrintData::ConvertFromNative()
                 if (paper)
                 {
                     m_paperId = paper->GetId();
                 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
                 {
                 }
                 else
                 {


@@ -617,7 +685,7 @@ void wxPrintData::ConvertFromNative()
         }
         else if ((devMode->dmFields & DM_PAPERWIDTH) && (devMode->dmFields & DM_PAPERLENGTH))
         {
         }
         else if ((devMode->dmFields & DM_PAPERWIDTH) && (devMode->dmFields & DM_PAPERLENGTH))
         {

-                       // DEVMODE is in tenths of a milimeter
+            // DEVMODE is in tenths of a milimeter

             m_paperSize.x = devMode->dmPaperWidth / 10;
             m_paperSize.y = devMode->dmPaperLength / 10;
             m_paperId = wxPAPER_NONE;
             m_paperSize.x = devMode->dmPaperWidth / 10;
             m_paperSize.y = devMode->dmPaperLength / 10;
             m_paperId = wxPAPER_NONE;


@@ -631,7 +699,6 @@ void wxPrintData::ConvertFromNative()
             m_paperSize.y = 0;
             m_paperId = wxPAPER_NONE;
         }
             m_paperSize.y = 0;
             m_paperId = wxPAPER_NONE;
         }

-#endif

 
         //// Duplex
 
 
         //// Duplex
 


@@ -700,7 +767,7 @@ void wxPrintData::ConvertFromNative()
             // m_printData.SetPortName((LPSTR)lpDevNames + lpDevNames->wDriverOffset);
 
             // Get the printer name
             // m_printData.SetPortName((LPSTR)lpDevNames + lpDevNames->wDriverOffset);
 
             // Get the printer name

-            wxString printerName = (LPSTR)lpDevNames + lpDevNames->wDeviceOffset;
+            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!");
 
             // 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!");


@@ -718,17 +785,17 @@ void wxPrintData::ConvertFromNative()
 #ifdef __WXMAC__
 void wxPrintData::ConvertToNative()
 {
 #ifdef __WXMAC__
 void wxPrintData::ConvertToNative()
 {

-#ifdef TARGET_CARBON
+#if TARGET_CARBON

 #else
 #else

-       (**m_macPrintInfo).prJob.iCopies = m_printNoCopies ;
+    (**(THPrint)m_macPrintSettings).prJob.iCopies = m_printNoCopies;

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

-#ifdef TARGET_CARBON
+#if TARGET_CARBON

 #else
 #else

-       m_printNoCopies = (**m_macPrintInfo).prJob.iCopies ;
+    m_printNoCopies = (**(THPrint)m_macPrintSettings).prJob.iCopies;

 #endif
 }
 #endif
 #endif
 }
 #endif


@@ -736,10 +803,30 @@ void wxPrintData::ConvertFromNative()
 void wxPrintData::operator=(const wxPrintData& data)
 {
 #ifdef __WXMAC__
 void wxPrintData::operator=(const wxPrintData& data)
 {
 #ifdef __WXMAC__

-#ifdef TARGET_CARBON
+#if TARGET_CARBON
+       if ( m_macPrintSettings != kPMNoPrintSettings )
+       {
+               PMRelease( m_macPrintSettings ) ;
+               m_macPrintSettings = kPMNoPrintSettings ;
+       }
+       if ( data.m_macPrintSettings != kPMNoPrintSettings )
+       {
+               m_macPrintSettings = data.m_macPrintSettings ;
+               PMRetain( m_macPrintSettings ) ;
+       }
+       if ( m_macPageFormat != kPMNoPageFormat )
+       {
+               PMRelease( m_macPageFormat ) ;
+               m_macPageFormat = kPMNoPageFormat ;
+       }
+       if ( data.m_macPageFormat != kPMNoPageFormat )
+       {
+               m_macPageFormat = data.m_macPageFormat ;
+               PMRetain( m_macPageFormat ) ;
+       }

 #else
 #else

-       m_macPrintInfo = data.m_macPrintInfo ;
-       HandToHand( (Handle*) &m_macPrintInfo ) ;       
+    m_macPrintSettings = data.m_macPrintSettings;
+    HandToHand( (Handle*) &m_macPrintSettings );

 #endif
 #endif
     m_printNoCopies = data.m_printNoCopies;
 #endif
 #endif
     m_printNoCopies = data.m_printNoCopies;


@@ -765,32 +852,16 @@ void wxPrintData::operator=(const wxPrintData& data)
     m_printMode = data.m_printMode;
 }
 
     m_printMode = data.m_printMode;
 }
 

-// For compatibility
-#if wxCOMPATIBILITY_WITH_PRINTSETUPDATA
-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

 }
 }

-#endif // wxCOMPATIBILITY_WITH_PRINTSETUPDATA
-

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


@@ -818,6 +889,7 @@ wxPrintDialogData::wxPrintDialogData()
 }
 
 wxPrintDialogData::wxPrintDialogData(const wxPrintDialogData& dialogData)
 }
 
 wxPrintDialogData::wxPrintDialogData(const wxPrintDialogData& dialogData)

+    : wxObject()

 {
 #ifdef __WXMSW__
     m_printDlgData = NULL;
 {
 #ifdef __WXMSW__
     m_printDlgData = NULL;


@@ -869,11 +941,12 @@ void wxPrintDialogData::ConvertToNative()
     if (!pd)
     {
         pd = new PRINTDLG;
     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__
         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
         pd->lStructSize    = sizeof(PRINTDLG);
 #endif
 #else
         pd->lStructSize    = sizeof(PRINTDLG);
 #endif


@@ -903,23 +976,24 @@ void wxPrintDialogData::ConvertToNative()
 
     m_printData.SetNativeData((void*) NULL);
 
 
     m_printData.SetNativeData((void*) NULL);
 

-    wxASSERT_MSG( (pd->hDevMode), wxT("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->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->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 ;
+    pd->Flags = PD_RETURNDC;

 
 #ifdef __GNUWIN32__
 
 #ifdef __GNUWIN32__

-    pd->lStructSize = 66 ;
+    pd->lStructSize = 66;

 #else
     pd->lStructSize = sizeof( PRINTDLG );
 #endif
 #else
     pd->lStructSize = sizeof( PRINTDLG );
 #endif


@@ -937,7 +1011,7 @@ void wxPrintDialogData::ConvertToNative()
 
     if ( m_printAllPages )
         pd->Flags |= PD_ALLPAGES;
 
     if ( m_printAllPages )
         pd->Flags |= PD_ALLPAGES;

-    if ( m_printAllPages )
+    if ( m_printSelection )

         pd->Flags |= PD_SELECTION;
     if ( m_printCollate )
         pd->Flags |= PD_COLLATE;
         pd->Flags |= PD_SELECTION;
     if ( m_printCollate )
         pd->Flags |= PD_COLLATE;


@@ -989,11 +1063,11 @@ void wxPrintDialogData::ConvertFromNative()
     // into wxWindows form.
     m_printData.ConvertFromNative();
 
     // 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_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_printAllPages = ((pd->Flags & PD_ALLPAGES) == PD_ALLPAGES);
     m_printSelection = ((pd->Flags & PD_SELECTION) == PD_SELECTION);


@@ -1028,7 +1102,7 @@ void wxPrintDialogData::SetOwnerWindow(wxWindow* win)
 
     if ( m_printDlgData != NULL && win != NULL)
     {
 
     if ( m_printDlgData != NULL && win != NULL)
     {

-        PRINTDLG *pd = (PRINTDLG *) m_printDlgData ;
+        PRINTDLG *pd = (PRINTDLG *) m_printDlgData;

         pd->hwndOwner=(HWND) win->GetHWND();
     }
 }
         pd->hwndOwner=(HWND) win->GetHWND();
     }
 }


@@ -1037,21 +1111,21 @@ void wxPrintDialogData::SetOwnerWindow(wxWindow* win)
 #ifdef __WXMAC__
 void wxPrintDialogData::ConvertToNative()
 {
 #ifdef __WXMAC__
 void wxPrintDialogData::ConvertToNative()
 {

-#ifdef TARGET_CARBON
+#if TARGET_CARBON

 #else
 #else

-       (**m_printData.m_macPrintInfo).prJob.iFstPage = m_printFromPage ;
-       (**m_printData.m_macPrintInfo).prJob.iLstPage = m_printToPage ;
-       m_printData.ConvertToNative() ;
+    (**(THPrint)m_printData.m_macPrintSettings).prJob.iFstPage = m_printFromPage;
+    (**(THPrint)m_printData.m_macPrintSettings).prJob.iLstPage = m_printToPage;
+    m_printData.ConvertToNative();

 #endif
 }
 
 void wxPrintDialogData::ConvertFromNative()
 {
 #endif
 }
 
 void wxPrintDialogData::ConvertFromNative()
 {

-#ifdef TARGET_CARBON
+#if TARGET_CARBON

 #else
 #else

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

 #endif
 }
 #endif
 #endif
 }
 #endif


@@ -1111,6 +1185,7 @@ wxPageSetupDialogData::wxPageSetupDialogData()
 }
 
 wxPageSetupDialogData::wxPageSetupDialogData(const wxPageSetupDialogData& dialogData)
 }
 
 wxPageSetupDialogData::wxPageSetupDialogData(const wxPageSetupDialogData& dialogData)

+    : wxObject()

 {
 #if defined(__WIN95__)
     m_pageSetupData = NULL;
 {
 #if defined(__WIN95__)
     m_pageSetupData = NULL;


@@ -1158,7 +1233,7 @@ wxPageSetupDialogData::~wxPageSetupDialogData()
 #endif
 }
 
 #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;


@@ -1174,11 +1249,15 @@ void wxPageSetupDialogData::operator=(const wxPageSetupDialogData& data)
     m_enableHelp = data.m_enableHelp;
 
     m_printData = data.m_printData;
     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;
 {
     m_printData = data;

+
+    return *this;

 }
 
 #if defined(__WIN95__)
 }
 
 #if defined(__WIN95__)


@@ -1210,7 +1289,8 @@ void wxPageSetupDialogData::ConvertToNative()
 
     m_printData.SetNativeData((void*) NULL);
 
 
     m_printData.SetNativeData((void*) NULL);
 

-    wxASSERT_MSG( (pd->hDevMode), wxT("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
 
     // Pass the devnames data (created in m_printData.ConvertToNative)
     // to the PRINTDLG structure, since it'll


@@ -1252,7 +1332,7 @@ void wxPageSetupDialogData::ConvertToNative()
     pd->hwndOwner=(HWND)NULL;
 //    pd->hDevNames=(HWND)NULL;
     pd->hInstance=(HINSTANCE)NULL;
     pd->hwndOwner=(HWND)NULL;
 //    pd->hDevNames=(HWND)NULL;
     pd->hInstance=(HINSTANCE)NULL;

-       //   PAGESETUPDLG is in hundreds of a mm
+    //   PAGESETUPDLG is in hundreds of a mm

     pd->ptPaperSize.x = m_paperSize.x * 100;
     pd->ptPaperSize.y = m_paperSize.y * 100;
 
     pd->ptPaperSize.x = m_paperSize.x * 100;
     pd->ptPaperSize.y = m_paperSize.y * 100;
 


@@ -1287,7 +1367,7 @@ void wxPageSetupDialogData::ConvertToNative()
 
 void wxPageSetupDialogData::ConvertFromNative()
 {
 
 void wxPageSetupDialogData::ConvertFromNative()
 {

-    PAGESETUPDLG *pd = (PAGESETUPDLG *) m_pageSetupData ;
+    PAGESETUPDLG *pd = (PAGESETUPDLG *) m_pageSetupData;

     if ( !pd )
         return;
 
     if ( !pd )
         return;
 


@@ -1329,7 +1409,7 @@ void wxPageSetupDialogData::ConvertFromNative()
     m_getDefaultInfo = ((pd->Flags & PSD_RETURNDEFAULT) == PSD_RETURNDEFAULT);
     m_enableHelp = ((pd->Flags & PSD_SHOWHELP) == PSD_SHOWHELP);
 
     m_getDefaultInfo = ((pd->Flags & PSD_RETURNDEFAULT) == PSD_RETURNDEFAULT);
     m_enableHelp = ((pd->Flags & PSD_SHOWHELP) == PSD_SHOWHELP);
 

-       //   PAGESETUPDLG is in hundreds of a mm
+    //   PAGESETUPDLG is in hundreds of a mm

     m_paperSize.x = pd->ptPaperSize.x / 100;
     m_paperSize.y = pd->ptPaperSize.y / 100;
 
     m_paperSize.x = pd->ptPaperSize.x / 100;
     m_paperSize.y = pd->ptPaperSize.y / 100;
 


@@ -1338,10 +1418,10 @@ void wxPageSetupDialogData::ConvertFromNative()
     m_minMarginBottomRight.x = pd->rtMinMargin.right / 100;
     m_minMarginBottomRight.y = pd->rtMinMargin.bottom / 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)
 }
 
 void wxPageSetupDialogData::SetOwnerWindow(wxWindow* win)


@@ -1351,7 +1431,7 @@ void wxPageSetupDialogData::SetOwnerWindow(wxWindow* win)
 
     if ( m_pageSetupData != NULL && win != NULL)
     {
 
     if ( m_pageSetupData != NULL && win != NULL)
     {

-        PAGESETUPDLG *pd = (PAGESETUPDLG *) m_pageSetupData ;
+        PAGESETUPDLG *pd = (PAGESETUPDLG *) m_pageSetupData;

         pd->hwndOwner=(HWND) win->GetHWND();
     }
 }
         pd->hwndOwner=(HWND) win->GetHWND();
     }
 }


@@ -1360,52 +1440,66 @@ void wxPageSetupDialogData::SetOwnerWindow(wxWindow* win)
 #ifdef __WXMAC__
 void wxPageSetupDialogData::ConvertToNative()
 {
 #ifdef __WXMAC__
 void wxPageSetupDialogData::ConvertToNative()
 {

-       m_printData.ConvertToNative() ;
-       // on mac the paper rect has a negative top left corner, because the page rect (printable area) is at 0,0
-#ifdef TARGET_CARBON
+    m_printData.ConvertToNative();
+    // on mac the paper rect has a negative top left corner, because the page rect (printable area) is at 0,0
+#if TARGET_CARBON

 #else
 #else

-       (**m_printData.m_macPrintInfo).rPaper.left = int( ((double) m_minMarginTopLeft.x)*mm2pt ) ;
-       (**m_printData.m_macPrintInfo).rPaper.top = int( ((double) m_minMarginTopLeft.y)*mm2pt ) ;
+    (**(THPrint)m_printData.m_macPrintSettings).rPaper.left = int( ((double) m_minMarginTopLeft.x)*mm2pt );
+    (**(THPrint)m_printData.m_macPrintSettings).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 ) ;
+    (**(THPrint)m_printData.m_macPrintSettings).rPaper.right = int( ((double) m_paperSize.x - m_minMarginTopLeft.x)*mm2pt );
+    (**(THPrint)m_printData.m_macPrintSettings).rPaper.bottom = int( ((double) m_paperSize.y - m_minMarginTopLeft.y)*mm2pt );
+
+    (**(THPrint)m_printData.m_macPrintSettings).prInfo.rPage.left = 0;
+    (**(THPrint)m_printData.m_macPrintSettings).prInfo.rPage.top = 0;
+    (**(THPrint)m_printData.m_macPrintSettings).prInfo.rPage.right =  int( ((double) m_paperSize.x - m_minMarginTopLeft.x - m_minMarginBottomRight.x)*mm2pt );
+    (**(THPrint)m_printData.m_macPrintSettings).prInfo.rPage.bottom =  int( ((double) m_paperSize.y - m_minMarginTopLeft.y - m_minMarginBottomRight.y)*mm2pt );

 #endif
 }
 
 void wxPageSetupDialogData::ConvertFromNative()
 {
 #endif
 }
 
 void wxPageSetupDialogData::ConvertFromNative()
 {

-       m_printData.ConvertFromNative () ;
+    m_printData.ConvertFromNative ();

 
 

-#ifdef TARGET_CARBON
+#if TARGET_CARBON
+       PMRect rPaper;
+       
+       OSStatus err = PMGetAdjustedPaperRect((PMPageFormat)m_printData.m_macPageFormat, &rPaper);
+    if ( err == noErr )
+    {
+           m_paperSize.x = (int)(((double) rPaper.right - rPaper.left ) * pt2mm);
+           m_paperSize.y = (int)(((double) rPaper.bottom - rPaper.top ) * pt2mm);
+
+           m_minMarginTopLeft.x = (int)(((double) - rPaper.left ) * pt2mm);
+           m_minMarginTopLeft.y = (int)(((double) - rPaper.top ) * pt2mm);
+
+//         m_minMarginBottomRight.x = ((double) rPaper.right - (**(THPrint)m_printData.m_macPrintSettings).prInfo.rPage.right ) * pt2mm;
+//         m_minMarginBottomRight.y = ((double)(**(THPrint)m_printData.m_macPrintSettings).rPaper.bottom - (**(THPrint)m_printData.m_macPrintSettings).prInfo.rPage.bottom ) * pt2mm;
+    }

 #else
 #else

-       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 ;
+    m_paperSize.x = ((double) (**(THPrint)m_printData.m_macPrintSettings).rPaper.right - (**(THPrint)m_printData.m_macPrintSettings).rPaper.left ) * pt2mm;
+    m_paperSize.y = ((double) (**(THPrint)m_printData.m_macPrintSettings).rPaper.bottom - (**(THPrint)m_printData.m_macPrintSettings).rPaper.top ) * pt2mm;
+
+    m_minMarginTopLeft.x = ((double) -(**(THPrint)m_printData.m_macPrintSettings).rPaper.left ) * pt2mm;
+    m_minMarginTopLeft.y = ((double) -(**(THPrint)m_printData.m_macPrintSettings).rPaper.top ) * pt2mm;
+
+    m_minMarginBottomRight.x = ((double) (**(THPrint)m_printData.m_macPrintSettings).rPaper.right - (**(THPrint)m_printData.m_macPrintSettings).prInfo.rPage.right ) * pt2mm;
+    m_minMarginBottomRight.y = ((double)(**(THPrint)m_printData.m_macPrintSettings).rPaper.bottom - (**(THPrint)m_printData.m_macPrintSettings).prInfo.rPage.bottom ) * pt2mm;

 #endif
 #endif

-       // 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 ;
+    // 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;

 }
 #endif
 
 }
 #endif
 


@@ -1451,12 +1545,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