fixed new charset detection code (langinfo.h not included in intl.cpp; langinfo.h...

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

diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp
index c818294206cb3f1c4b1c75a17dd7860c954d06fe..de57dda478225b0e3bcbb3d0a2d1008333a8db88 100644 (file)
--- a/src/common/cmndata.cpp
+++ b/src/common/cmndata.cpp
@@ -40,7 +40,7 @@
 #include "wx/log.h"
 
 // For compatibility
 #include "wx/log.h"
 
 // For compatibility

-#if (defined(__WXMOTIF__) || defined(__WXGTK__)) && wxUSE_POSTSCRIPT
+#if (defined(__WXMOTIF__) || defined(__WXGTK__) || defined(__WXPM__) || defined(__WXMAC__)) && wxUSE_POSTSCRIPT

     #define wxCOMPATIBILITY_WITH_PRINTSETUPDATA 1
 #endif
 
     #define wxCOMPATIBILITY_WITH_PRINTSETUPDATA 1
 #endif
 


@@ -86,6 +86,10 @@
     #define pt2mm            0.352777777778
 #endif // Mac
 
     #define pt2mm            0.352777777778
 #endif // Mac
 

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

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


@@ -169,9 +173,26 @@ wxFontData::~wxFontData()
 wxPrintData::wxPrintData()
 {
 #ifdef __WXMSW__
 wxPrintData::wxPrintData()
 {
 #ifdef __WXMSW__

-    m_devMode = NULL;
+    m_devMode = (void*) NULL;
+    m_devNames = (void*) NULL;

 #elif defined( __WXMAC__ )
 #elif defined( __WXMAC__ )

-    m_macPrintInfo = NULL ;
+#if TARGET_CARBON
+    m_macPageFormat = kPMNoPageFormat;
+    m_macPrintSettings = kPMNoPrintSettings;
+#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
+#endif

 #endif
     m_printOrientation = wxPORTRAIT;
     m_printNoCopies = 1;
 #endif
     m_printOrientation = wxPORTRAIT;
     m_printNoCopies = 1;


@@ -201,9 +222,15 @@ wxPrintData::wxPrintData()
 wxPrintData::wxPrintData(const wxPrintData& printData)
 {
 #ifdef __WXMSW__
 wxPrintData::wxPrintData(const wxPrintData& printData)
 {
 #ifdef __WXMSW__

-    m_devMode = NULL;
+    m_devMode = (void*) NULL;
+    m_devNames = (void*) NULL;

 #elif defined( __WXMAC__ )
 #elif defined( __WXMAC__ )

-    m_macPrintInfo = NULL ;
+#if TARGET_CARBON
+    m_macPageFormat = kPMNoPageFormat;
+    m_macPrintSettings = kPMNoPrintSettings;
+#else
+       m_macPrintInfo = NULL ;
+#endif

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


@@ -212,11 +239,28 @@ wxPrintData::~wxPrintData()
 {
 #ifdef __WXMSW__
     HGLOBAL hDevMode = (HGLOBAL)(DWORD) m_devMode;
 {
 #ifdef __WXMSW__
     HGLOBAL hDevMode = (HGLOBAL)(DWORD) m_devMode;

-    if (hDevMode )
+    if ( hDevMode )

         GlobalFree(hDevMode);
         GlobalFree(hDevMode);

+    HGLOBAL hDevNames = (HGLOBAL)(DWORD) m_devNames;
+    if ( hDevNames )
+        GlobalFree(hDevNames);

 #elif defined(__WXMAC__)
 #elif defined(__WXMAC__)

-    if ( m_macPrintInfo )
-        ::DisposeHandle( (Handle) m_macPrintInfo ) ;
+#if TARGET_CARBON
+    if (m_macPageFormat != kPMNoPageFormat)
+    {
+       (void)PMDisposePageFormat(m_macPageFormat);
+       m_macPageFormat = kPMNoPageFormat;
+    }
+
+    if (m_macPrintSettings != kPMNoPrintSettings)
+    {
+        (void)PMDisposePrintSettings(m_macPrintSettings);
+        m_macPrintSettings = kPMNoPrintSettings;
+    }
+#else
+       wxASSERT( m_macPrintInfo ) ;
+       // we should perhaps delete
+#endif

 #endif
 }
 
 #endif
 }
 


@@ -257,9 +301,40 @@ static wxString wxGetPrintDlgError()
 }
 #endif
 
 }
 #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);
+               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;
+}
+

 void wxPrintData::ConvertToNative()
 {
     HGLOBAL hDevMode = (HGLOBAL)(DWORD) m_devMode;
 void wxPrintData::ConvertToNative()
 {
     HGLOBAL hDevMode = (HGLOBAL)(DWORD) m_devMode;

+    HGLOBAL hDevNames = (HGLOBAL)(DWORD) m_devNames;

     if (!hDevMode)
     {
         // Use PRINTDLG as a way of creating a DEVMODE object
     if (!hDevMode)
     {
         // Use PRINTDLG as a way of creating a DEVMODE object


@@ -301,13 +376,19 @@ void wxPrintData::ConvertToNative()
         }
         else
         {
         }
         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;
 
             if ( pd->hDevNames )
                 GlobalFree(pd->hDevNames);
             pd->hDevNames = NULL;
 

-            hDevMode = pd->hDevMode;
-            m_devMode = (void*)(long) hDevMode;
-            pd->hDevMode = NULL;
+            // hDevNames = pd->hDevNames;
+            // m_devNames = (void*)(long) hDevNames;
+            // pd->hDevnames = NULL;
+

         }
 
         delete pd;
         }
 
         delete pd;


@@ -362,8 +443,10 @@ void wxPrintData::ConvertToNative()
 
         if (m_paperId == wxPAPER_NONE)
         {
 
         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->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;
         }


@@ -426,11 +509,20 @@ void wxPrintData::ConvertToNative()
 
         GlobalUnlock(hDevMode);
     }
 
         GlobalUnlock(hDevMode);
     }

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

 }
 
 void wxPrintData::ConvertFromNative()
 {
     HGLOBAL hDevMode = (HGLOBAL)(DWORD) m_devMode;
 }
 
 void wxPrintData::ConvertFromNative()
 {
     HGLOBAL hDevMode = (HGLOBAL)(DWORD) m_devMode;

+    HGLOBAL hDevNames = (HGLOBAL)(DWORD) m_devNames;

 
     if (!hDevMode)
         return;
 
     if (!hDevMode)
         return;


@@ -497,7 +589,11 @@ void wxPrintData::ConvertFromNative()
 #ifndef __WXWINE__
         //// Paper size
 
 #ifndef __WXWINE__
         //// 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)
             {


@@ -530,6 +626,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

             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;


@@ -599,6 +696,30 @@ void wxPrintData::ConvertFromNative()
 
         GlobalUnlock(hDevMode);
     }
 
         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);
+        }
+    }

 }
 
 #endif
 }
 
 #endif


@@ -606,34 +727,30 @@ void wxPrintData::ConvertFromNative()
 #ifdef __WXMAC__
 void wxPrintData::ConvertToNative()
 {
 #ifdef __WXMAC__
 void wxPrintData::ConvertToNative()
 {

-    if ( !m_macPrintInfo )
-    {
-        m_macPrintInfo = (THPrint) NewHandleClear( sizeof( TPrint ) ) ;
-        if ( m_macPrintInfo )
-        {
-            ::PrintDefault( m_macPrintInfo ) ;
-            // todo setup the global pagesetup ?
-        }
-    }
-    if ( m_macPrintInfo )
-    {
-        (**m_macPrintInfo).prJob.iCopies = m_printNoCopies ;
-        (**m_macPrintInfo).prJob.iFstPage = 0 ;
-        (**m_macPrintInfo).prJob.iLstPage = 0 ;
-    }
+#ifdef TARGET_CARBON
+#else
+       (**m_macPrintInfo).prJob.iCopies = m_printNoCopies ;
+#endif

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

-    if ( m_macPrintInfo )
-    {
-        m_printNoCopies = (**m_macPrintInfo).prJob.iCopies ;
-    }
+#ifdef TARGET_CARBON
+#else
+       m_printNoCopies = (**m_macPrintInfo).prJob.iCopies ;
+#endif

 }
 #endif
 
 void wxPrintData::operator=(const wxPrintData& data)
 {
 }
 #endif
 
 void wxPrintData::operator=(const wxPrintData& data)
 {

+#ifdef __WXMAC__
+#ifdef TARGET_CARBON
+#else
+       m_macPrintInfo = data.m_macPrintInfo ;
+       HandToHand( (Handle*) &m_macPrintInfo ) ;       
+#endif
+#endif

     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;


@@ -692,8 +809,6 @@ wxPrintDialogData::wxPrintDialogData()
 {
 #ifdef __WXMSW__
     m_printDlgData = NULL;
 {
 #ifdef __WXMSW__
     m_printDlgData = NULL;

-#elif defined( __WXMAC__ )
-    m_macPrintInfo = NULL ;

 #endif
     m_printFromPage = 0;
     m_printToPage = 0;
 #endif
     m_printFromPage = 0;
     m_printToPage = 0;


@@ -715,8 +830,6 @@ wxPrintDialogData::wxPrintDialogData(const wxPrintDialogData& dialogData)
 {
 #ifdef __WXMSW__
     m_printDlgData = NULL;
 {
 #ifdef __WXMSW__
     m_printDlgData = NULL;

-#elif defined( __WXMAC__ )
-    m_macPrintInfo = NULL ;

 #endif
     (*this) = dialogData;
 }
 #endif
     (*this) = dialogData;
 }


@@ -725,8 +838,6 @@ wxPrintDialogData::wxPrintDialogData(const wxPrintData& printData)
 {
 #ifdef __WXMSW__
     m_printDlgData = NULL;
 {
 #ifdef __WXMSW__
     m_printDlgData = NULL;

-#elif defined( __WXMAC__ )
-    m_macPrintInfo = NULL ;

 #endif
     m_printFromPage = 0;
     m_printToPage = 0;
 #endif
     m_printFromPage = 0;
     m_printToPage = 0;


@@ -754,9 +865,6 @@ wxPrintDialogData::~wxPrintDialogData()
         GlobalFree(pd->hDevMode);
     if ( pd )
         delete pd;
         GlobalFree(pd->hDevMode);
     if ( pd )
         delete pd;

-#elif defined(__WXMAC__)
-    if ( m_macPrintInfo )
-        ::DisposeHandle( (Handle) m_macPrintInfo ) ;

 #endif
 }
 
 #endif
 }
 


@@ -793,18 +901,29 @@ void wxPrintDialogData::ConvertToNative()
         GlobalFree(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->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->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 ;
 


@@ -815,7 +934,7 @@ void wxPrintDialogData::ConvertToNative()
 #endif
 
     pd->hwndOwner=(HWND)NULL;
 #endif
 
     pd->hwndOwner=(HWND)NULL;

-    pd->hDevNames=(HANDLE)NULL;
+//    pd->hDevNames=(HANDLE)NULL;

     pd->hInstance=(HINSTANCE)NULL;
     pd->lCustData = (LPARAM) NULL;
     pd->lpfnPrintHook = NULL;
     pd->hInstance=(HINSTANCE)NULL;
     pd->lCustData = (LPARAM) NULL;
     pd->lpfnPrintHook = NULL;


@@ -827,7 +946,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;


@@ -863,6 +982,18 @@ void wxPrintDialogData::ConvertFromNative()
         pd->hDevMode = NULL;
     }
 
         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();
     // Now convert the DEVMODE object, passed down from the PRINTDLG object,
     // into wxWindows form.
     m_printData.ConvertFromNative();


@@ -915,31 +1046,22 @@ void wxPrintDialogData::SetOwnerWindow(wxWindow* win)
 #ifdef __WXMAC__
 void wxPrintDialogData::ConvertToNative()
 {
 #ifdef __WXMAC__
 void wxPrintDialogData::ConvertToNative()
 {

-    if ( !m_macPrintInfo )
-    {
-        m_macPrintInfo = (THPrint) NewHandleClear( sizeof( TPrint ) ) ;
-        if ( m_macPrintInfo )
-        {
-            ::PrintDefault( m_macPrintInfo ) ;
-            // todo setup the global pagesetup ?
-        }
-    }
-    if ( m_macPrintInfo )
-    {
-        (**m_macPrintInfo).prJob.iCopies = m_printNoCopies ;
-        (**m_macPrintInfo).prJob.iFstPage = m_printFromPage ;
-        (**m_macPrintInfo).prJob.iLstPage = m_printToPage ;
-    }
+#ifdef TARGET_CARBON
+#else
+       (**m_printData.m_macPrintInfo).prJob.iFstPage = m_printFromPage ;
+       (**m_printData.m_macPrintInfo).prJob.iLstPage = m_printToPage ;
+       m_printData.ConvertToNative() ;
+#endif

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

-    if ( m_macPrintInfo )
-    {
-        m_printNoCopies = (**m_macPrintInfo).prJob.iCopies ;
-        m_printFromPage = (**m_macPrintInfo).prJob.iFstPage ;
-        m_printToPage = (**m_macPrintInfo).prJob.iLstPage ;
-    }
+#ifdef TARGET_CARBON
+#else
+       m_printData.ConvertFromNative() ;
+       m_printFromPage = (**m_printData.m_macPrintInfo).prJob.iFstPage ;
+       m_printToPage = (**m_printData.m_macPrintInfo).prJob.iLstPage ;
+#endif

 }
 #endif
 
 }
 #endif
 


@@ -977,8 +1099,6 @@ wxPageSetupDialogData::wxPageSetupDialogData()
 {
 #if defined(__WIN95__)
     m_pageSetupData = NULL;
 {
 #if defined(__WIN95__)
     m_pageSetupData = NULL;

-#elif defined( __WXMAC__ )
-    m_macPageSetupInfo = NULL ;

 #endif
     m_paperSize = wxSize(0, 0);
 
 #endif
     m_paperSize = wxSize(0, 0);
 


@@ -1003,8 +1123,6 @@ wxPageSetupDialogData::wxPageSetupDialogData(const wxPageSetupDialogData& dialog
 {
 #if defined(__WIN95__)
     m_pageSetupData = NULL;
 {
 #if defined(__WIN95__)
     m_pageSetupData = NULL;

-#elif defined( __WXMAC__ )
-    m_macPageSetupInfo = NULL ;

 #endif
     (*this) = dialogData;
 }
 #endif
     (*this) = dialogData;
 }


@@ -1013,8 +1131,6 @@ wxPageSetupDialogData::wxPageSetupDialogData(const wxPrintData& printData)
 {
 #if defined(__WIN95__)
     m_pageSetupData = NULL;
 {
 #if defined(__WIN95__)
     m_pageSetupData = NULL;

-#elif defined( __WXMAC__ )
-    m_macPageSetupInfo = NULL ;

 #endif
     m_paperSize = wxSize(0, 0);
     m_minMarginTopLeft = wxPoint(0, 0);
 #endif
     m_paperSize = wxSize(0, 0);
     m_minMarginTopLeft = wxPoint(0, 0);


@@ -1044,11 +1160,10 @@ wxPageSetupDialogData::~wxPageSetupDialogData()
     PAGESETUPDLG *pd = (PAGESETUPDLG *)m_pageSetupData;
     if ( pd && pd->hDevMode )
         GlobalFree(pd->hDevMode);
     PAGESETUPDLG *pd = (PAGESETUPDLG *)m_pageSetupData;
     if ( pd && pd->hDevMode )
         GlobalFree(pd->hDevMode);

+    if ( pd && pd->hDevNames )
+        GlobalFree(pd->hDevNames);

     if ( pd )
         delete pd;
     if ( pd )
         delete pd;

-#elif defined( __WXMAC__ )
-    if( m_macPageSetupInfo )
-        ::DisposeHandle( (Handle) m_macPageSetupInfo ) ;

 #endif
 }
 
 #endif
 }
 


@@ -1086,6 +1201,7 @@ void wxPageSetupDialogData::ConvertToNative()
     {
         pd = new PAGESETUPDLG;
         pd->hDevMode = NULL;
     {
         pd = new PAGESETUPDLG;
         pd->hDevMode = NULL;

+        pd->hDevNames = NULL;

         m_pageSetupData = (void *)pd;
     }
 
         m_pageSetupData = (void *)pd;
     }
 


@@ -1105,6 +1221,20 @@ void wxPageSetupDialogData::ConvertToNative()
 
     wxASSERT_MSG( (pd->hDevMode), wxT("hDevMode must be non-NULL in ConvertToNative!"));
 
 
     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;
 //        pd->hDevMode = GlobalAlloc(GMEM_MOVEABLE, sizeof(DEVMODE));
 
     pd->Flags = PSD_MARGINS|PSD_MINMARGINS;


@@ -1129,9 +1259,9 @@ void wxPageSetupDialogData::ConvertToNative()
 
     pd->lStructSize = sizeof( PAGESETUPDLG );
     pd->hwndOwner=(HWND)NULL;
 
     pd->lStructSize = sizeof( PAGESETUPDLG );
     pd->hwndOwner=(HWND)NULL;

-    pd->hDevNames=(HWND)NULL;
+//    pd->hDevNames=(HWND)NULL;

     pd->hInstance=(HINSTANCE)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->ptPaperSize.x = m_paperSize.x * 100;
     pd->ptPaperSize.y = m_paperSize.y * 100;
 


@@ -1184,6 +1314,20 @@ void wxPageSetupDialogData::ConvertFromNative()
 
     m_printData.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);
     pd->Flags = PSD_MARGINS|PSD_MINMARGINS;
 
     m_defaultMinMargins = ((pd->Flags & PSD_DEFAULTMINMARGINS) == PSD_DEFAULTMINMARGINS);


@@ -1194,6 +1338,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

     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;
 


@@ -1224,62 +1369,52 @@ void wxPageSetupDialogData::SetOwnerWindow(wxWindow* win)
 #ifdef __WXMAC__
 void wxPageSetupDialogData::ConvertToNative()
 {
 #ifdef __WXMAC__
 void wxPageSetupDialogData::ConvertToNative()
 {

-    if ( !m_macPageSetupInfo )
-    {
-        m_macPageSetupInfo = (THPrint) NewHandleClear( sizeof( TPrint ) ) ;
-        if ( m_macPageSetupInfo )
-        {
-            ::PrintDefault( m_macPageSetupInfo ) ;
-        }
-    }
-    if ( m_macPageSetupInfo )
-    {
-        // on mac the paper rect has a negative top left corner, because the page rect (printable area) is at 0,0
-        (**m_macPageSetupInfo).rPaper.left = int( ((double) m_minMarginTopLeft.x)*mm2pt ) ;
-        (**m_macPageSetupInfo).rPaper.top = int( ((double) m_minMarginTopLeft.y)*mm2pt ) ;
-
-        (**m_macPageSetupInfo).rPaper.right = int( ((double) m_paperSize.x - m_minMarginTopLeft.x)*mm2pt ) ;
-        (**m_macPageSetupInfo).rPaper.bottom = int( ((double) m_paperSize.y - m_minMarginTopLeft.y)*mm2pt ) ;
-
-        (**m_macPageSetupInfo).prInfo.rPage.left = 0 ;
-        (**m_macPageSetupInfo).prInfo.rPage.top = 0 ;
-        (**m_macPageSetupInfo).prInfo.rPage.right =  int( ((double) m_paperSize.x - m_minMarginTopLeft.x - m_minMarginBottomRight.x)*mm2pt ) ;
-        (**m_macPageSetupInfo).prInfo.rPage.bottom =  int( ((double) m_paperSize.y - m_minMarginTopLeft.y - m_minMarginBottomRight.y)*mm2pt ) ;
-
-        //TODO add custom fields in dialog for margins
-
-    }
+       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
+#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 ) ;
+
+       (**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 ) ;
+#endif

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

-    if ( m_macPageSetupInfo )
-    {
-        m_paperSize.x = ((double) (**m_macPageSetupInfo).rPaper.right - (**m_macPageSetupInfo).rPaper.left ) * pt2mm ;
-        m_paperSize.y = ((double) (**m_macPageSetupInfo).rPaper.bottom - (**m_macPageSetupInfo).rPaper.top ) * pt2mm ;
-
-        m_minMarginTopLeft.x = ((double) -(**m_macPageSetupInfo).rPaper.left ) * pt2mm ;
-        m_minMarginTopLeft.y = ((double) -(**m_macPageSetupInfo).rPaper.top ) * pt2mm ;
-
-        m_minMarginBottomRight.x = ((double) (**m_macPageSetupInfo).rPaper.right - (**m_macPageSetupInfo).prInfo.rPage.right ) * pt2mm ;
-        m_minMarginBottomRight.y = ((double)(**m_macPageSetupInfo).rPaper.bottom - (**m_macPageSetupInfo).prInfo.rPage.bottom ) * pt2mm ;
+       m_printData.ConvertFromNative () ;

 
 

-        // 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 ;
-
-    }
+#ifdef TARGET_CARBON
+#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 ;
+#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 ;

 }
 #endif
 
 }
 #endif
 


@@ -1306,8 +1441,7 @@ void wxPageSetupDialogData::SetPaperSize(wxPaperSize id)
 void wxPageSetupDialogData::CalculateIdFromPaperSize()
 {
     wxASSERT_MSG( (wxThePrintPaperDatabase != (wxPrintPaperDatabase*) NULL),
 void wxPageSetupDialogData::CalculateIdFromPaperSize()
 {
     wxASSERT_MSG( (wxThePrintPaperDatabase != (wxPrintPaperDatabase*) NULL),

-                  wxT("wxThePrintPaperDatabase should not be NULL. "
-                     "Do not create global print dialog data objects.") );
+                  wxT("wxThePrintPaperDatabase should not be NULL. Do not create global print dialog data objects.") );

 
     wxSize sz = GetPaperSize();
 
 
     wxSize sz = GetPaperSize();
 


@@ -1322,8 +1456,7 @@ void wxPageSetupDialogData::CalculateIdFromPaperSize()
 void wxPageSetupDialogData::CalculatePaperSizeFromId()
 {
     wxASSERT_MSG( (wxThePrintPaperDatabase != (wxPrintPaperDatabase*) NULL),
 void wxPageSetupDialogData::CalculatePaperSizeFromId()
 {
     wxASSERT_MSG( (wxThePrintPaperDatabase != (wxPrintPaperDatabase*) NULL),

-                  wxT("wxThePrintPaperDatabase should not be NULL. "
-                     "Do not create global print dialog data objects.") );
+                  wxT("wxThePrintPaperDatabase should not be NULL. Do not create global print dialog data objects.") );

 
     wxSize sz = wxThePrintPaperDatabase->GetSize(m_printData.GetPaperId());
 
 
     wxSize sz = wxThePrintPaperDatabase->GetSize(m_printData.GetPaperId());