wxUniversal STL-ification.

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

diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp
index efad31ecbf11fcb90df11ff21974c7851f92b1ec..0595eacc2720b912c74e51d77fff3901787720ac 100644 (file)
--- a/src/common/cmndata.cpp
+++ b/src/common/cmndata.cpp
@@ -5,7 +5,7 @@
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$
 // Modified by:
 // Created:     01/02/97
 // RCS-ID:      $Id$

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

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


@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

     #pragma implementation "cmndata.h"
 #endif
 
     #pragma implementation "cmndata.h"
 #endif
 


@@ -39,39 +39,32 @@
 #include "wx/cmndata.h"
 #include "wx/log.h"
 
 #include "wx/cmndata.h"
 #include "wx/log.h"
 

-// For compatibility
-#if (defined(__WXMOTIF__) || defined(__WXGTK__) || defined(__WXPM__) || defined(__WXMAC__)) && wxUSE_POSTSCRIPT
-    #define wxCOMPATIBILITY_WITH_PRINTSETUPDATA 1
-#endif
+#if wxUSE_FONTDLG
+    #include "wx/fontdlg.h"
+#endif // wxUSE_FONTDLG

 
 #if wxUSE_PRINTING_ARCHITECTURE
     #include "wx/paper.h"
 
 #if wxUSE_PRINTING_ARCHITECTURE
     #include "wx/paper.h"

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

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

-    #include <windows.h>
+    #include <windowsx.h>

     #include "wx/msw/private.h"
 
     #include "wx/msw/private.h"
 

-    #if !defined(__WIN32__)
-        #include <print.h>
-        #include <commdlg.h>
-    #endif // Win16
-
-    #ifdef __WXWINE__
-        #include <cderr.h>
+    #if defined(__WXWINCE__) && !wxUSE_SMARTPHONE

         #include <commdlg.h>
     #endif
 
         #include <commdlg.h>
     #endif
 

-    #if defined(__WATCOMC__) || defined(__SC__) || defined(__SALFORDC__)
+    #if defined(__WATCOMC__) || defined(__SYMANTEC__) || defined(__SALFORDC__)

         #include <windowsx.h>
         #include <commdlg.h>
     #endif
 #endif // MSW
 
         #include <windowsx.h>
         #include <commdlg.h>
     #endif
 #endif // MSW
 

+#ifdef __WXMAC__
+    #include "wx/mac/private/print.h"
+#endif
+

     #if wxUSE_PRINTING_ARCHITECTURE
         IMPLEMENT_DYNAMIC_CLASS(wxPrintData, wxObject)
         IMPLEMENT_DYNAMIC_CLASS(wxPrintDialogData, wxObject)
     #if wxUSE_PRINTING_ARCHITECTURE
         IMPLEMENT_DYNAMIC_CLASS(wxPrintData, wxObject)
         IMPLEMENT_DYNAMIC_CLASS(wxPrintDialogData, wxObject)


@@ -81,11 +74,6 @@
     IMPLEMENT_DYNAMIC_CLASS(wxFontData, wxObject)
     IMPLEMENT_DYNAMIC_CLASS(wxColourData, wxObject)
 
     IMPLEMENT_DYNAMIC_CLASS(wxFontData, wxObject)
     IMPLEMENT_DYNAMIC_CLASS(wxColourData, wxObject)
 

-#ifdef __WXMAC__
-    #define mm2pt            2.83464566929
-    #define pt2mm            0.352777777778
-#endif // Mac
-

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


@@ -102,13 +90,14 @@ wxColourData::wxColourData()
 {
     int i;
     for (i = 0; i < 16; i++)
 {
     int i;
     for (i = 0; i < 16; i++)

-        custColours[i].Set(255, 255, 255);
+        m_custColours[i].Set(255, 255, 255);

 
 

-    chooseFull = FALSE;
-    dataColour.Set(0,0,0);
+    m_chooseFull = FALSE;
+    m_dataColour.Set(0,0,0);

 }
 
 wxColourData::wxColourData(const wxColourData& data)
 }
 
 wxColourData::wxColourData(const wxColourData& data)

+    : wxObject()

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


@@ -117,12 +106,12 @@ wxColourData::~wxColourData()
 {
 }
 
 {
 }
 

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

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

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

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


@@ -130,17 +119,17 @@ wxColour wxColourData::GetCustomColour(int i)
     if (i > 15 || i < 0)
         return wxColour(0,0,0);
 
     if (i > 15 || i < 0)
         return wxColour(0,0,0);
 

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

 }
 
 void wxColourData::operator=(const wxColourData& data)
 {
     int i;
     for (i = 0; i < 16; i++)
 }
 
 void wxColourData::operator=(const wxColourData& data)
 {
     int i;
     for (i = 0; i < 16; i++)

-        custColours[i] = data.custColours[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;

 }
 
 // ----------------------------------------------------------------------------
 }
 
 // ----------------------------------------------------------------------------


@@ -150,13 +139,13 @@ void wxColourData::operator=(const wxColourData& data)
 wxFontData::wxFontData()
 {
     // Intialize colour to black.
 wxFontData::wxFontData()
 {
     // Intialize colour to black.

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

 
 

-    showHelp = FALSE;
-    allowSymbols = TRUE;
-    enableEffects = TRUE;
-    minSize = 0;
-    maxSize = 0;
+    m_showHelp = FALSE;
+    m_allowSymbols = TRUE;
+    m_enableEffects = TRUE;
+    m_minSize = 0;
+    m_maxSize = 0;

 
     m_encoding = wxFONTENCODING_SYSTEM;
 }
 
     m_encoding = wxFONTENCODING_SYSTEM;
 }


@@ -165,6 +154,14 @@ wxFontData::~wxFontData()
 {
 }
 
 {
 }
 

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

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


@@ -176,30 +173,14 @@ wxPrintData::wxPrintData()
     m_devMode = (void*) NULL;
     m_devNames = (void*) NULL;
 #elif defined( __WXMAC__ )
     m_devMode = (void*) NULL;
     m_devNames = (void*) NULL;
 #elif defined( __WXMAC__ )

-#if TARGET_CARBON
-    m_macPageFormat = kPMNoPageFormat;
-    m_macPrintSettings = kPMNoPrintSettings;
-#else
-    m_macPrintInfo = (THPrint) NewHandleClear( sizeof( TPrint ) );
-    (**m_macPrintInfo).iPrVersion = 0;                    // something invalid
-
-    (**m_macPrintInfo).prInfo.iHRes = 72;
-    (**m_macPrintInfo).prInfo.iVRes = 72;
-    Rect r1 = { 0, 0, 8*72 - 2 * 18, 11*72 - 2 * 36 };
-    (**m_macPrintInfo).prInfo.rPage = r1;// must have its top left & (0,0)
-
-    Rect r2 = { -18, -36, 8*72 - 18, 11*72 - 36  };
-    (**m_macPrintInfo).rPaper = r2;
-    (**m_macPrintInfo).prStl.iPageV = 11 * 120 ;                // 11 inches in 120th of an inch
-    (**m_macPrintInfo).prStl.iPageH = 8 * 120 ;                // 8 inches in 120th of an inch
-#endif
+    m_nativePrintData = wxNativePrintData::Create() ;

 #endif
     m_printOrientation = wxPORTRAIT;
     m_printNoCopies = 1;
     m_printCollate = FALSE;
 
     // New, 24/3/99
 #endif
     m_printOrientation = wxPORTRAIT;
     m_printNoCopies = 1;
     m_printCollate = FALSE;
 
     // New, 24/3/99

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

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


@@ -207,11 +188,26 @@ wxPrintData::wxPrintData()
     m_paperSize = wxSize(210, 297);
 
     // PostScript-specific data
     m_paperSize = wxSize(210, 297);
 
     // PostScript-specific data

-    m_printerCommand = "";
-    m_previewCommand = "";
-    m_printerOptions = "";
-    m_filename = "";
-    m_afmPath = "";
+    m_previewCommand = wxT("");
+    m_filename = wxT("");
+#ifdef __VMS__
+    m_printerCommand = wxT("print");
+    m_printerOptions = wxT("/nonotify/queue=psqueue");
+    m_afmPath = wxT("sys$ps_font_metrics:");
+#endif
+
+#ifdef __WXMSW__
+    m_printerCommand = wxT("print");
+    m_printerOptions = wxT("");
+    m_afmPath = wxT("c:\\windows\\system\\");
+#endif
+
+#if !defined(__VMS__) && !defined(__WXMSW__)
+    m_printerCommand = wxT("lpr");
+    m_printerOptions = wxT("");
+    m_afmPath = wxT("");
+#endif
+

     m_printerScaleX = 1.0;
     m_printerScaleY = 1.0;
     m_printerTranslateX = 0;
     m_printerScaleX = 1.0;
     m_printerScaleY = 1.0;
     m_printerTranslateX = 0;


@@ -220,17 +216,13 @@ wxPrintData::wxPrintData()
 }
 
 wxPrintData::wxPrintData(const wxPrintData& printData)
 }
 
 wxPrintData::wxPrintData(const wxPrintData& printData)

+    : wxObject()

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

-#if TARGET_CARBON
-    m_macPageFormat = kPMNoPageFormat;
-    m_macPrintSettings = kPMNoPrintSettings;
-#else
-    m_macPrintInfo = NULL;
-#endif
+    m_nativePrintData = wxNativePrintData::Create() ;

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


@@ -245,30 +237,7 @@ wxPrintData::~wxPrintData()
     if ( hDevNames )
         GlobalFree(hDevNames);
 #elif defined(__WXMAC__)
     if ( hDevNames )
         GlobalFree(hDevNames);
 #elif defined(__WXMAC__)

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

 #endif
 }
 
 #endif
 }
 


@@ -357,7 +326,11 @@ void wxPrintData::ConvertToNative()
         pd.lStructSize    = 66;
 #else
         memset(&pd, 0, sizeof(PRINTDLG));
         pd.lStructSize    = 66;
 #else
         memset(&pd, 0, sizeof(PRINTDLG));

+#ifdef __WXWINCE__
+        pd.cbStruct    = sizeof(PRINTDLG);
+#else

         pd.lStructSize    = sizeof(PRINTDLG);
         pd.lStructSize    = sizeof(PRINTDLG);

+#endif

 #endif
 
         pd.hwndOwner      = (HWND)NULL;
 #endif
 
         pd.hwndOwner      = (HWND)NULL;


@@ -409,10 +382,7 @@ void wxPrintData::ConvertToNative()
 
         //// Orientation
 
 
         //// Orientation
 

-#ifndef __WXWINE__

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

-#endif
-        devMode->dmFields = DM_ORIENTATION;

 
         //// Collation
 
 
         //// Collation
 


@@ -444,7 +414,6 @@ void wxPrintData::ConvertToNative()
 
         devMode->dmFields |= DM_COLOR;
 
 
         devMode->dmFields |= DM_COLOR;
 

-#ifndef __WXWINE__

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


@@ -468,7 +437,6 @@ void wxPrintData::ConvertToNative()
                 }
             }
         }
                 }
             }
         }

-#endif

 
         //// Duplex
 
 
         //// Duplex
 


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

-#ifndef __WXWINE__

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

-#endif

 
         //// Collation
 
 
         //// Collation
 


@@ -567,17 +533,7 @@ void wxPrintData::ConvertFromNative()
 
         if (devMode->dmDeviceName[0] != 0)
         {
 
         if (devMode->dmDeviceName[0] != 0)
         {

-            // TODO: make this Unicode compatible
-            char buf[32];
-            int i = 0;
-            while (devMode->dmDeviceName[i] != 0)
-            {
-                buf[i] = devMode->dmDeviceName[i];
-                i ++;
-            }
-            buf[i] = 0;
-
-            m_printerName = buf;
+            m_printerName = devMode->dmDeviceName;

         }
 
         //// Colour
         }
 
         //// Colour


@@ -592,7 +548,6 @@ void wxPrintData::ConvertFromNative()
         else
             m_colour = TRUE;
 
         else
             m_colour = TRUE;
 

-#ifndef __WXWINE__

         //// Paper size
 
         // We don't know size of user defined paper and some buggy drivers
         //// Paper size
 
         // We don't know size of user defined paper and some buggy drivers


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

-#endif

 
         //// Duplex
 
 
         //// Duplex
 


@@ -731,31 +685,23 @@ void wxPrintData::ConvertFromNative()
 #endif
 
 #ifdef __WXMAC__
 #endif
 
 #ifdef __WXMAC__

+

 void wxPrintData::ConvertToNative()
 {
 void wxPrintData::ConvertToNative()
 {

-#ifdef TARGET_CARBON
-#else
-    (**m_macPrintInfo).prJob.iCopies = m_printNoCopies;
-#endif
+    m_nativePrintData->TransferFrom( this ) ;

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

-#ifdef TARGET_CARBON
-#else
-    m_printNoCopies = (**m_macPrintInfo).prJob.iCopies;
-#endif
+    m_nativePrintData->TransferTo( this ) ;

 }
 }

+

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

-#ifdef TARGET_CARBON
-#else
-    m_macPrintInfo = data.m_macPrintInfo;
-    HandToHand( (Handle*) &m_macPrintInfo );
-#endif
+    m_nativePrintData->CopyFrom( data.m_nativePrintData ) ;

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


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

-// For compatibility
-#if wxCOMPATIBILITY_WITH_PRINTSETUPDATA
-void wxPrintData::operator=(const wxPrintSetupData& setupData)
+// Is this data OK for showing the print dialog?
+bool wxPrintData::Ok() const

 {
 {

-    SetPrinterCommand(setupData.GetPrinterCommand());
-    SetPreviewCommand(setupData.GetPrintPreviewCommand());
-    SetPrinterOptions(setupData.GetPrinterOptions());
-
-    long xt, yt;
-    setupData.GetPrinterTranslation(& xt, & yt);
-    SetPrinterTranslation(xt, yt);
-
-    double xs, ys;
-    setupData.GetPrinterScaling(& xs, & ys);
-    SetPrinterScaling(xs, ys);
-
-    SetOrientation(setupData.GetPrinterOrientation());
-    SetPrintMode((wxPrintMode) setupData.GetPrinterMode());
-    SetFontMetricPath(setupData.GetAFMPath());
-    if (setupData.GetPaperName() != "")
-        SetPaperId(wxThePrintPaperDatabase->ConvertNameToId(setupData.GetPaperName()));
-    SetColour(setupData.GetColour());
-    SetFilename(setupData.GetPrinterFile());
+#ifdef __WXMSW__
+    ((wxPrintData*)this)->ConvertToNative();
+    return (m_devMode != NULL) ;
+#else
+    return TRUE;
+#endif

 }
 }

-#endif // wxCOMPATIBILITY_WITH_PRINTSETUPDATA
-

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


@@ -833,6 +763,7 @@ wxPrintDialogData::wxPrintDialogData()
 }
 
 wxPrintDialogData::wxPrintDialogData(const wxPrintDialogData& dialogData)
 }
 
 wxPrintDialogData::wxPrintDialogData(const wxPrintDialogData& dialogData)

+    : wxObject()

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


@@ -845,10 +776,10 @@ wxPrintDialogData::wxPrintDialogData(const wxPrintData& printData)
 #ifdef __WXMSW__
     m_printDlgData = NULL;
 #endif
 #ifdef __WXMSW__
     m_printDlgData = NULL;
 #endif

-    m_printFromPage = 0;
+    m_printFromPage = 1;

     m_printToPage = 0;
     m_printToPage = 0;

-    m_printMinPage = 0;
-    m_printMaxPage = 0;
+    m_printMinPage = 1;
+    m_printMaxPage = 9999;

     m_printNoCopies = 1;
     m_printAllPages = FALSE;
     m_printCollate = FALSE;
     m_printNoCopies = 1;
     m_printAllPages = FALSE;
     m_printCollate = FALSE;


@@ -919,7 +850,8 @@ void wxPrintDialogData::ConvertToNative()
 
     m_printData.SetNativeData((void*) NULL);
 
 
     m_printData.SetNativeData((void*) NULL);
 

-    wxASSERT_MSG( (pd->hDevMode), wxT("hDevMode must be non-NULL in ConvertToNative!"));
+    // Shouldn't assert; we should be able to test Ok-ness at a higher level
+    //wxASSERT_MSG( (pd->hDevMode), wxT("hDevMode must be non-NULL in ConvertToNative!"));

 
     pd->hDevNames = (HGLOBAL)(DWORD) m_printData.GetNativeDataDevNames();
 
 
     pd->hDevNames = (HGLOBAL)(DWORD) m_printData.GetNativeDataDevNames();
 


@@ -965,6 +897,8 @@ void wxPrintDialogData::ConvertToNative()
         pd->Flags |= PD_NOSELECTION;
     if ( !m_printEnablePageNumbers )
         pd->Flags |= PD_NOPAGENUMS;
         pd->Flags |= PD_NOSELECTION;
     if ( !m_printEnablePageNumbers )
         pd->Flags |= PD_NOPAGENUMS;

+    else if ( (!m_printAllPages) && (!m_printSelection) && (m_printFromPage != 0) && (m_printToPage != 0))
+        pd->Flags |= PD_PAGENUMS;

     if ( m_printEnableHelp )
         pd->Flags |= PD_SHOWHELP;
     if ( m_printSetupDialog )
     if ( m_printEnableHelp )
         pd->Flags |= PD_SHOWHELP;
     if ( m_printSetupDialog )


@@ -1011,7 +945,7 @@ void wxPrintDialogData::ConvertFromNative()
     m_printMaxPage = pd->nMaxPage;
     m_printNoCopies = pd->nCopies;
 
     m_printMaxPage = pd->nMaxPage;
     m_printNoCopies = pd->nCopies;
 

-    m_printAllPages = ((pd->Flags & PD_ALLPAGES) == PD_ALLPAGES);
+    m_printAllPages = (((pd->Flags & PD_PAGENUMS) != PD_PAGENUMS) && ((pd->Flags & PD_SELECTION) != PD_SELECTION));

     m_printSelection = ((pd->Flags & PD_SELECTION) == PD_SELECTION);
     m_printCollate = ((pd->Flags & PD_COLLATE) == PD_COLLATE);
     m_printToFile = ((pd->Flags & PD_PRINTTOFILE) == PD_PRINTTOFILE);
     m_printSelection = ((pd->Flags & PD_SELECTION) == PD_SELECTION);
     m_printCollate = ((pd->Flags & PD_COLLATE) == PD_COLLATE);
     m_printToFile = ((pd->Flags & PD_PRINTTOFILE) == PD_PRINTTOFILE);


@@ -1051,25 +985,19 @@ void wxPrintDialogData::SetOwnerWindow(wxWindow* win)
 #endif // MSW
 
 #ifdef __WXMAC__
 #endif // MSW
 
 #ifdef __WXMAC__

+

 void wxPrintDialogData::ConvertToNative()
 {
 void wxPrintDialogData::ConvertToNative()
 {

-#ifdef TARGET_CARBON
-#else
-    (**m_printData.m_macPrintInfo).prJob.iFstPage = m_printFromPage;
-    (**m_printData.m_macPrintInfo).prJob.iLstPage = m_printToPage;

     m_printData.ConvertToNative();
     m_printData.ConvertToNative();

-#endif
+    m_printData.m_nativePrintData->TransferFrom( this ) ;

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

-#ifdef TARGET_CARBON
-#else

     m_printData.ConvertFromNative();
     m_printData.ConvertFromNative();

-    m_printFromPage = (**m_printData.m_macPrintInfo).prJob.iFstPage;
-    m_printToPage = (**m_printData.m_macPrintInfo).prJob.iLstPage;
-#endif
+    m_printData.m_nativePrintData->TransferTo( this ) ;

 }
 }

+

 #endif
 
 
 #endif
 
 


@@ -1127,6 +1055,7 @@ wxPageSetupDialogData::wxPageSetupDialogData()
 }
 
 wxPageSetupDialogData::wxPageSetupDialogData(const wxPageSetupDialogData& dialogData)
 }
 
 wxPageSetupDialogData::wxPageSetupDialogData(const wxPageSetupDialogData& dialogData)

+    : wxObject()

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


@@ -1174,7 +1103,7 @@ wxPageSetupDialogData::~wxPageSetupDialogData()
 #endif
 }
 
 #endif
 }
 

-void wxPageSetupDialogData::operator=(const wxPageSetupDialogData& data)
+wxPageSetupDialogData& wxPageSetupDialogData::operator=(const wxPageSetupDialogData& data)

 {
     m_paperSize = data.m_paperSize;
     m_minMarginTopLeft = data.m_minMarginTopLeft;
 {
     m_paperSize = data.m_paperSize;
     m_minMarginTopLeft = data.m_minMarginTopLeft;


@@ -1190,11 +1119,15 @@ void wxPageSetupDialogData::operator=(const wxPageSetupDialogData& data)
     m_enableHelp = data.m_enableHelp;
 
     m_printData = data.m_printData;
     m_enableHelp = data.m_enableHelp;
 
     m_printData = data.m_printData;

+
+    return *this;

 }
 
 }
 

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

 {
     m_printData = data;
 {
     m_printData = data;

+
+    return *this;

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


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

-    wxASSERT_MSG( (pd->hDevMode), wxT("hDevMode must be non-NULL in ConvertToNative!"));
+    // Shouldn't assert; we should be able to test Ok-ness at a higher level
+    //wxASSERT_MSG( (pd->hDevMode), wxT("hDevMode must be non-NULL in ConvertToNative!"));

 
     // Pass the devnames data (created in m_printData.ConvertToNative)
     // to the PRINTDLG structure, since it'll
 
     // Pass the devnames data (created in m_printData.ConvertToNative)
     // to the PRINTDLG structure, since it'll


@@ -1377,39 +1311,16 @@ void wxPageSetupDialogData::SetOwnerWindow(wxWindow* win)
 void wxPageSetupDialogData::ConvertToNative()
 {
     m_printData.ConvertToNative();
 void wxPageSetupDialogData::ConvertToNative()
 {
     m_printData.ConvertToNative();

-    // on mac the paper rect has a negative top left corner, because the page rect (printable area) is at 0,0
-#ifdef TARGET_CARBON
-#else
-    (**m_printData.m_macPrintInfo).rPaper.left = int( ((double) m_minMarginTopLeft.x)*mm2pt );
-    (**m_printData.m_macPrintInfo).rPaper.top = int( ((double) m_minMarginTopLeft.y)*mm2pt );
-
-    (**m_printData.m_macPrintInfo).rPaper.right = int( ((double) m_paperSize.x - m_minMarginTopLeft.x)*mm2pt );
-    (**m_printData.m_macPrintInfo).rPaper.bottom = int( ((double) m_paperSize.y - m_minMarginTopLeft.y)*mm2pt );
-
-    (**m_printData.m_macPrintInfo).prInfo.rPage.left = 0;
-    (**m_printData.m_macPrintInfo).prInfo.rPage.top = 0;
-    (**m_printData.m_macPrintInfo).prInfo.rPage.right =  int( ((double) m_paperSize.x - m_minMarginTopLeft.x - m_minMarginBottomRight.x)*mm2pt );
-    (**m_printData.m_macPrintInfo).prInfo.rPage.bottom =  int( ((double) m_paperSize.y - m_minMarginTopLeft.y - m_minMarginBottomRight.y)*mm2pt );
-#endif
+    m_printData.m_nativePrintData->TransferFrom( this ) ;

 }
 
 void wxPageSetupDialogData::ConvertFromNative()
 {
     m_printData.ConvertFromNative ();
 }
 
 void wxPageSetupDialogData::ConvertFromNative()
 {
     m_printData.ConvertFromNative ();

-
-#ifdef TARGET_CARBON
-#else
-    m_paperSize.x = ((double) (**m_printData.m_macPrintInfo).rPaper.right - (**m_printData.m_macPrintInfo).rPaper.left ) * pt2mm;
-    m_paperSize.y = ((double) (**m_printData.m_macPrintInfo).rPaper.bottom - (**m_printData.m_macPrintInfo).rPaper.top ) * pt2mm;
-
-    m_minMarginTopLeft.x = ((double) -(**m_printData.m_macPrintInfo).rPaper.left ) * pt2mm;
-    m_minMarginTopLeft.y = ((double) -(**m_printData.m_macPrintInfo).rPaper.top ) * pt2mm;
-
-    m_minMarginBottomRight.x = ((double) (**m_printData.m_macPrintInfo).rPaper.right - (**m_printData.m_macPrintInfo).prInfo.rPage.right ) * pt2mm;
-    m_minMarginBottomRight.y = ((double)(**m_printData.m_macPrintInfo).rPaper.bottom - (**m_printData.m_macPrintInfo).prInfo.rPage.bottom ) * pt2mm;
-#endif
+    m_paperSize = m_printData.GetPaperSize() ;
+    CalculateIdFromPaperSize();
+    m_printData.m_nativePrintData->TransferTo( this ) ;

     // adjust minimal values
     // 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_marginTopLeft.x < m_minMarginTopLeft.x )
         m_marginTopLeft.x = m_minMarginTopLeft.x;


@@ -1467,12 +1378,9 @@ void wxPageSetupDialogData::CalculatePaperSizeFromId()
 
     wxSize sz = wxThePrintPaperDatabase->GetSize(m_printData.GetPaperId());
 
 
     wxSize sz = wxThePrintPaperDatabase->GetSize(m_printData.GetPaperId());
 

-    if (sz.x != 0)
-    {
-        // sz is in 10ths of a mm, so multiply by 10.
-        m_paperSize.x = sz.x * 10;
-        m_paperSize.y = sz.y * 10;
-    }
+    // sz is in 10ths of a mm, while paper size is in mm
+    m_paperSize.x = sz.x / 10;
+    m_paperSize.y = sz.y / 10;

 }
 
 #endif // wxUSE_PRINTING_ARCHITECTURE
 }
 
 #endif // wxUSE_PRINTING_ARCHITECTURE