]> git.saurik.com Git - wxWidgets.git/blobdiff - src/msw/printdlg.cpp
do nothing in Freeze/Thaw() if the window is hidden, otherwise the window is not...
[wxWidgets.git] / src / msw / printdlg.cpp
index 380233da941de0d6f36f29c87f06c5c8dd312bd0..02892c45100bbaeae8049e8391bbf4bacb1abdfd 100644 (file)
@@ -17,7 +17,7 @@
 // headers
 // ---------------------------------------------------------------------------
 
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
     #pragma implementation "printdlg.h"
 #endif
 
     #pragma hdrstop
 #endif
 
-#if wxUSE_PRINTING_ARCHITECTURE
+// Don't use the Windows print dialog if we're in wxUniv mode and using
+// the PostScript architecture
+#if wxUSE_PRINTING_ARCHITECTURE && (!defined(__WXUNIVERSAL__) || !wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW)
 
 #ifndef WX_PRECOMP
     #include "wx/app.h"
 #endif
 
+#include "wx/cmndata.h"
 #include "wx/printdlg.h"
+#include "wx/msw/printdlg.h"
 #include "wx/dcprint.h"
-
-// Have to emulate page setup dialog for Win16
-#if !defined(__WIN95__)
-    #include "wx/generic/prntdlgg.h"
-#endif
+#include "wx/paper.h"
 
 #include <stdlib.h>
 
-#include "wx/msw/private.h"
-
-#include <commdlg.h>
+#include "wx/msw/wrapcdlg.h"
 
 #ifndef __WIN32__
     #include <print.h>
 #endif
 
-// ---------------------------------------------------------------------------
-// wxWin macros
-// ---------------------------------------------------------------------------
+//----------------------------------------------------------------------------
+// wxWindowsPrintNativeData
+//----------------------------------------------------------------------------
+
+#ifdef __WXDEBUG__
+static wxString wxGetPrintDlgError()
+{
+    DWORD err = CommDlgExtendedError();
+    wxString msg = wxT("Unknown");
+    switch (err)
+    {
+        case CDERR_FINDRESFAILURE: msg = wxT("CDERR_FINDRESFAILURE"); break;
+        case CDERR_INITIALIZATION: msg = wxT("CDERR_INITIALIZATION"); break;
+        case CDERR_LOADRESFAILURE: msg = wxT("CDERR_LOADRESFAILURE"); break;
+        case CDERR_LOADSTRFAILURE: msg = wxT("CDERR_LOADSTRFAILURE"); break;
+        case CDERR_LOCKRESFAILURE: msg = wxT("CDERR_LOCKRESFAILURE"); break;
+        case CDERR_MEMALLOCFAILURE: msg = wxT("CDERR_MEMALLOCFAILURE"); break;
+        case CDERR_MEMLOCKFAILURE: msg = wxT("CDERR_MEMLOCKFAILURE"); break;
+        case CDERR_NOHINSTANCE: msg = wxT("CDERR_NOHINSTANCE"); break;
+        case CDERR_NOHOOK: msg = wxT("CDERR_NOHOOK"); break;
+        case CDERR_NOTEMPLATE: msg = wxT("CDERR_NOTEMPLATE"); break;
+        case CDERR_STRUCTSIZE: msg = wxT("CDERR_STRUCTSIZE"); break;
+        case  PDERR_RETDEFFAILURE: msg = wxT("PDERR_RETDEFFAILURE"); break;
+        case  PDERR_PRINTERNOTFOUND: msg = wxT("PDERR_PRINTERNOTFOUND"); break;
+        case  PDERR_PARSEFAILURE: msg = wxT("PDERR_PARSEFAILURE"); break;
+        case  PDERR_NODEVICES: msg = wxT("PDERR_NODEVICES"); break;
+        case  PDERR_NODEFAULTPRN: msg = wxT("PDERR_NODEFAULTPRN"); break;
+        case  PDERR_LOADDRVFAILURE: msg = wxT("PDERR_LOADDRVFAILURE"); break;
+        case  PDERR_INITFAILURE: msg = wxT("PDERR_INITFAILURE"); break;
+        case  PDERR_GETDEVMODEFAIL: msg = wxT("PDERR_GETDEVMODEFAIL"); break;
+        case  PDERR_DNDMMISMATCH: msg = wxT("PDERR_DNDMMISMATCH"); break;
+        case  PDERR_DEFAULTDIFFERENT: msg = wxT("PDERR_DEFAULTDIFFERENT"); break;
+        case  PDERR_CREATEICFAILURE: msg = wxT("PDERR_CREATEICFAILURE"); break;
+        default: break;
+    }
+    return msg;
+}
+#endif
+
+static HGLOBAL wxCreateDevNames(const wxString& driverName, const wxString& printerName, const wxString& portName)
+{
+    HGLOBAL hDev = NULL;
+    // if (!driverName.empty() && !printerName.empty() && !portName.empty())
+    if (driverName.empty() && printerName.empty() && portName.empty())
+    {
+    }
+    else
+    {
+        hDev = GlobalAlloc(GPTR, 4*sizeof(WORD)+
+                           ( driverName.Length() + 1 +
+            printerName.Length() + 1 +
+                             portName.Length()+1 ) * sizeof(wxChar) );
+        LPDEVNAMES lpDev = (LPDEVNAMES)GlobalLock(hDev);
+        lpDev->wDriverOffset = sizeof(WORD) * 4 / sizeof(wxChar);
+        wxStrcpy((wxChar*)lpDev + lpDev->wDriverOffset, driverName);
 
-    IMPLEMENT_DYNAMIC_CLASS(wxPrintDialog, wxDialog)
-    IMPLEMENT_CLASS(wxPageSetupDialog, wxDialog)
+        lpDev->wDeviceOffset = (WORD)( lpDev->wDriverOffset +
+                                       driverName.Length() + 1 );
+        wxStrcpy((wxChar*)lpDev + lpDev->wDeviceOffset, printerName);
 
-// ===========================================================================
-// implementation
-// ===========================================================================
+        lpDev->wOutputOffset = (WORD)( lpDev->wDeviceOffset +
+                                       printerName.Length() + 1 );
+        wxStrcpy((wxChar*)lpDev + lpDev->wOutputOffset, portName);
+
+        lpDev->wDefault = 0;
+
+        GlobalUnlock(hDev);
+    }
+
+    return hDev;
+}
+
+IMPLEMENT_CLASS(wxWindowsPrintNativeData, wxPrintNativeDataBase)
+
+wxWindowsPrintNativeData::wxWindowsPrintNativeData()
+{
+    m_devMode = (void*) NULL;
+    m_devNames = (void*) NULL;
+}
+
+wxWindowsPrintNativeData::~wxWindowsPrintNativeData()
+{
+    HGLOBAL hDevMode = (HGLOBAL)(DWORD) m_devMode;
+    if ( hDevMode )
+        GlobalFree(hDevMode);
+    HGLOBAL hDevNames = (HGLOBAL)(DWORD) m_devNames;
+    if ( hDevNames )
+        GlobalFree(hDevNames);
+}
+
+bool wxWindowsPrintNativeData::Ok() const
+{
+    return (m_devMode != NULL) ;
+}
+
+bool wxWindowsPrintNativeData::TransferTo( wxPrintData &data )
+{
+    HGLOBAL hDevMode = (HGLOBAL)(DWORD) m_devMode;
+    HGLOBAL hDevNames = (HGLOBAL)(DWORD) m_devNames;
+
+    if (!hDevMode)
+        return false;
+
+    if ( hDevMode )
+    {
+        LPDEVMODE devMode = (LPDEVMODE)GlobalLock(hDevMode);
+
+        //// Orientation
+        if (devMode->dmFields & DM_ORIENTATION)
+            data.SetOrientation( devMode->dmOrientation );
+
+        //// Collation
+        if (devMode->dmFields & DM_COLLATE)
+        {
+            if (devMode->dmCollate == DMCOLLATE_TRUE)
+                data.SetCollate( true );
+            else
+                data.SetCollate( false );
+        }
+
+        //// Number of copies
+        if (devMode->dmFields & DM_COPIES)
+            data.SetNoCopies( devMode->dmCopies );
+
+        if (devMode->dmFields & DM_DEFAULTSOURCE)
+            data.SetBin( (wxPrintBin)devMode->dmDefaultSource );
+
+        //// Printer name
+        if (devMode->dmDeviceName[0] != 0)
+            data.SetPrinterName( devMode->dmDeviceName );
+
+        //// Colour
+        if (devMode->dmFields & DM_COLOR)
+        {
+            if (devMode->dmColor == DMCOLOR_COLOR)
+                data.SetColour( true );
+            else
+                data.SetColour( false );
+        }
+        else
+            data.SetColour( true );
+
+        //// Paper size
+
+        // 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)
+            {
+                wxPrintPaperType* paper = wxThePrintPaperDatabase->FindPaperTypeByPlatformId(devMode->dmPaperSize);
+                if (paper)
+                {
+                    data.SetPaperId( paper->GetId() );
+                    data.SetPaperSize( wxSize(paper->GetWidth() / 10,paper->GetHeight() / 10) );
+                }
+                else
+                {
+                    // Shouldn't really get here
+                    wxFAIL_MSG(wxT("Couldn't find paper size in paper database."));
+                    data.SetPaperId( wxPAPER_NONE );
+                    data.SetPaperSize( wxSize(0,0) );
+                }
+            }
+            else
+            {
+                // Shouldn't really get here
+                wxFAIL_MSG(wxT("Paper database wasn't initialized in wxPrintData::ConvertFromNative."));
+                data.SetPaperId( wxPAPER_NONE );
+                data.SetPaperSize( wxSize(0,0) );
+            }
+        }
+        else if ((devMode->dmFields & DM_PAPERWIDTH) && (devMode->dmFields & DM_PAPERLENGTH))
+        {
+            // DEVMODE is in tenths of a milimeter
+            data.SetPaperId( wxPAPER_NONE );
+            data.SetPaperSize( wxSize(devMode->dmPaperWidth / 10, devMode->dmPaperLength / 10) );
+        }
+        else
+        {
+            // Shouldn't really get here
+            wxFAIL_MSG(wxT("Couldn't find paper size from DEVMODE."));
+            data.SetPaperId( wxPAPER_NONE );
+            data.SetPaperSize( wxSize(0,0) );
+        }
+
+        //// Duplex
+
+        if (devMode->dmFields & DM_DUPLEX)
+        {
+            switch (devMode->dmDuplex)
+            {
+                case DMDUP_HORIZONTAL:   data.SetDuplex( wxDUPLEX_HORIZONTAL ); break;
+                case DMDUP_VERTICAL:     data.SetDuplex( wxDUPLEX_VERTICAL ); break;
+                default:
+                case DMDUP_SIMPLEX:      data.SetDuplex( wxDUPLEX_SIMPLEX ); break;
+            }
+        }
+        else
+            data.SetDuplex( wxDUPLEX_SIMPLEX );
+
+        //// Quality
+
+        if (devMode->dmFields & DM_PRINTQUALITY)
+        {
+            switch (devMode->dmPrintQuality)
+            {
+                case DMRES_MEDIUM:  data.SetQuality( wxPRINT_QUALITY_MEDIUM ); break;
+                case DMRES_LOW:     data.SetQuality( wxPRINT_QUALITY_LOW ); break;
+                case DMRES_DRAFT:   data.SetQuality( wxPRINT_QUALITY_DRAFT ); break;
+                case DMRES_HIGH:    data.SetQuality( wxPRINT_QUALITY_HIGH ); break;
+                default:
+                {
+                    // TODO: if the printer fills in the resolution in DPI, how
+                    // will the application know if it's high, low, draft etc.??
+                    //                    wxFAIL_MSG("Warning: DM_PRINTQUALITY was not one of the standard values.");
+                    data.SetQuality( devMode->dmPrintQuality );
+                    break;
+
+                }
+            }
+        }
+        else
+            data.SetQuality( wxPRINT_QUALITY_HIGH );
+
+        if (devMode->dmDriverExtra > 0)
+            data.SetPrivData( (char *)devMode+devMode->dmSize, devMode->dmDriverExtra );
+        else
+            data.SetPrivData( NULL, 0 );
+
+        GlobalUnlock(hDevMode);
+    }
+
+    if (hDevNames)
+    {
+        LPDEVNAMES lpDevNames = (LPDEVNAMES)GlobalLock(hDevNames);
+        if (lpDevNames)
+        {
+            // TODO: Unicode-ification
+
+            // Get the port name
+            // port is obsolete in WIN32
+            // m_printData.SetPortName((LPSTR)lpDevNames + lpDevNames->wDriverOffset);
+
+            // Get the printer name
+            wxString printerName = (LPTSTR)lpDevNames + lpDevNames->wDeviceOffset;
+
+            // Not sure if we should check for this mismatch
+//            wxASSERT_MSG( (m_printerName.empty() || (devName == m_printerName)), "Printer name obtained from DEVMODE and DEVNAMES were different!");
+
+            if (!printerName.empty())
+                data.SetPrinterName( printerName );
+
+            GlobalUnlock(hDevNames);
+        }
+    }
+
+    return true;
+}
+
+bool wxWindowsPrintNativeData::TransferFrom( const wxPrintData &data )
+{
+    HGLOBAL hDevMode = (HGLOBAL)(DWORD) m_devMode;
+    HGLOBAL hDevNames = (HGLOBAL)(DWORD) m_devNames;
+    if (!hDevMode)
+    {
+        // Use PRINTDLG as a way of creating a DEVMODE object
+        PRINTDLG pd;
+
+        // GNU-WIN32 has the wrong size PRINTDLG - can't work out why.
+#ifdef __GNUWIN32__
+        memset(&pd, 0, 66);
+        pd.lStructSize    = 66;
+#else
+        memset(&pd, 0, sizeof(PRINTDLG));
+#ifdef __WXWINCE__
+        pd.cbStruct    = sizeof(PRINTDLG);
+#else
+        pd.lStructSize    = sizeof(PRINTDLG);
+#endif
+#endif
+
+        pd.hwndOwner      = (HWND)NULL;
+        pd.hDevMode       = NULL; // Will be created by PrintDlg
+        pd.hDevNames      = NULL; // Ditto
+        //pd.hInstance      = (HINSTANCE) wxGetInstance();
+
+        pd.Flags          = PD_RETURNDEFAULT;
+        pd.nCopies        = 1;
+
+        // Fill out the DEVMODE structure
+        // so we can use it as input in the 'real' PrintDlg
+        if (!PrintDlg(&pd))
+        {
+            if ( pd.hDevMode )
+                GlobalFree(pd.hDevMode);
+            if ( pd.hDevNames )
+                GlobalFree(pd.hDevNames);
+            pd.hDevMode = NULL;
+            pd.hDevNames = NULL;
+
+#if defined(__WXDEBUG__) && defined(__WIN32__)
+            wxString str(wxT("Printing error: "));
+            str += wxGetPrintDlgError();
+            wxLogDebug(str);
+#endif
+        }
+        else
+        {
+            hDevMode = pd.hDevMode;
+            m_devMode = (void*)(long) hDevMode;
+            pd.hDevMode = NULL;
+
+            // We'll create a new DEVNAMEs structure below.
+            if ( pd.hDevNames )
+                GlobalFree(pd.hDevNames);
+            pd.hDevNames = NULL;
+
+            // hDevNames = pd->hDevNames;
+            // m_devNames = (void*)(long) hDevNames;
+            // pd->hDevnames = NULL;
+
+        }
+    }
+
+    if ( hDevMode )
+    {
+        LPDEVMODE devMode = (LPDEVMODE) GlobalLock(hDevMode);
+
+        //// Orientation
+        devMode->dmOrientation = (short)data.GetOrientation();
+
+        //// Collation
+        devMode->dmCollate = (data.GetCollate() ? DMCOLLATE_TRUE : DMCOLLATE_FALSE);
+        devMode->dmFields |= DM_COLLATE;
+
+        //// Number of copies
+        devMode->dmCopies = (short)data.GetNoCopies();
+        devMode->dmFields |= DM_COPIES;
+
+        //// Printer name
+        wxString name = data.GetPrinterName();
+        if (!name.empty())
+        {
+            //int len = wxMin(31, m_printerName.Len());
+            wxStrncpy((wxChar*)devMode->dmDeviceName,name.c_str(),31);
+            devMode->dmDeviceName[31] = wxT('\0');
+        }
+
+        //// Colour
+        if (data.GetColour())
+            devMode->dmColor = DMCOLOR_COLOR;
+        else
+            devMode->dmColor = DMCOLOR_MONOCHROME;
+        devMode->dmFields |= DM_COLOR;
+
+        //// Paper size
+        if (data.GetPaperId() == wxPAPER_NONE)
+        {
+            // DEVMODE is in tenths of a milimeter
+            devMode->dmPaperWidth = (short)(data.GetPaperSize().x * 10);
+            devMode->dmPaperLength = (short)(data.GetPaperSize().y * 10);
+            devMode->dmPaperSize = DMPAPER_USER;
+            devMode->dmFields |= DM_PAPERWIDTH;
+            devMode->dmFields |= DM_PAPERLENGTH;
+        }
+        else
+        {
+            if (wxThePrintPaperDatabase)
+            {
+                wxPrintPaperType* paper = wxThePrintPaperDatabase->FindPaperType( data.GetPaperId() );
+                if (paper)
+                {
+                    devMode->dmPaperSize = (short)paper->GetPlatformId();
+                    devMode->dmFields |= DM_PAPERSIZE;
+                }
+            }
+        }
+
+        //// Duplex
+        short duplex;
+        switch (data.GetDuplex())
+        {
+            case wxDUPLEX_HORIZONTAL:
+                duplex = DMDUP_HORIZONTAL;
+                break;
+            case wxDUPLEX_VERTICAL:
+                duplex = DMDUP_VERTICAL;
+                break;
+            default:
+            // in fact case wxDUPLEX_SIMPLEX:
+                duplex = DMDUP_SIMPLEX;
+                break;
+        }
+        devMode->dmDuplex = duplex;
+        devMode->dmFields |= DM_DUPLEX;
+
+        //// Quality
+
+        short quality;
+        switch (data.GetQuality())
+        {
+            case wxPRINT_QUALITY_MEDIUM:
+                quality = DMRES_MEDIUM;
+                break;
+            case wxPRINT_QUALITY_LOW:
+                quality = DMRES_LOW;
+                break;
+            case wxPRINT_QUALITY_DRAFT:
+                quality = DMRES_DRAFT;
+                break;
+            case wxPRINT_QUALITY_HIGH:
+                quality = DMRES_HIGH;
+                break;
+            default:
+                quality = (short)data.GetQuality();
+                break;
+        }
+        devMode->dmPrintQuality = quality;
+        devMode->dmFields |= DM_PRINTQUALITY;
+
+        if (data.GetPrivDataLen() > 0)
+        {
+            memcpy( (char *)devMode+devMode->dmSize, data.GetPrivData(), data.GetPrivDataLen() );
+            devMode->dmDriverExtra = (WXWORD)data.GetPrivDataLen();
+        }
+
+        if (data.GetBin() != wxPRINTBIN_DEFAULT)
+        {
+            switch (data.GetBin())
+            {
+                case wxPRINTBIN_ONLYONE:        devMode->dmDefaultSource = DMBIN_ONLYONE;       break;
+                case wxPRINTBIN_LOWER:          devMode->dmDefaultSource = DMBIN_LOWER;         break;
+                case wxPRINTBIN_MIDDLE:         devMode->dmDefaultSource = DMBIN_MIDDLE;        break;
+                case wxPRINTBIN_MANUAL:         devMode->dmDefaultSource = DMBIN_MANUAL;        break;
+                case wxPRINTBIN_ENVELOPE:       devMode->dmDefaultSource = DMBIN_ENVELOPE;      break;
+                case wxPRINTBIN_ENVMANUAL:      devMode->dmDefaultSource = DMBIN_ENVMANUAL;     break;
+                case wxPRINTBIN_AUTO:           devMode->dmDefaultSource = DMBIN_AUTO;          break;
+                case wxPRINTBIN_TRACTOR:        devMode->dmDefaultSource = DMBIN_TRACTOR;       break;
+                case wxPRINTBIN_SMALLFMT:       devMode->dmDefaultSource = DMBIN_SMALLFMT;      break;
+                case wxPRINTBIN_LARGEFMT:       devMode->dmDefaultSource = DMBIN_LARGEFMT;      break;
+                case wxPRINTBIN_LARGECAPACITY:  devMode->dmDefaultSource = DMBIN_LARGECAPACITY; break;
+                case wxPRINTBIN_CASSETTE:       devMode->dmDefaultSource = DMBIN_CASSETTE;      break;
+                case wxPRINTBIN_FORMSOURCE:     devMode->dmDefaultSource = DMBIN_FORMSOURCE;    break;
+
+                default:
+                    devMode->dmDefaultSource = (short)(DMBIN_USER + data.GetBin() - wxPRINTBIN_USER);
+                    break;
+            }
+
+            devMode->dmFields |= DM_DEFAULTSOURCE;
+        }
+
+        GlobalUnlock(hDevMode);
+    }
+
+    if ( hDevNames )
+    {
+        GlobalFree(hDevNames);
+    }
+
+    // TODO: I hope it's OK to pass some empty strings to DEVNAMES.
+    m_devNames = (void*) (long) wxCreateDevNames(wxEmptyString, data.GetPrinterName(), wxEmptyString);
+
+    return true;
+}
 
 // ---------------------------------------------------------------------------
 // wxPrintDialog
 // ---------------------------------------------------------------------------
 
-wxPrintDialog::wxPrintDialog()
-{
-    m_dialogParent = NULL;
-    m_printerDC = NULL;
-    m_destroyDC = TRUE;
-}
+IMPLEMENT_CLASS(wxWindowsPrintDialog, wxPrintDialogBase)
 
-wxPrintDialog::wxPrintDialog(wxWindow *p, wxPrintDialogData* data)
+wxWindowsPrintDialog::wxWindowsPrintDialog(wxWindow *p, wxPrintDialogData* data)
 {
     Create(p, data);
 }
 
-wxPrintDialog::wxPrintDialog(wxWindow *p, wxPrintData* data)
+wxWindowsPrintDialog::wxWindowsPrintDialog(wxWindow *p, wxPrintData* data)
 {
     wxPrintDialogData data2;
     if ( data )
@@ -88,47 +539,55 @@ wxPrintDialog::wxPrintDialog(wxWindow *p, wxPrintData* data)
     Create(p, &data2);
 }
 
-bool wxPrintDialog::Create(wxWindow *p, wxPrintDialogData* data)
+bool wxWindowsPrintDialog::Create(wxWindow *p, wxPrintDialogData* data)
 {
     m_dialogParent = p;
     m_printerDC = NULL;
-    m_destroyDC = TRUE;
+    m_destroyDC = true;
+
+    // MSW handle
+    m_printDlg = NULL;
 
     if ( data )
         m_printDialogData = *data;
 
-    m_printDialogData.SetOwnerWindow(p);
-
-    return TRUE;
+    return true;
 }
 
-wxPrintDialog::~wxPrintDialog()
+wxWindowsPrintDialog::~wxWindowsPrintDialog()
 {
+    PRINTDLG *pd = (PRINTDLG *) m_printDlg;
+    if (pd && pd->hDevMode)
+        GlobalFree(pd->hDevMode);
+    if ( pd )
+        delete pd;
+
     if (m_destroyDC && m_printerDC)
         delete m_printerDC;
 }
 
-int wxPrintDialog::ShowModal()
+int wxWindowsPrintDialog::ShowModal()
 {
-    m_printDialogData.ConvertToNative();
+    ConvertToNative( m_printDialogData );
+
+    PRINTDLG *pd = (PRINTDLG*) m_printDlg;
 
-    PRINTDLG* p = (PRINTDLG *)m_printDialogData.GetNativeData() ;
     if (m_dialogParent)
-        p->hwndOwner = (HWND) m_dialogParent->GetHWND();
+        pd->hwndOwner = (HWND) m_dialogParent->GetHWND();
     else if (wxTheApp->GetTopWindow())
-        p->hwndOwner = (HWND) wxTheApp->GetTopWindow()->GetHWND();
+        pd->hwndOwner = (HWND) wxTheApp->GetTopWindow()->GetHWND();
     else
-        p->hwndOwner = 0;
+        pd->hwndOwner = 0;
 
-    bool ret = (PrintDlg( p ) != 0);
+    bool ret = (PrintDlg( pd ) != 0);
 
-    p->hwndOwner = 0;
+    pd->hwndOwner = 0;
 
-    if ( ret != FALSE && ((PRINTDLG *)m_printDialogData.GetNativeData())->hDC)
+    if ( ret != false && (pd->hDC) )
     {
-        wxPrinterDC *pdc = new wxPrinterDC((WXHDC) ((PRINTDLG *)m_printDialogData.GetNativeData())->hDC);
+        wxPrinterDC *pdc = new wxPrinterDC( (WXHDC) pd->hDC );
         m_printerDC = pdc;
-        m_printDialogData.ConvertFromNative();
+        ConvertFromNative( m_printDialogData );
         return wxID_OK;
     }
     else
@@ -137,75 +596,398 @@ int wxPrintDialog::ShowModal()
     }
 }
 
-wxDC *wxPrintDialog::GetPrintDC()
+wxDC *wxWindowsPrintDialog::GetPrintDC()
 {
     if (m_printerDC)
     {
-        m_destroyDC = FALSE;
+        m_destroyDC = false;
         return m_printerDC;
     }
     else
         return (wxDC*) NULL;
 }
 
+bool wxWindowsPrintDialog::ConvertToNative( wxPrintDialogData &data )
+{
+    wxWindowsPrintNativeData *native_data =
+        (wxWindowsPrintNativeData *) data.GetPrintData().GetNativeData();
+    data.GetPrintData().ConvertToNative();
+
+    PRINTDLG *pd = (PRINTDLG*) m_printDlg;
+
+    // Shouldn't have been defined anywhere
+    if (pd)
+        return false;
+
+    pd = new PRINTDLG;
+    memset( pd, 0, sizeof(PRINTDLG) );
+    m_printDlg = (void*) pd;
+
+    // GNU-WIN32 has the wrong size PRINTDLG - can't work out why.
+#ifdef __GNUWIN32__
+    pd->lStructSize    = 66;
+#else
+    pd->lStructSize    = sizeof(PRINTDLG);
+#endif
+    pd->hwndOwner      = (HWND)NULL;
+    pd->hDevMode       = NULL; // Will be created by PrintDlg
+    pd->hDevNames      = NULL; // Ditto
+
+    pd->Flags          = PD_RETURNDEFAULT;
+    pd->nCopies        = 1;
+
+    // Pass the devmode data to the PRINTDLG structure, since it'll
+    // be needed when PrintDlg is called.
+    if (pd->hDevMode)
+        GlobalFree(pd->hDevMode);
+
+    // Pass the devnames data to the PRINTDLG structure, since it'll
+    // be needed when PrintDlg is called.
+    if (pd->hDevNames)
+        GlobalFree(pd->hDevNames);
+
+    pd->hDevMode = (HGLOBAL)(DWORD) native_data->GetDevMode();
+    native_data->SetDevMode( (void*) NULL);
+
+    // 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) native_data->GetDevNames();
+    native_data->SetDevNames( (void*) NULL);
+
+
+    pd->hDC = (HDC) NULL;
+    pd->nFromPage = (WORD)data.GetFromPage();
+    pd->nToPage = (WORD)data.GetToPage();
+    pd->nMinPage = (WORD)data.GetMinPage();
+    pd->nMaxPage = (WORD)data.GetMaxPage();
+    pd->nCopies = (WORD)data.GetNoCopies();
+
+    pd->Flags = PD_RETURNDC;
+
+#ifdef __GNUWIN32__
+    pd->lStructSize = 66;
+#else
+    pd->lStructSize = sizeof( PRINTDLG );
+#endif
+
+    pd->hwndOwner=(HWND)NULL;
+//    pd->hDevNames=(HANDLE)NULL;
+    pd->hInstance=(HINSTANCE)NULL;
+    pd->lCustData = (LPARAM) NULL;
+    pd->lpfnPrintHook = NULL;
+    pd->lpfnSetupHook = NULL;
+    pd->lpPrintTemplateName = NULL;
+    pd->lpSetupTemplateName = NULL;
+    pd->hPrintTemplate = (HGLOBAL) NULL;
+    pd->hSetupTemplate = (HGLOBAL) NULL;
+
+    if ( data.GetAllPages() )
+        pd->Flags |= PD_ALLPAGES;
+    if ( data.GetSelection() )
+        pd->Flags |= PD_SELECTION;
+    if ( data.GetCollate() )
+        pd->Flags |= PD_COLLATE;
+    if ( data.GetPrintToFile() )
+        pd->Flags |= PD_PRINTTOFILE;
+    if ( !data.GetEnablePrintToFile() )
+        pd->Flags |= PD_DISABLEPRINTTOFILE;
+    if ( !data.GetEnableSelection() )
+        pd->Flags |= PD_NOSELECTION;
+    if ( !data.GetEnablePageNumbers() )
+        pd->Flags |= PD_NOPAGENUMS;
+    else if ( (!data.GetAllPages()) && (!data.GetSelection()) && (data.GetFromPage() != 0) && (data.GetToPage() != 0))
+        pd->Flags |= PD_PAGENUMS;
+    if ( data.GetEnableHelp() )
+        pd->Flags |= PD_SHOWHELP;
+#if WXWIN_COMPATIBILITY_2_4
+    if ( data.GetSetupDialog() )
+        pd->Flags |= PD_PRINTSETUP;
+#endif
+
+    return true;
+}
+
+bool wxWindowsPrintDialog::ConvertFromNative( wxPrintDialogData &data )
+{
+    PRINTDLG *pd = (PRINTDLG*) m_printDlg;
+    if ( pd == NULL )
+        return false;
+
+    wxWindowsPrintNativeData *native_data =
+        (wxWindowsPrintNativeData *) data.GetPrintData().GetNativeData();
+
+    // Pass the devmode data back to the wxPrintData structure where it really belongs.
+    if (pd->hDevMode)
+    {
+        if (native_data->GetDevMode())
+        {
+            // Make sure we don't leak memory
+            GlobalFree( (HGLOBAL)(DWORD) native_data->GetDevMode() );
+        }
+        native_data->SetDevMode( (void*)(long) pd->hDevMode );
+        pd->hDevMode = NULL;
+    }
+
+    // Pass the devnames data back to the wxPrintData structure where it really belongs.
+    if (pd->hDevNames)
+    {
+        if (native_data->GetDevNames())
+        {
+            // Make sure we don't leak memory
+            GlobalFree((HGLOBAL)(DWORD) native_data->GetDevNames());
+        }
+        native_data->SetDevNames((void*)(long) pd->hDevNames);
+        pd->hDevNames = NULL;
+    }
+
+    // Now convert the DEVMODE object, passed down from the PRINTDLG object,
+    // into wxWidgets form.
+    native_data->TransferTo( data.GetPrintData() );
+
+    data.SetFromPage( pd->nFromPage );
+    data.SetToPage( pd->nToPage );
+    data.SetMinPage( pd->nMinPage );
+    data.SetMaxPage( pd->nMaxPage );
+    data.SetNoCopies( pd->nCopies );
+
+    data.SetAllPages( (((pd->Flags & PD_PAGENUMS) != PD_PAGENUMS) && ((pd->Flags & PD_SELECTION) != PD_SELECTION)) );
+    data.SetSelection( ((pd->Flags & PD_SELECTION) == PD_SELECTION) );
+    data.SetCollate( ((pd->Flags & PD_COLLATE) == PD_COLLATE) );
+    data.SetPrintToFile( ((pd->Flags & PD_PRINTTOFILE) == PD_PRINTTOFILE) );
+    data.EnablePrintToFile( ((pd->Flags & PD_DISABLEPRINTTOFILE) != PD_DISABLEPRINTTOFILE) );
+    data.EnableSelection( ((pd->Flags & PD_NOSELECTION) != PD_NOSELECTION) );
+    data.EnablePageNumbers( ((pd->Flags & PD_NOPAGENUMS) != PD_NOPAGENUMS) );
+    data.EnableHelp( ((pd->Flags & PD_SHOWHELP) == PD_SHOWHELP) );
+#if WXWIN_COMPATIBILITY_2_4
+    data.SetSetupDialog( ((pd->Flags & PD_PRINTSETUP) == PD_PRINTSETUP) );
+#endif
+    return true;
+}
+
 // ---------------------------------------------------------------------------
-// wxPageSetupDialog
+// wxWidnowsPageSetupDialog
 // ---------------------------------------------------------------------------
 
-wxPageSetupDialog::wxPageSetupDialog()
+IMPLEMENT_CLASS(wxWindowsPageSetupDialog, wxPageSetupDialogBase)
+
+wxWindowsPageSetupDialog::wxWindowsPageSetupDialog()
 {
     m_dialogParent = NULL;
+    m_pageDlg = NULL;
 }
 
-wxPageSetupDialog::wxPageSetupDialog(wxWindow *p, wxPageSetupData *data)
+wxWindowsPageSetupDialog::wxWindowsPageSetupDialog(wxWindow *p, wxPageSetupDialogData *data)
 {
     Create(p, data);
 }
 
-bool wxPageSetupDialog::Create(wxWindow *p, wxPageSetupData *data)
+bool wxWindowsPageSetupDialog::Create(wxWindow *p, wxPageSetupDialogData *data)
 {
     m_dialogParent = p;
+    m_pageDlg = NULL;
 
     if (data)
         m_pageSetupData = (*data);
 
-#if defined(__WIN95__)
-    m_pageSetupData.SetOwnerWindow(p);
-#endif
-    return TRUE;
+    return true;
 }
 
-wxPageSetupDialog::~wxPageSetupDialog()
+wxWindowsPageSetupDialog::~wxWindowsPageSetupDialog()
 {
+    PAGESETUPDLG *pd = (PAGESETUPDLG *)m_pageDlg;
+    if ( pd && pd->hDevMode )
+        GlobalFree(pd->hDevMode);
+    if ( pd && pd->hDevNames )
+        GlobalFree(pd->hDevNames);
+    if ( pd )
+        delete pd;
 }
 
-int wxPageSetupDialog::ShowModal()
+int wxWindowsPageSetupDialog::ShowModal()
 {
-#ifdef __WIN95__
-    m_pageSetupData.ConvertToNative();
-    PAGESETUPDLG *p = (PAGESETUPDLG *)m_pageSetupData.GetNativeData();
+    ConvertToNative( m_pageSetupData );
+
+    PAGESETUPDLG *pd = (PAGESETUPDLG *) m_pageDlg;
     if (m_dialogParent)
-        p->hwndOwner = (HWND) m_dialogParent->GetHWND();
+        pd->hwndOwner = (HWND) m_dialogParent->GetHWND();
     else if (wxTheApp->GetTopWindow())
-        p->hwndOwner = (HWND) wxTheApp->GetTopWindow()->GetHWND();
+        pd->hwndOwner = (HWND) wxTheApp->GetTopWindow()->GetHWND();
     else
-        p->hwndOwner = 0;
-    BOOL retVal = PageSetupDlg( p ) ;
-    p->hwndOwner = 0;
+        pd->hwndOwner = 0;
+    BOOL retVal = PageSetupDlg( pd ) ;
+    pd->hwndOwner = 0;
     if (retVal)
     {
-        m_pageSetupData.ConvertFromNative();
+        ConvertFromNative( m_pageSetupData );
         return wxID_OK;
     }
     else
         return wxID_CANCEL;
-#else
-    wxGenericPageSetupDialog *genericPageSetupDialog = new wxGenericPageSetupDialog(GetParent(), & m_pageSetupData);
-    int ret = genericPageSetupDialog->ShowModal();
-    m_pageSetupData = genericPageSetupDialog->GetPageSetupData();
-    genericPageSetupDialog->Close(TRUE);
-    return ret;
-#endif
+}
+
+bool wxWindowsPageSetupDialog::ConvertToNative( wxPageSetupDialogData &data )
+{
+    wxWindowsPrintNativeData *native_data =
+        (wxWindowsPrintNativeData *) data.GetPrintData().GetNativeData();
+    data.GetPrintData().ConvertToNative();
+
+    PAGESETUPDLG *pd = (PAGESETUPDLG*) m_pageDlg;
+
+    // Shouldn't have been defined anywhere
+    if (pd)
+        return false;
+
+    pd = new PAGESETUPDLG;
+    pd->hDevMode = NULL;
+    pd->hDevNames = NULL;
+    m_pageDlg = (void *)pd;
+
+    // Pass the devmode data (created in m_printData.ConvertToNative)
+    // to the PRINTDLG structure, since it'll
+    // be needed when PrintDlg is called.
+
+    if (pd->hDevMode)
+    {
+        GlobalFree(pd->hDevMode);
+        pd->hDevMode = NULL;
+    }
+    pd->hDevMode = (HGLOBAL) native_data->GetDevMode();
+    native_data->SetDevMode( (void*) NULL );
+
+    // Shouldn't assert; we should be able to test Ok-ness at a higher level
+    //wxASSERT_MSG( (pd->hDevMode), wxT("hDevMode must be non-NULL in ConvertToNative!"));
+
+    // Pass the devnames data (created in m_printData.ConvertToNative)
+    // to the PRINTDLG structure, since it'll
+    // be needed when PrintDlg is called.
+
+    if (pd->hDevNames)
+    {
+        GlobalFree(pd->hDevNames);
+        pd->hDevNames = NULL;
+    }
+    pd->hDevNames = (HGLOBAL) native_data->GetDevNames();
+    native_data->SetDevNames((void*) NULL);
+
+//        pd->hDevMode = GlobalAlloc(GMEM_MOVEABLE, sizeof(DEVMODE));
+
+    pd->Flags = PSD_MARGINS|PSD_MINMARGINS;
+
+    if ( data.GetDefaultMinMargins() )
+        pd->Flags |= PSD_DEFAULTMINMARGINS;
+    if ( !data.GetEnableMargins() )
+        pd->Flags |= PSD_DISABLEMARGINS;
+    if ( !data.GetEnableOrientation() )
+        pd->Flags |= PSD_DISABLEORIENTATION;
+    if ( !data.GetEnablePaper() )
+        pd->Flags |= PSD_DISABLEPAPER;
+    if ( !data.GetEnablePrinter() )
+        pd->Flags |= PSD_DISABLEPRINTER;
+    if ( data.GetDefaultInfo() )
+        pd->Flags |= PSD_RETURNDEFAULT;
+    if ( data.GetEnableHelp() )
+        pd->Flags |= PSD_SHOWHELP;
+
+    // We want the units to be in hundredths of a millimetre
+    pd->Flags |= PSD_INHUNDREDTHSOFMILLIMETERS;
+
+    pd->lStructSize = sizeof( PAGESETUPDLG );
+    pd->hwndOwner=(HWND)NULL;
+//    pd->hDevNames=(HWND)NULL;
+    pd->hInstance=(HINSTANCE)NULL;
+    //   PAGESETUPDLG is in hundreds of a mm
+    pd->ptPaperSize.x = data.GetPaperSize().x * 100;
+    pd->ptPaperSize.y = data.GetPaperSize().y * 100;
+
+    pd->rtMinMargin.left = data.GetMinMarginTopLeft().x * 100;
+    pd->rtMinMargin.top = data.GetMinMarginTopLeft().y * 100;
+    pd->rtMinMargin.right = data.GetMinMarginBottomRight().x * 100;
+    pd->rtMinMargin.bottom = data.GetMinMarginBottomRight().y * 100;
+
+    pd->rtMargin.left = data.GetMarginTopLeft().x * 100;
+    pd->rtMargin.top = data.GetMarginTopLeft().y * 100;
+    pd->rtMargin.right = data.GetMarginBottomRight().x * 100;
+    pd->rtMargin.bottom = data.GetMarginBottomRight().y * 100;
+
+    pd->lCustData = 0;
+    pd->lpfnPageSetupHook = NULL;
+    pd->lpfnPagePaintHook = NULL;
+    pd->hPageSetupTemplate = NULL;
+    pd->lpPageSetupTemplateName = NULL;
+
+/*
+    if ( pd->hDevMode )
+    {
+        DEVMODE *devMode = (DEVMODE*) GlobalLock(pd->hDevMode);
+        memset(devMode, 0, sizeof(DEVMODE));
+        devMode->dmSize = sizeof(DEVMODE);
+        devMode->dmOrientation = m_orientation;
+        devMode->dmFields = DM_ORIENTATION;
+        GlobalUnlock(pd->hDevMode);
+    }
+*/
+    return true;
+}
+
+bool wxWindowsPageSetupDialog::ConvertFromNative( wxPageSetupDialogData &data )
+{
+    PAGESETUPDLG *pd = (PAGESETUPDLG *) m_pageDlg;
+    if ( !pd )
+        return false;
+
+    wxWindowsPrintNativeData *native_data =
+        (wxWindowsPrintNativeData *) data.GetPrintData().GetNativeData();
+
+    // Pass the devmode data back to the wxPrintData structure where it really belongs.
+    if (pd->hDevMode)
+    {
+        if (native_data->GetDevMode())
+        {
+            // Make sure we don't leak memory
+            GlobalFree((HGLOBAL) native_data->GetDevMode());
+        }
+        native_data->SetDevMode( (void*) pd->hDevMode );
+        pd->hDevMode = NULL;
+    }
+
+    // Isn't this superfluous? It's called again below.
+    // data.GetPrintData().ConvertFromNative();
+
+    // Pass the devnames data back to the wxPrintData structure where it really belongs.
+    if (pd->hDevNames)
+    {
+        if (native_data->GetDevNames())
+        {
+            // Make sure we don't leak memory
+            GlobalFree((HGLOBAL) native_data->GetDevNames());
+        }
+        native_data->SetDevNames((void*) pd->hDevNames);
+        pd->hDevNames = NULL;
+    }
+
+    data.GetPrintData().ConvertFromNative();
+
+    pd->Flags = PSD_MARGINS|PSD_MINMARGINS;
+
+    data.SetDefaultMinMargins( ((pd->Flags & PSD_DEFAULTMINMARGINS) == PSD_DEFAULTMINMARGINS) );
+    data.EnableMargins( ((pd->Flags & PSD_DISABLEMARGINS) != PSD_DISABLEMARGINS) );
+    data.EnableOrientation( ((pd->Flags & PSD_DISABLEORIENTATION) != PSD_DISABLEORIENTATION) );
+    data.EnablePaper( ((pd->Flags & PSD_DISABLEPAPER) != PSD_DISABLEPAPER) );
+    data.EnablePrinter( ((pd->Flags & PSD_DISABLEPRINTER) != PSD_DISABLEPRINTER) );
+    data.SetDefaultInfo( ((pd->Flags & PSD_RETURNDEFAULT) == PSD_RETURNDEFAULT) );
+    data.EnableHelp( ((pd->Flags & PSD_SHOWHELP) == PSD_SHOWHELP) );
+
+    //   PAGESETUPDLG is in hundreds of a mm
+    data.SetPaperSize( wxSize(pd->ptPaperSize.x / 100, pd->ptPaperSize.y / 100) );
+
+    data.SetMinMarginTopLeft( wxPoint(pd->rtMinMargin.left / 100, pd->rtMinMargin.top / 100) );
+    data.SetMinMarginBottomRight( wxPoint(pd->rtMinMargin.right / 100, pd->rtMinMargin.bottom / 100) );
+
+    data.SetMarginTopLeft( wxPoint(pd->rtMargin.left / 100, pd->rtMargin.top / 100) );
+    data.SetMarginBottomRight( wxPoint(pd->rtMargin.right / 100, pd->rtMargin.bottom / 100) );
+
+    return true;
 }
 
 #endif