don't set minimal column width, it should be possible to set it even to 0 if desired...

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

diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp
index 61cf2f3a548984bd82cf46abe25ff348d5c504fb..c7b4dbf77befc3a467f481de6967cd7470ca0071 100644 (file)
--- a/src/common/cmndata.cpp
+++ b/src/common/cmndata.cpp
@@ -5,467 +5,647 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

-// Copyright:   (c) Julian Smart and Markus Holzem
+// Copyright:   (c) Julian Smart

 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 

-#ifdef __GNUG__
-#pragma implementation "cmndata.h"
-#endif
+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------

 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 
 // For compilers that support precompilation, includes "wx.h".
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-#include <stdio.h>
-#include "wx/string.h"
-#include "wx/utils.h"
-#include "wx/app.h"
+    #include <stdio.h>
+    #include "wx/string.h"
+    #include "wx/utils.h"
+    #include "wx/app.h"

 #endif
 
 #include "wx/gdicmn.h"
 #include "wx/cmndata.h"
 #endif
 
 #include "wx/gdicmn.h"
 #include "wx/cmndata.h"

+#include "wx/log.h"
+#include "wx/prntbase.h"
+#include "wx/printdlg.h"

 
 

-#ifdef __WXMSW__
-#include <windows.h>
+#if wxUSE_FONTDLG
+    #include "wx/fontdlg.h"
+#endif // wxUSE_FONTDLG

 
 

-#ifndef __WIN32__
-#include <print.h>
-#include <commdlg.h>
-#endif
-#endif
+#if wxUSE_PRINTING_ARCHITECTURE
+    #include "wx/paper.h"
+#endif // wxUSE_PRINTING_ARCHITECTURE
+
+#if defined(__WXMSW__)
+    #include "wx/msw/wrapcdlg.h"
+#endif // MSW

 
 

-#if !USE_SHARED_LIBRARY
-IMPLEMENT_DYNAMIC_CLASS(wxPrintData, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxPageSetupData, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxFontData, wxObject)
-IMPLEMENT_DYNAMIC_CLASS(wxColourData, wxObject)
+    #if wxUSE_PRINTING_ARCHITECTURE
+
+#if defined(__WXMAC__)
+    #include "wx/mac/private/print.h"

 #endif
 
 #endif
 

-/*
- * wxColourData
- */
+        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)
+
+// ============================================================================
+// implementation
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// wxColourData
+// ----------------------------------------------------------------------------

 
 wxColourData::wxColourData()
 {
 
 wxColourData::wxColourData()
 {

-  int i;
-  for (i = 0; i < 16; i++)
-    custColours[i].Set(255, 255, 255);
+    m_chooseFull = false;
+    m_dataColour.Set(0,0,0);
+    // m_custColours are wxNullColours initially
+}

 
 

-  chooseFull = FALSE;
-  dataColour.Set(0,0,0);
+wxColourData::wxColourData(const wxColourData& data)
+    : wxObject()
+{
+    (*this) = data;

 }
 
 wxColourData::~wxColourData()
 {
 }
 
 }
 
 wxColourData::~wxColourData()
 {
 }
 

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

 {
 {

-  if (i > 15 || i < 0)
-    return;
+    wxCHECK_RET( (i >= 0 && i < 16), _T("custom colour index out of range") );

 
 

-  custColours[i] = colour;
+    m_custColours[i] = colour;

 }
 
 wxColour wxColourData::GetCustomColour(int i)
 {
 }
 
 wxColour wxColourData::GetCustomColour(int i)
 {

-  if (i > 15 || i < 0)
-    return wxColour(0,0,0);
+    wxCHECK_MSG( (i >= 0 && i < 16), wxColour(0,0,0),
+                 _T("custom colour index out of range") );

 
 

-  return custColours[i];
+    return m_custColours[i];

 }
 
 void wxColourData::operator=(const wxColourData& data)
 {
 }
 
 void wxColourData::operator=(const wxColourData& data)
 {

-  int i;
-  for (i = 0; i < 16; i++)
-    custColours[i] = data.custColours[i];
+    int i;
+    for (i = 0; i < 16; i++)
+        m_custColours[i] = data.m_custColours[i];

 
 

-  dataColour = (wxColour&)data.dataColour;
-  chooseFull = data.chooseFull;
+    m_dataColour = (wxColour&)data.m_dataColour;
+    m_chooseFull = data.m_chooseFull;

 }
 
 }
 

-/*
- * Font data
- */
+// ----------------------------------------------------------------------------
+// Font data
+// ----------------------------------------------------------------------------

 
 wxFontData::wxFontData()
 {
 
 wxFontData::wxFontData()
 {

-  // Intialize colour to black.
-  fontColour.Set(0, 0, 0);
+    // Intialize colour to black.
+    m_fontColour = wxNullColour;
+
+    m_showHelp = false;
+    m_allowSymbols = true;
+    m_enableEffects = true;
+    m_minSize = 0;
+    m_maxSize = 0;

 
 

-  showHelp = FALSE;
-  allowSymbols = TRUE;
-  enableEffects = TRUE;
-  minSize = 0;
-  maxSize = 0;
+    m_encoding = wxFONTENCODING_SYSTEM;

 }
 
 wxFontData::~wxFontData()
 {
 }
 
 }
 
 wxFontData::~wxFontData()
 {
 }
 

-void wxFontData::operator=(const wxFontData& data)
+#if wxUSE_FONTDLG
+
+wxFontDialogBase::~wxFontDialogBase()

 {
 {

-   fontColour = data.fontColour;
-   showHelp = data.showHelp;
-   allowSymbols = data.allowSymbols;
-   enableEffects = data.enableEffects;
-   initialFont = data.initialFont;
-   chosenFont = data.chosenFont;
-   minSize = data.minSize;
-   maxSize = data.maxSize;

 }
 
 }
 

-/*
- * Print data
- */
+#endif // wxUSE_FONTDLG
+
+#if wxUSE_PRINTING_ARCHITECTURE
+// ----------------------------------------------------------------------------
+// Print data
+// ----------------------------------------------------------------------------

 
 wxPrintData::wxPrintData()
 {
 
 wxPrintData::wxPrintData()
 {

-#ifdef __WXMSW__
-    printData = NULL;
-#endif
-    printOrientation = wxPORTRAIT;
-    printFromPage = 0;
-    printToPage = 0;
-    printMinPage = 0;
-    printMaxPage = 0;
-    printNoCopies = 1;
-    printAllPages = FALSE;
-    printCollate = FALSE;
-    printToFile = FALSE;
-    printEnableSelection = FALSE;
-    printEnablePageNumbers = TRUE;
-    printEnablePrintToFile = TRUE;
-    printEnableHelp = FALSE;
-    printSetupDialog = FALSE;
+    m_bin = wxPRINTBIN_DEFAULT;
+    m_printMode = wxPRINT_MODE_PRINTER;
+    m_printOrientation = wxPORTRAIT;
+    m_printNoCopies = 1;
+    m_printCollate = false;
+
+    // New, 24/3/99
+    m_printerName = wxEmptyString;
+    m_colour = true;
+    m_duplexMode = wxDUPLEX_SIMPLEX;
+    m_printQuality = wxPRINT_QUALITY_HIGH;
+    m_paperId = wxPAPER_A4;
+    m_paperSize = wxSize(210, 297);
+
+    m_privData = NULL;
+    m_privDataLen = 0;
+
+    m_nativeData = wxPrintFactory::GetFactory()->CreatePrintNativeData();

 }
 
 }
 

-wxPrintData::~wxPrintData()
+wxPrintData::wxPrintData(const wxPrintData& printData)
+    : wxObject()

 {
 {

-#ifdef __WXMSW__
-    PRINTDLG *pd = (PRINTDLG *)printData;
-    if ( pd && pd->hDevMode )
-        GlobalFree(pd->hDevMode);
-    if ( pd )
-        delete pd;
-#endif
+    m_nativeData = NULL;
+    m_privData = NULL;
+    (*this) = printData;

 }
 
 }
 

-#ifdef __WXMSW__
-void wxPrintData::ConvertToNative()
+void wxPrintData::SetPrivData( char *privData, int len )

 {
 {

-    PRINTDLG *pd = (PRINTDLG*) printData;
-    if ( pd == NULL )
+    if (m_privData)

     {
     {

-        pd = new PRINTDLG;
-        printData = (void*) pd;
-
-        // GNU-WIN32 has the wrong size PRINTDLG - can't work out why.
-//        pd->lStructSize    = sizeof(PRINTDLG);
-        pd->lStructSize    = 66 ;
-        pd->hwndOwner      = (HWND)NULL;
-        pd->hDevMode       = NULL; // Will be created by PrintDlg
-        pd->hDevNames      = NULL; // Ditto
-
-        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;
-        }
-        else
-        {
-            if ( pd->hDevNames )
-                GlobalFree(pd->hDevNames);
-            pd->hDevNames = NULL;
-        }
+        delete [] m_privData;
+        m_privData = NULL;

     }
     }

-
-    if ( pd->hDevMode )
+    m_privDataLen = len;
+    if (m_privDataLen > 0)

     {
     {

-        DEVMODE *devMode = (DEVMODE*) GlobalLock(pd->hDevMode);
-        devMode->dmOrientation = printOrientation;
-        devMode->dmFields = DM_ORIENTATION;
-        GlobalUnlock(pd->hDevMode);
+        m_privData = new char[m_privDataLen];
+        memcpy( m_privData, privData, m_privDataLen );

     }
     }

-    pd->hDC = (HDC) NULL;
-    pd->nFromPage = (UINT)printFromPage;
-    pd->nToPage = (UINT)printToPage;
-    pd->nMinPage = (UINT)printMinPage;
-    pd->nMaxPage = (UINT)printMaxPage;
-    pd->nCopies = (UINT)printNoCopies;
-
-    pd->Flags = PD_RETURNDC ;
-//    pd->lStructSize = sizeof( PRINTDLG );
-    pd->lStructSize = 66 ;
-    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 ( printAllPages )
-        pd->Flags |= PD_ALLPAGES;
-    if ( printCollate )
-        pd->Flags |= PD_COLLATE;
-    if ( printToFile )
-        pd->Flags |= PD_PRINTTOFILE;
-    if ( !printEnablePrintToFile )
-        pd->Flags |= PD_DISABLEPRINTTOFILE;
-    if ( !printEnableSelection )
-      pd->Flags |= PD_NOSELECTION;
-    if ( !printEnablePageNumbers )
-      pd->Flags |= PD_NOPAGENUMS;
-    if ( printEnableHelp )
-      pd->Flags |= PD_SHOWHELP;
-    if ( printSetupDialog )
-      pd->Flags |= PD_PRINTSETUP;
+}
+
+wxPrintData::~wxPrintData()
+{
+    m_nativeData->m_ref--;
+    if (m_nativeData->m_ref == 0)
+        delete m_nativeData;
+
+    if (m_privData)
+        delete [] m_privData;
+}
+
+void wxPrintData::ConvertToNative()
+{
+    m_nativeData->TransferFrom( *this ) ;

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

-    PRINTDLG *pd = (PRINTDLG*) printData;
-    if ( pd == NULL )
-        return;
+    m_nativeData->TransferTo( *this ) ;
+}

 
 

-    if ( pd->hDevMode )
+void wxPrintData::operator=(const wxPrintData& data)
+{
+    m_printNoCopies = data.m_printNoCopies;
+    m_printCollate = data.m_printCollate;
+    m_printOrientation = data.m_printOrientation;
+    m_printerName = data.m_printerName;
+    m_colour = data.m_colour;
+    m_duplexMode = data.m_duplexMode;
+    m_printQuality = data.m_printQuality;
+    m_paperId = data.m_paperId;
+    m_paperSize = data.m_paperSize;
+    m_bin = data.m_bin;
+    m_printMode = data.m_printMode;
+    m_filename = data.m_filename;
+
+    // UnRef old m_nativeData
+    if (m_nativeData)

     {
     {

-        DEVMODE *devMode = (DEVMODE*) GlobalLock(pd->hDevMode);
-        printOrientation = devMode->dmOrientation;
-        GlobalUnlock(pd->hDevMode);
+        m_nativeData->m_ref--;
+        if (m_nativeData->m_ref == 0)
+            delete m_nativeData;

     }
     }

-    printFromPage = pd->nFromPage ;
-    printToPage = pd->nToPage ;
-    printMinPage = pd->nMinPage ;
-    printMaxPage = pd->nMaxPage ;
-    printNoCopies = pd->nCopies ;
+    // Set Ref new one
+    m_nativeData = data.GetNativeData();
+    m_nativeData->m_ref++;

 
 

-    printAllPages = ((pd->Flags & PD_ALLPAGES) == PD_ALLPAGES);
-    printCollate = ((pd->Flags & PD_COLLATE) == PD_COLLATE);
-    printToFile = ((pd->Flags & PD_PRINTTOFILE) == PD_PRINTTOFILE);
-    printEnablePrintToFile = ((pd->Flags & PD_DISABLEPRINTTOFILE) != PD_DISABLEPRINTTOFILE);
-    printEnableSelection = ((pd->Flags & PD_NOSELECTION) != PD_NOSELECTION);
-    printEnablePageNumbers = ((pd->Flags & PD_NOPAGENUMS) != PD_NOPAGENUMS);
-    printEnableHelp = ((pd->Flags & PD_SHOWHELP) == PD_SHOWHELP);
-    printSetupDialog = ((pd->Flags & PD_PRINTSETUP) == PD_PRINTSETUP);
+    if (m_privData)
+    {
+        delete [] m_privData;
+        m_privData = NULL;
+    }
+    m_privDataLen = data.GetPrivDataLen();
+    if (m_privDataLen > 0)
+    {
+        m_privData = new char[m_privDataLen];
+        memcpy( m_privData, data.GetPrivData(), m_privDataLen );
+    }

 }
 
 }
 

-void wxPrintData::SetOwnerWindow(wxWindow* win)
+// Is this data OK for showing the print dialog?
+bool wxPrintData::Ok() const

 {
 {

-    if ( printData == NULL )
-        ConvertToNative();
+    m_nativeData->TransferFrom( *this );

 
 

-    if ( printData != NULL && win != NULL)
-    {
-      PRINTDLG *pd = (PRINTDLG *) printData ;
-      pd->hwndOwner=(HWND) win->GetHWND();
-    }
+    return m_nativeData->Ok();

 }
 }

+
+// What should happen here?  wxPostScriptPrintNativeData is not
+// defined unless all this is true on MSW.
+#if WXWIN_COMPATIBILITY_2_4 && wxUSE_PRINTING_ARCHITECTURE && (!defined(__WXMSW__) || wxUSE_POSTSCRIPT_ARCHITECTURE_IN_MSW)
+
+#include "wx/generic/prntdlgg.h"
+
+#if wxUSE_POSTSCRIPT
+    #define WXUNUSED_WITHOUT_PS(name) name
+#else
+    #define WXUNUSED_WITHOUT_PS(name) WXUNUSED(name)

 #endif
 
 #endif
 

-void wxPrintData::operator=(const wxPrintData& data)
+wxString wxPrintData::GetPrinterCommand() const

 {
 {

-    printFromPage = data.printFromPage;
-    printToPage = data.printToPage;
-    printMinPage = data.printMinPage;
-    printMaxPage = data.printMaxPage;
-    printNoCopies = data.printNoCopies;
-    printAllPages = data.printAllPages;
-    printCollate = data.printCollate;
-    printToFile = data.printToFile;
-    printEnableSelection = data.printEnableSelection;
-    printEnablePageNumbers = data.printEnablePageNumbers;
-    printEnableHelp = data.printEnableHelp;
-    printEnablePrintToFile = data.printEnablePrintToFile;
-    printSetupDialog = data.printSetupDialog;
-    printOrientation = data.printOrientation;
-}
-
-/*
- * wxPageSetupData
- */
-
-wxPageSetupData::wxPageSetupData()
-{
-#if defined(__WIN95__)
-  m_pageSetupData = NULL;
+#if wxUSE_POSTSCRIPT
+    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
+        return ((wxPostScriptPrintNativeData*)m_nativeData)->GetPrinterCommand();

 #endif
 #endif

-  m_paperSize = wxPoint(0, 0);
-  m_minMarginTopLeft = wxPoint(0, 0);
-  m_minMarginBottomRight = wxPoint(0, 0);
-  m_marginTopLeft = wxPoint(0, 0);
-  m_marginBottomRight = wxPoint(0, 0);
-  m_orientation = wxPORTRAIT;
-
-  // Flags
-  m_defaultMinMargins = FALSE;
-  m_enableMargins = TRUE;
-  m_enableOrientation = TRUE;
-  m_enablePaper = TRUE;
-  m_enablePrinter = TRUE;
-  m_enableHelp = FALSE;
-  m_getDefaultInfo = FALSE;
-}
-
-wxPageSetupData::~wxPageSetupData()
-{
-#if defined(__WIN95__) && defined(__WXMSW__)
-    PAGESETUPDLG *pd = (PAGESETUPDLG *)m_pageSetupData;
-    if ( pd && pd->hDevMode )
-        GlobalFree(pd->hDevMode);
-    if ( pd )
-        delete pd;
+    return wxEmptyString;
+}
+
+wxString wxPrintData::GetPrinterOptions() const
+{
+#if wxUSE_POSTSCRIPT
+    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
+        return ((wxPostScriptPrintNativeData*)m_nativeData)->GetPrinterOptions();

 #endif
 #endif

+    return wxEmptyString;

 }
 
 }
 

-void wxPageSetupData::operator=(const wxPageSetupData& data)
+wxString wxPrintData::GetPreviewCommand() const

 {
 {

-  m_paperSize = data.m_paperSize;
-  m_minMarginTopLeft = data.m_minMarginTopLeft;
-  m_minMarginBottomRight = data.m_minMarginBottomRight;
-  m_marginTopLeft = data.m_marginTopLeft;
-  m_marginBottomRight = data.m_marginBottomRight;
-  m_orientation = data.m_orientation;
+#if wxUSE_POSTSCRIPT
+    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
+        return ((wxPostScriptPrintNativeData*)m_nativeData)->GetPreviewCommand();
+#endif
+    return wxEmptyString;
+}

 
 

-  m_defaultMinMargins = data.m_defaultMinMargins;
-  m_enableMargins = data.m_enableMargins;
-  m_enableOrientation = data.m_enableOrientation;
-  m_enablePaper = data.m_enablePaper;
-  m_enablePrinter = data.m_enablePrinter;
-  m_getDefaultInfo = data.m_getDefaultInfo;;
-  m_enableHelp = data.m_enableHelp;
+wxString wxPrintData::GetFontMetricPath() const
+{
+#if wxUSE_POSTSCRIPT
+    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
+        return ((wxPostScriptPrintNativeData*)m_nativeData)->GetFontMetricPath();
+#endif
+    return wxEmptyString;

 }
 
 }
 

-#if defined(__WXMSW__) && defined(__WIN95__)
-void wxPageSetupData::ConvertToNative()
+double wxPrintData::GetPrinterScaleX() const

 {
 {

-    PAGESETUPDLG *pd = (PAGESETUPDLG*) m_pageSetupData;
-    if ( m_pageSetupData == NULL )
-    {
-      pd = new PAGESETUPDLG;
-      pd->hDevMode = GlobalAlloc(GMEM_MOVEABLE, sizeof(DEVMODE));
-      m_pageSetupData = (void *)pd;
-    }
+#if wxUSE_POSTSCRIPT
+    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
+        return ((wxPostScriptPrintNativeData*)m_nativeData)->GetPrinterScaleX();
+#endif
+    return 1.0;
+}

 
 

-    pd->Flags = PSD_MARGINS|PSD_MINMARGINS;
-
-    if ( m_defaultMinMargins )
-        pd->Flags |= PSD_DEFAULTMINMARGINS;
-    if ( !m_enableMargins )
-        pd->Flags |= PSD_DISABLEMARGINS;
-    if ( !m_enableOrientation )
-        pd->Flags |= PSD_DISABLEORIENTATION;
-    if ( !m_enablePaper )
-        pd->Flags |= PSD_DISABLEPAPER;
-    if ( !m_enablePrinter )
-        pd->Flags |= PSD_DISABLEPRINTER;
-    if ( m_getDefaultInfo )
-        pd->Flags |= PSD_RETURNDEFAULT;
-    if ( m_enableHelp )
-        pd->Flags |= PSD_SHOWHELP;
-
-    pd->lStructSize = sizeof( PAGESETUPDLG );
-    pd->hwndOwner=(HWND)NULL;
-    pd->hDevNames=(HWND)NULL;
-    pd->hInstance=(HINSTANCE)NULL;
-
-    pd->ptPaperSize.x = m_paperSize.x;
-    pd->ptPaperSize.y = m_paperSize.y;
-
-    pd->rtMinMargin.left = m_minMarginTopLeft.x;
-    pd->rtMinMargin.top = m_minMarginTopLeft.y;
-    pd->rtMinMargin.right = m_minMarginBottomRight.x;
-    pd->rtMinMargin.bottom = m_minMarginBottomRight.y;
-
-    pd->rtMargin.left = m_marginTopLeft.x;
-    pd->rtMargin.top = m_marginTopLeft.y;
-    pd->rtMargin.right = m_marginBottomRight.x;
-    pd->rtMargin.bottom = m_marginBottomRight.y;
-
-    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);
-    }
+double wxPrintData::GetPrinterScaleY() const
+{
+#if wxUSE_POSTSCRIPT
+    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
+        return ((wxPostScriptPrintNativeData*)m_nativeData)->GetPrinterScaleY();
+#endif
+    return 1.0;

 }
 
 }
 

-void wxPageSetupData::ConvertFromNative()
+long wxPrintData::GetPrinterTranslateX() const

 {
 {

-    PAGESETUPDLG *pd = (PAGESETUPDLG *) m_pageSetupData ;
-    if ( !pd )
-        return;
+#if wxUSE_POSTSCRIPT
+    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
+        return ((wxPostScriptPrintNativeData*)m_nativeData)->GetPrinterTranslateX();
+#endif
+    return 0;
+}

 
 

-    pd->Flags = PSD_MARGINS|PSD_MINMARGINS;
+long wxPrintData::GetPrinterTranslateY() const
+{
+#if wxUSE_POSTSCRIPT
+    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
+        return ((wxPostScriptPrintNativeData*)m_nativeData)->GetPrinterTranslateY();
+#endif
+    return 0;
+}

 
 

-    m_defaultMinMargins = ((pd->Flags & PSD_DEFAULTMINMARGINS) == PSD_DEFAULTMINMARGINS);
-    m_enableMargins = ((pd->Flags & PSD_DISABLEMARGINS) != PSD_DISABLEMARGINS);
-    m_enableOrientation = ((pd->Flags & PSD_DISABLEORIENTATION) != PSD_DISABLEORIENTATION);
-    m_enablePaper = ((pd->Flags & PSD_DISABLEPAPER) != PSD_DISABLEPAPER);
-    m_enablePrinter = ((pd->Flags & PSD_DISABLEPRINTER) != PSD_DISABLEPRINTER);
-    m_getDefaultInfo = ((pd->Flags & PSD_RETURNDEFAULT) == PSD_RETURNDEFAULT);
-    m_enableHelp = ((pd->Flags & PSD_SHOWHELP) == PSD_SHOWHELP);
+void wxPrintData::SetPrinterCommand(const wxString& WXUNUSED_WITHOUT_PS(command))
+{
+#if wxUSE_POSTSCRIPT
+    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
+        ((wxPostScriptPrintNativeData*)m_nativeData)->SetPrinterCommand( command );
+#endif
+}

 
 

-    m_paperSize.x = pd->ptPaperSize.x ;
-    m_paperSize.y = pd->ptPaperSize.y ;
+void wxPrintData::SetPrinterOptions(const wxString& WXUNUSED_WITHOUT_PS(options))
+{
+#if wxUSE_POSTSCRIPT
+    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
+        ((wxPostScriptPrintNativeData*)m_nativeData)->SetPrinterOptions( options );
+#endif
+}

 
 

-    m_minMarginTopLeft.x = pd->rtMinMargin.left ;
-    m_minMarginTopLeft.y = pd->rtMinMargin.top ;
-    m_minMarginBottomRight.x = pd->rtMinMargin.right ;
-    m_minMarginBottomRight.y = pd->rtMinMargin.bottom ;
+void wxPrintData::SetPreviewCommand(const wxString& WXUNUSED_WITHOUT_PS(command))
+{
+#if wxUSE_POSTSCRIPT
+    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
+        ((wxPostScriptPrintNativeData*)m_nativeData)->SetPreviewCommand( command );
+#endif
+}

 
 

-    m_marginTopLeft.x = pd->rtMargin.left ;
-    m_marginTopLeft.y = pd->rtMargin.top ;
-    m_marginBottomRight.x = pd->rtMargin.right ;
-    m_marginBottomRight.y = pd->rtMargin.bottom ;
+void wxPrintData::SetFontMetricPath(const wxString& WXUNUSED_WITHOUT_PS(path))
+{
+#if wxUSE_POSTSCRIPT
+    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
+        ((wxPostScriptPrintNativeData*)m_nativeData)->SetFontMetricPath( path );
+#endif
+}

 
 

-    if ( pd->hDevMode )
-    {
-        DEVMODE *devMode = (DEVMODE*) GlobalLock(pd->hDevMode);
-        m_orientation = devMode->dmOrientation ;
-        GlobalUnlock(pd->hDevMode);
-    }
+void wxPrintData::SetPrinterScaleX(double WXUNUSED_WITHOUT_PS(x))
+{
+#if wxUSE_POSTSCRIPT
+    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
+        ((wxPostScriptPrintNativeData*)m_nativeData)->SetPrinterScaleX( x );
+#endif
+}
+
+void wxPrintData::SetPrinterScaleY(double WXUNUSED_WITHOUT_PS(y))
+{
+#if wxUSE_POSTSCRIPT
+    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
+        ((wxPostScriptPrintNativeData*)m_nativeData)->SetPrinterScaleY( y );
+#endif
+}
+
+void wxPrintData::SetPrinterScaling(double WXUNUSED_WITHOUT_PS(x), double WXUNUSED_WITHOUT_PS(y))
+{
+#if wxUSE_POSTSCRIPT
+    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
+        ((wxPostScriptPrintNativeData*)m_nativeData)->SetPrinterScaling( x, y );
+#endif
+}
+
+void wxPrintData::SetPrinterTranslateX(long WXUNUSED_WITHOUT_PS(x))
+{
+#if wxUSE_POSTSCRIPT
+    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
+        ((wxPostScriptPrintNativeData*)m_nativeData)->SetPrinterTranslateX( x );
+#endif
+}
+
+void wxPrintData::SetPrinterTranslateY(long WXUNUSED_WITHOUT_PS(y))
+{
+#if wxUSE_POSTSCRIPT
+    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
+        ((wxPostScriptPrintNativeData*)m_nativeData)->SetPrinterTranslateY( y );
+#endif
+}
+
+void wxPrintData::SetPrinterTranslation(long WXUNUSED_WITHOUT_PS(x), long WXUNUSED_WITHOUT_PS(y))
+{
+#if wxUSE_POSTSCRIPT
+    if (m_nativeData && wxIsKindOf(m_nativeData,wxPostScriptPrintNativeData))
+        ((wxPostScriptPrintNativeData*)m_nativeData)->SetPrinterTranslation( x, y );
+#endif
+}
+#endif
+
+// ----------------------------------------------------------------------------
+// Print dialog data
+// ----------------------------------------------------------------------------
+
+wxPrintDialogData::wxPrintDialogData()
+{
+    m_printFromPage = 0;
+    m_printToPage = 0;
+    m_printMinPage = 0;
+    m_printMaxPage = 0;
+    m_printNoCopies = 1;
+    m_printAllPages = false;
+    m_printCollate = false;
+    m_printToFile = false;
+    m_printSelection = false;
+    m_printEnableSelection = false;
+    m_printEnablePageNumbers = true;
+
+    wxPrintFactory* factory = wxPrintFactory::GetFactory();
+    m_printEnablePrintToFile = ! factory->HasOwnPrintToFile();
+
+    m_printEnableHelp = false;
+#if WXWIN_COMPATIBILITY_2_4
+    m_printSetupDialog = false;
+#endif
+}
+
+wxPrintDialogData::wxPrintDialogData(const wxPrintDialogData& dialogData)
+    : wxObject()
+{
+    (*this) = dialogData;
+}
+
+wxPrintDialogData::wxPrintDialogData(const wxPrintData& printData)
+{
+    m_printFromPage = 1;
+    m_printToPage = 0;
+    m_printMinPage = 1;
+    m_printMaxPage = 9999;
+    m_printNoCopies = 1;
+    m_printAllPages = false;
+    m_printCollate = false;
+    m_printToFile = false;
+    m_printSelection = false;
+    m_printEnableSelection = false;
+    m_printEnablePageNumbers = true;
+    m_printEnablePrintToFile = true;
+    m_printEnableHelp = false;
+#if WXWIN_COMPATIBILITY_2_4
+    m_printSetupDialog = false;
+#endif
+    m_printData = printData;
+}
+
+wxPrintDialogData::~wxPrintDialogData()
+{
+}
+
+void wxPrintDialogData::operator=(const wxPrintDialogData& data)
+{
+    m_printFromPage = data.m_printFromPage;
+    m_printToPage = data.m_printToPage;
+    m_printMinPage = data.m_printMinPage;
+    m_printMaxPage = data.m_printMaxPage;
+    m_printNoCopies = data.m_printNoCopies;
+    m_printAllPages = data.m_printAllPages;
+    m_printCollate = data.m_printCollate;
+    m_printToFile = data.m_printToFile;
+    m_printSelection = data.m_printSelection;
+    m_printEnableSelection = data.m_printEnableSelection;
+    m_printEnablePageNumbers = data.m_printEnablePageNumbers;
+    m_printEnableHelp = data.m_printEnableHelp;
+    m_printEnablePrintToFile = data.m_printEnablePrintToFile;
+#if WXWIN_COMPATIBILITY_2_4
+    m_printSetupDialog = data.m_printSetupDialog;
+#endif
+    m_printData = data.m_printData;

 }
 
 }
 

-void wxPageSetupData::SetOwnerWindow(wxWindow* win)
+void wxPrintDialogData::operator=(const wxPrintData& data)

 {
 {

-    if ( m_pageSetupData == NULL )
-        ConvertToNative();
+    m_printData = data;
+}
+
+// ----------------------------------------------------------------------------
+// wxPageSetupDialogData
+// ----------------------------------------------------------------------------

 
 

-    if ( m_pageSetupData != NULL && win != NULL)
+wxPageSetupDialogData::wxPageSetupDialogData()
+{
+    m_paperSize = wxSize(0,0);
+
+    CalculatePaperSizeFromId();
+
+    m_minMarginTopLeft =
+    m_minMarginBottomRight =
+    m_marginTopLeft =
+    m_marginBottomRight = wxPoint(0,0);
+
+    // Flags
+    m_defaultMinMargins = false;
+    m_enableMargins = true;
+    m_enableOrientation = true;
+    m_enablePaper = true;
+    m_enablePrinter = true;
+    m_enableHelp = false;
+    m_getDefaultInfo = false;
+}
+
+wxPageSetupDialogData::wxPageSetupDialogData(const wxPageSetupDialogData& dialogData)
+    : wxObject()
+{
+    (*this) = dialogData;
+}
+
+wxPageSetupDialogData::wxPageSetupDialogData(const wxPrintData& printData)
+{
+    m_paperSize = wxSize(0,0);
+    m_minMarginTopLeft =
+    m_minMarginBottomRight =
+    m_marginTopLeft =
+    m_marginBottomRight = wxPoint(0,0);
+
+    // Flags
+    m_defaultMinMargins = false;
+    m_enableMargins = true;
+    m_enableOrientation = true;
+    m_enablePaper = true;
+    m_enablePrinter = true;
+    m_enableHelp = false;
+    m_getDefaultInfo = false;
+
+    m_printData = printData;
+
+    // The wxPrintData paper size overrides these values, unless the size cannot
+    // be found.
+    CalculatePaperSizeFromId();
+}
+
+wxPageSetupDialogData::~wxPageSetupDialogData()
+{
+}
+
+wxPageSetupDialogData& wxPageSetupDialogData::operator=(const wxPageSetupDialogData& data)
+{
+    m_paperSize = data.m_paperSize;
+    m_minMarginTopLeft = data.m_minMarginTopLeft;
+    m_minMarginBottomRight = data.m_minMarginBottomRight;
+    m_marginTopLeft = data.m_marginTopLeft;
+    m_marginBottomRight = data.m_marginBottomRight;
+    m_defaultMinMargins = data.m_defaultMinMargins;
+    m_enableMargins = data.m_enableMargins;
+    m_enableOrientation = data.m_enableOrientation;
+    m_enablePaper = data.m_enablePaper;
+    m_enablePrinter = data.m_enablePrinter;
+    m_getDefaultInfo = data.m_getDefaultInfo;
+    m_enableHelp = data.m_enableHelp;
+
+    m_printData = data.m_printData;
+
+    return *this;
+}
+
+wxPageSetupDialogData& wxPageSetupDialogData::operator=(const wxPrintData& data)
+{
+    m_printData = data;
+    CalculatePaperSizeFromId();
+
+    return *this;
+}
+
+// If a corresponding paper type is found in the paper database, will set the m_printData
+// paper size id member as well.
+void wxPageSetupDialogData::SetPaperSize(const wxSize& sz)
+{
+    m_paperSize = sz;
+
+    CalculateIdFromPaperSize();
+}
+
+// Sets the wxPrintData id, plus the paper width/height if found in the paper database.
+void wxPageSetupDialogData::SetPaperSize(wxPaperSize id)
+{
+    m_printData.SetPaperId(id);
+
+    CalculatePaperSizeFromId();
+}
+
+void wxPageSetupDialogData::SetPrintData(const wxPrintData& printData)
+{
+    m_printData = printData;
+    CalculatePaperSizeFromId();
+}
+
+// Use paper size defined in this object to set the wxPrintData
+// paper id
+void wxPageSetupDialogData::CalculateIdFromPaperSize()
+{
+    wxASSERT_MSG( (wxThePrintPaperDatabase != (wxPrintPaperDatabase*) NULL),
+                  wxT("wxThePrintPaperDatabase should not be NULL. Do not create global print dialog data objects.") );
+
+    wxSize sz = GetPaperSize();
+
+    wxPaperSize id = wxThePrintPaperDatabase->GetSize(wxSize(sz.x* 10, sz.y * 10));
+    if (id != wxPAPER_NONE)

     {
     {

-      PAGESETUPDLG *pd = (PAGESETUPDLG *) m_pageSetupData ;
-      pd->hwndOwner=(HWND) win->GetHWND();
+        m_printData.SetPaperId(id);

     }
 }
     }
 }

-#endif

 
 

+// Use paper id in wxPrintData to set this object's paper size
+void wxPageSetupDialogData::CalculatePaperSizeFromId()
+{
+    wxASSERT_MSG( (wxThePrintPaperDatabase != (wxPrintPaperDatabase*) NULL),
+                  wxT("wxThePrintPaperDatabase should not be NULL. Do not create global print dialog data objects.") );
+
+    wxSize sz = wxThePrintPaperDatabase->GetSize(m_printData.GetPaperId());
+
+    // sz is in 10ths of a mm, while paper size is in mm
+    m_paperSize.x = sz.x / 10;
+    m_paperSize.y = sz.y / 10;
+}
+
+#endif // wxUSE_PRINTING_ARCHITECTURE