some != NULL checks

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

diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp
index 045ff855563939604da7eddafbc42da3e97e7683..2e612f6ad577ca7dd8c9312746c065194c69b37b 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__)) && wxUSE_POSTSCRIPT

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


@@ -72,20 +72,19 @@
     #endif
 #endif // MSW
 
     #endif
 #endif // MSW
 

-#if !USE_SHARED_LIBRARY

     #if wxUSE_PRINTING_ARCHITECTURE
         IMPLEMENT_DYNAMIC_CLASS(wxPrintData, wxObject)
         IMPLEMENT_DYNAMIC_CLASS(wxPrintDialogData, wxObject)
         IMPLEMENT_DYNAMIC_CLASS(wxPageSetupDialogData, wxObject)
     #endif // wxUSE_PRINTING_ARCHITECTURE
     #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)
     IMPLEMENT_DYNAMIC_CLASS(wxFontData, wxObject)
     IMPLEMENT_DYNAMIC_CLASS(wxColourData, wxObject)

-#endif

 
 #ifdef __WXMAC__
 
 #ifdef __WXMAC__

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

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


@@ -170,9 +169,10 @@ 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 ;
+    m_macPrintInfo = NULL ;

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


@@ -202,9 +202,10 @@ 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 ;
+    m_macPrintInfo = NULL ;

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


@@ -213,17 +214,20 @@ 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 ( m_macPrintInfo )
+        ::DisposeHandle( (Handle) m_macPrintInfo ) ;

 #endif
 }
 
 #if defined(__WXMSW__) // && defined(__WIN32__)
 
 #endif
 }
 
 #if defined(__WXMSW__) // && defined(__WIN32__)
 

-#ifdef __WIN32__
+#if defined(__WXDEBUG__) && defined(__WIN32__)

 static wxString wxGetPrintDlgError()
 {
     DWORD err = CommDlgExtendedError();
 static wxString wxGetPrintDlgError()
 {
     DWORD err = CommDlgExtendedError();


@@ -258,9 +262,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


@@ -302,13 +337,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;


@@ -316,7 +357,7 @@ void wxPrintData::ConvertToNative()
 
     if ( hDevMode )
     {
 
     if ( hDevMode )
     {

-        DEVMODE *devMode = (DEVMODE*) GlobalLock(hDevMode);
+        LPDEVMODE devMode = (LPDEVMODE) GlobalLock(hDevMode);

 
         //// Orientation
 
 
         //// Orientation
 


@@ -427,18 +468,27 @@ void wxPrintData::ConvertToNative()
 
         GlobalUnlock(hDevMode);
     }
 
         GlobalUnlock(hDevMode);
     }

+
+    if ( hDevNames )
+    {
+        GlobalFree(hDevNames);
+    }
+
+    // TODO: I hope it's OK to pass some empty strings to DEVNAMES.
+    hDevNames = 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 )
     {
 
     if (!hDevMode)
         return;
 
     if ( hDevMode )
     {

-        DEVMODE *devMode = (DEVMODE*) GlobalLock(hDevMode);
+        LPDEVMODE devMode = (LPDEVMODE)GlobalLock(hDevMode);

 
 #ifndef __WXWINE__
         //// Orientation
 
 #ifndef __WXWINE__
         //// Orientation


@@ -600,6 +650,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 != "")
+                m_printerName = printerName;
+
+            GlobalUnlock(hDevNames);
+        }
+    }

 }
 
 #endif
 }
 
 #endif


@@ -607,29 +681,29 @@ 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 ;
-       }
+    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 ;
+    }

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

-       if ( m_macPrintInfo )
-       {
-               m_printNoCopies = (**m_macPrintInfo).prJob.iCopies ;
-       }
+    if ( m_macPrintInfo )
+    {
+        m_printNoCopies = (**m_macPrintInfo).prJob.iCopies ;
+    }

 }
 #endif
 
 }
 #endif
 


@@ -694,7 +768,7 @@ wxPrintDialogData::wxPrintDialogData()
 #ifdef __WXMSW__
     m_printDlgData = NULL;
 #elif defined( __WXMAC__ )
 #ifdef __WXMSW__
     m_printDlgData = NULL;
 #elif defined( __WXMAC__ )

-       m_macPrintInfo = NULL ;
+    m_macPrintInfo = NULL ;

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


@@ -717,7 +791,7 @@ wxPrintDialogData::wxPrintDialogData(const wxPrintDialogData& dialogData)
 #ifdef __WXMSW__
     m_printDlgData = NULL;
 #elif defined( __WXMAC__ )
 #ifdef __WXMSW__
     m_printDlgData = NULL;
 #elif defined( __WXMAC__ )

-       m_macPrintInfo = NULL ;
+    m_macPrintInfo = NULL ;

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


@@ -727,7 +801,7 @@ wxPrintDialogData::wxPrintDialogData(const wxPrintData& printData)
 #ifdef __WXMSW__
     m_printDlgData = NULL;
 #elif defined( __WXMAC__ )
 #ifdef __WXMSW__
     m_printDlgData = NULL;
 #elif defined( __WXMAC__ )

-       m_macPrintInfo = NULL ;
+    m_macPrintInfo = NULL ;

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


@@ -756,8 +830,8 @@ wxPrintDialogData::~wxPrintDialogData()
     if ( pd )
         delete pd;
 #elif defined(__WXMAC__)
     if ( pd )
         delete pd;
 #elif defined(__WXMAC__)

-       if ( m_macPrintInfo )
-               ::DisposeHandle( (Handle) m_macPrintInfo ) ;
+    if ( m_macPrintInfo )
+        ::DisposeHandle( (Handle) m_macPrintInfo ) ;

 #endif
 }
 
 #endif
 }
 


@@ -794,12 +868,23 @@ 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->nFromPage = (UINT)m_printFromPage;
     pd->nToPage = (UINT)m_printToPage;
     pd->hDC = (HDC) NULL;
     pd->nFromPage = (UINT)m_printFromPage;
     pd->nToPage = (UINT)m_printToPage;


@@ -816,7 +901,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;


@@ -864,6 +949,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();


@@ -916,31 +1013,31 @@ 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 ;
-       }
+    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 ;
+    }

 }
 
 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 ;
-       }
+    if ( m_macPrintInfo )
+    {
+        m_printNoCopies = (**m_macPrintInfo).prJob.iCopies ;
+        m_printFromPage = (**m_macPrintInfo).prJob.iFstPage ;
+        m_printToPage = (**m_macPrintInfo).prJob.iLstPage ;
+    }

 }
 #endif
 
 }
 #endif
 


@@ -979,7 +1076,7 @@ wxPageSetupDialogData::wxPageSetupDialogData()
 #if defined(__WIN95__)
     m_pageSetupData = NULL;
 #elif defined( __WXMAC__ )
 #if defined(__WIN95__)
     m_pageSetupData = NULL;
 #elif defined( __WXMAC__ )

-       m_macPageSetupInfo = NULL ;
+    m_macPageSetupInfo = NULL ;

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


@@ -1005,7 +1102,7 @@ wxPageSetupDialogData::wxPageSetupDialogData(const wxPageSetupDialogData& dialog
 #if defined(__WIN95__)
     m_pageSetupData = NULL;
 #elif defined( __WXMAC__ )
 #if defined(__WIN95__)
     m_pageSetupData = NULL;
 #elif defined( __WXMAC__ )

-       m_macPageSetupInfo = NULL ;
+    m_macPageSetupInfo = NULL ;

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


@@ -1015,7 +1112,7 @@ wxPageSetupDialogData::wxPageSetupDialogData(const wxPrintData& printData)
 #if defined(__WIN95__)
     m_pageSetupData = NULL;
 #elif defined( __WXMAC__ )
 #if defined(__WIN95__)
     m_pageSetupData = NULL;
 #elif defined( __WXMAC__ )

-       m_macPageSetupInfo = NULL ;
+    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);


@@ -1045,11 +1142,13 @@ 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;
 #elif defined( __WXMAC__ )
     if ( pd )
         delete pd;
 #elif defined( __WXMAC__ )

-       if( m_macPageSetupInfo )
-               ::DisposeHandle( (Handle) m_macPageSetupInfo ) ;
+    if( m_macPageSetupInfo )
+        ::DisposeHandle( (Handle) m_macPageSetupInfo ) ;

 #endif
 }
 
 #endif
 }
 


@@ -1087,6 +1186,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;
     }
 


@@ -1106,6 +1206,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;


@@ -1130,7 +1244,7 @@ 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->ptPaperSize.x = m_paperSize.x * 100;
     pd->hInstance=(HINSTANCE)NULL;
 
     pd->ptPaperSize.x = m_paperSize.x * 100;


@@ -1185,6 +1299,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);


@@ -1225,62 +1353,62 @@ 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 ) ;
+    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 ) ;
+        (**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 ) ;

 
 

-               //TODO add custom fields in dialog for margins
+        (**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
+
+    }

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