added compression ratio argument to wxZlibOutputStream ctor

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

diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp
index 8445b73952b945efa7fb3f84b9cd5b79d634675a..13191c1ee927b79208b4ad8332e8b8bea4e7ccff 100644 (file)
--- a/src/common/cmndata.cpp
+++ b/src/common/cmndata.cpp
@@ -39,39 +39,52 @@
 #include "wx/cmndata.h"
 #include "wx/log.h"
 
 #include "wx/cmndata.h"
 #include "wx/log.h"
 

-#include "wx/paper.h"
-

 // For compatibility
 #if (defined(__WXMOTIF__) || defined(__WXGTK__)) && wxUSE_POSTSCRIPT
     #define wxCOMPATIBILITY_WITH_PRINTSETUPDATA 1
 #endif
 
 // For compatibility
 #if (defined(__WXMOTIF__) || defined(__WXGTK__)) && wxUSE_POSTSCRIPT
     #define wxCOMPATIBILITY_WITH_PRINTSETUPDATA 1
 #endif
 

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

 
 #ifdef __WXMSW__
     #include <windows.h>
 
 #ifdef __WXMSW__
     #include <windows.h>

-    #include <wx/msw/private.h>
+    #include "wx/msw/private.h"

 
     #if !defined(__WIN32__)
         #include <print.h>
         #include <commdlg.h>
     #endif // Win16
 
 
     #if !defined(__WIN32__)
         #include <print.h>
         #include <commdlg.h>
     #endif // Win16
 

+    #ifdef __WXWINE__
+        #include <cderr.h>
+        #include <commdlg.h>
+    #endif
+

     #if defined(__WATCOMC__) || defined(__SC__) || defined(__SALFORDC__)
         #include <windowsx.h>
         #include <commdlg.h>
     #endif
 #endif // MSW
 
     #if defined(__WATCOMC__) || defined(__SC__) || defined(__SALFORDC__)
         #include <windowsx.h>
         #include <commdlg.h>
     #endif
 #endif // MSW
 

-#if !USE_SHARED_LIBRARY
-    IMPLEMENT_DYNAMIC_CLASS(wxPrintData, wxObject)
-    IMPLEMENT_DYNAMIC_CLASS(wxPrintDialogData, wxObject)
-    IMPLEMENT_DYNAMIC_CLASS(wxPageSetupDialogData, wxObject)
+    #if wxUSE_PRINTING_ARCHITECTURE
+        IMPLEMENT_DYNAMIC_CLASS(wxPrintData, wxObject)
+        IMPLEMENT_DYNAMIC_CLASS(wxPrintDialogData, wxObject)
+        IMPLEMENT_DYNAMIC_CLASS(wxPageSetupDialogData, wxObject)
+    #endif // wxUSE_PRINTING_ARCHITECTURE
+

     IMPLEMENT_DYNAMIC_CLASS(wxFontData, wxObject)
     IMPLEMENT_DYNAMIC_CLASS(wxColourData, wxObject)
     IMPLEMENT_DYNAMIC_CLASS(wxFontData, wxObject)
     IMPLEMENT_DYNAMIC_CLASS(wxColourData, wxObject)

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

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


@@ -140,29 +153,15 @@ wxFontData::wxFontData()
     enableEffects = TRUE;
     minSize = 0;
     maxSize = 0;
     enableEffects = TRUE;
     minSize = 0;
     maxSize = 0;

-}

 
 

-wxFontData::wxFontData(const wxFontData& data)
-{
-    (*this) = data;
+    m_encoding = wxFONTENCODING_SYSTEM;

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

-void wxFontData::operator=(const wxFontData& data)
-{
-    fontColour = data.fontColour;
-    showHelp = data.showHelp;
-    allowSymbols = data.allowSymbols;
-    enableEffects = data.enableEffects;
-    initialFont = data.initialFont;
-    chosenFont = data.chosenFont;
-    minSize = data.minSize;
-    maxSize = data.maxSize;
-}
-
+#if wxUSE_PRINTING_ARCHITECTURE

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


@@ -170,7 +169,10 @@ void wxFontData::operator=(const wxFontData& data)
 wxPrintData::wxPrintData()
 {
 #ifdef __WXMSW__
 wxPrintData::wxPrintData()
 {
 #ifdef __WXMSW__

-    m_devMode = NULL;
+    m_devMode = (void*) NULL;
+    m_devNames = (void*) NULL;
+#elif defined( __WXMAC__ )
+    m_macPrintInfo = NULL ;

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


@@ -200,61 +202,100 @@ wxPrintData::wxPrintData()
 wxPrintData::wxPrintData(const wxPrintData& printData)
 {
 #ifdef __WXMSW__
 wxPrintData::wxPrintData(const wxPrintData& printData)
 {
 #ifdef __WXMSW__

-    m_devMode = NULL;
+    m_devMode = (void*) NULL;
+    m_devNames = (void*) NULL;
+#elif defined( __WXMAC__ )
+    m_macPrintInfo = NULL ;

 #endif
 #endif

-

     (*this) = printData;
 }
 
 wxPrintData::~wxPrintData()
 {
 #ifdef __WXMSW__
     (*this) = printData;
 }
 
 wxPrintData::~wxPrintData()
 {
 #ifdef __WXMSW__

-    HGLOBAL hDevMode = (HGLOBAL) m_devMode;
-    if (hDevMode )
+    HGLOBAL hDevMode = (HGLOBAL)(DWORD) m_devMode;
+    if ( hDevMode )

         GlobalFree(hDevMode);
         GlobalFree(hDevMode);

+    HGLOBAL hDevNames = (HGLOBAL)(DWORD) m_devNames;
+    if ( hDevNames )
+        GlobalFree(hDevNames);
+#elif defined(__WXMAC__)
+    if ( m_macPrintInfo )
+        ::DisposeHandle( (Handle) m_macPrintInfo ) ;

 #endif
 }
 
 #endif
 }
 

-#if defined(__WXMSW__) && defined(__WIN32__)
+#if defined(__WXMSW__) // && defined(__WIN32__)

 
 

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

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

-    wxString msg = _T("Unknown");
+    wxString msg = wxT("Unknown");

     switch (err)
     {
     switch (err)
     {

-        case CDERR_FINDRESFAILURE: msg = _T("CDERR_FINDRESFAILURE"); break;
-        case CDERR_INITIALIZATION: msg = _T("CDERR_INITIALIZATION"); break;
-        case CDERR_LOADRESFAILURE: msg = _T("CDERR_LOADRESFAILURE"); break;
-        case CDERR_LOADSTRFAILURE: msg = _T("CDERR_LOADSTRFAILURE"); break;
-        case CDERR_LOCKRESFAILURE: msg = _T("CDERR_LOCKRESFAILURE"); break;
-        case CDERR_MEMALLOCFAILURE: msg = _T("CDERR_MEMALLOCFAILURE"); break;
-        case CDERR_MEMLOCKFAILURE: msg = _T("CDERR_MEMLOCKFAILURE"); break;
-        case CDERR_NOHINSTANCE: msg = _T("CDERR_NOHINSTANCE"); break;
-        case CDERR_NOHOOK: msg = _T("CDERR_NOHOOK"); break;
-        case CDERR_NOTEMPLATE: msg = _T("CDERR_NOTEMPLATE"); break;
-        case CDERR_STRUCTSIZE: msg = _T("CDERR_STRUCTSIZE"); break;
-        case  PDERR_RETDEFFAILURE: msg = _T("PDERR_RETDEFFAILURE"); break;
-        case  PDERR_PRINTERNOTFOUND: msg = _T("PDERR_PRINTERNOTFOUND"); break;
-        case  PDERR_PARSEFAILURE: msg = _T("PDERR_PARSEFAILURE"); break;
-        case  PDERR_NODEVICES: msg = _T("PDERR_NODEVICES"); break;
-        case  PDERR_NODEFAULTPRN: msg = _T("PDERR_NODEFAULTPRN"); break;
-        case  PDERR_LOADDRVFAILURE: msg = _T("PDERR_LOADDRVFAILURE"); break;
-        case  PDERR_INITFAILURE: msg = _T("PDERR_INITFAILURE"); break;
-        case  PDERR_GETDEVMODEFAIL: msg = _T("PDERR_GETDEVMODEFAIL"); break;
-        case  PDERR_DNDMMISMATCH: msg = _T("PDERR_DNDMMISMATCH"); break;
-        case  PDERR_DEFAULTDIFFERENT: msg = _T("PDERR_DEFAULTDIFFERENT"); break;
-        case  PDERR_CREATEICFAILURE: msg = _T("PDERR_CREATEICFAILURE"); break;
+        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;
 }
         default: break;
     }
     return msg;
 }

- 
+#endif

 
 

+static HGLOBAL wxCreateDevNames(const wxString& driverName, const wxString& printerName, const wxString& portName)
+{
+       HGLOBAL hDev = NULL;
+       // if (!driverName.IsEmpty() && !printerName.IsEmpty() && !portName.IsEmpty())
+    if (driverName.IsEmpty() && printerName.IsEmpty() && portName.IsEmpty())
+    {
+    }
+    else
+       {
+               hDev = GlobalAlloc(GPTR, 4*sizeof(WORD)+
+                       driverName.Length() + 1 +
+                       printerName.Length() + 1 +
+                       portName.Length()+1);
+               LPDEVNAMES lpDev = (LPDEVNAMES)GlobalLock(hDev);
+               lpDev->wDriverOffset = sizeof(WORD)*4;
+               wxStrcpy((wxChar*)lpDev + lpDev->wDriverOffset, driverName);
+
+               lpDev->wDeviceOffset = (WORD)(lpDev->wDriverOffset + driverName.Length()+1);
+               wxStrcpy((wxChar*)lpDev + lpDev->wDeviceOffset, printerName);
+
+               lpDev->wOutputOffset = (WORD)(lpDev->wDeviceOffset + printerName.Length()+1);
+               wxStrcpy((wxChar*)lpDev + lpDev->wOutputOffset, portName);
+
+               lpDev->wDefault = 0;
+
+        GlobalUnlock(hDev);
+       }
+       return hDev;
+}

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

-    HGLOBAL hDevMode = (HGLOBAL) m_devMode;
+    HGLOBAL hDevMode = (HGLOBAL)(DWORD) m_devMode;
+    HGLOBAL hDevNames = (HGLOBAL)(DWORD) m_devNames;

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


@@ -289,20 +330,26 @@ void wxPrintData::ConvertToNative()
             pd->hDevNames = NULL;
 
 #if defined(__WXDEBUG__) && defined(__WIN32__)
             pd->hDevNames = NULL;
 
 #if defined(__WXDEBUG__) && defined(__WIN32__)

-            wxString str(_T("Printing error: "));
+            wxString str(wxT("Printing error: "));

             str += wxGetPrintDlgError();
             wxLogDebug(str);
 #endif
         }
         else
         {
             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;
 
             if ( pd->hDevNames )
                 GlobalFree(pd->hDevNames);
             pd->hDevNames = NULL;
 

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

         }
 
         delete pd;
         }
 
         delete pd;


@@ -310,17 +357,21 @@ void wxPrintData::ConvertToNative()
 
     if ( hDevMode )
     {
 
     if ( hDevMode )
     {

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

 
         //// Orientation
 
 
         //// Orientation
 

+#ifndef __WXWINE__

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

+#endif

         devMode->dmFields = DM_ORIENTATION;
 
         //// Collation
 
         devMode->dmFields = DM_ORIENTATION;
 
         //// Collation
 

+#ifndef __WIN16__

         devMode->dmCollate = (m_printCollate ? DMCOLLATE_TRUE : DMCOLLATE_FALSE);
         devMode->dmFields |= DM_COLLATE;
         devMode->dmCollate = (m_printCollate ? DMCOLLATE_TRUE : DMCOLLATE_FALSE);
         devMode->dmFields |= DM_COLLATE;

+#endif

 
         //// Number of copies
 
 
         //// Number of copies
 


@@ -329,7 +380,7 @@ void wxPrintData::ConvertToNative()
 
         //// Printer name
 
 
         //// Printer name
 

-        if (m_printerName != _T(""))
+        if (m_printerName != wxT(""))

         {
             // TODO: make this Unicode compatible
             int len = wxMin(31, m_printerName.Len());
         {
             // TODO: make this Unicode compatible
             int len = wxMin(31, m_printerName.Len());


@@ -348,6 +399,7 @@ 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)


@@ -369,6 +421,7 @@ void wxPrintData::ConvertToNative()
                 }
             }
         }
                 }
             }
         }

+#endif

 
         //// Duplex
 
 
         //// Duplex
 


@@ -415,26 +468,38 @@ void wxPrintData::ConvertToNative()
 
         GlobalUnlock(hDevMode);
     }
 
         GlobalUnlock(hDevMode);
     }

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

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

-    HGLOBAL hDevMode = (HGLOBAL) m_devMode;
+    HGLOBAL hDevMode = (HGLOBAL)(DWORD) m_devMode;
+    HGLOBAL hDevNames = (HGLOBAL)(DWORD) m_devNames;

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

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

 
 

+#ifndef __WXWINE__

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

+#endif

 
         //// Collation
 
 
         //// Collation
 

+#ifndef __WIN16__

         if (devMode->dmFields & DM_COLLATE)
         {
             if (devMode->dmCollate == DMCOLLATE_TRUE)
         if (devMode->dmFields & DM_COLLATE)
         {
             if (devMode->dmCollate == DMCOLLATE_TRUE)


@@ -442,6 +507,7 @@ void wxPrintData::ConvertFromNative()
             else
                 m_printCollate = FALSE;
         }
             else
                 m_printCollate = FALSE;
         }

+#endif

 
         //// Number of copies
 
 
         //// Number of copies
 


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

+#ifndef __WXWINE__

         //// Paper size
 
         if (devMode->dmFields & DM_PAPERSIZE)
         //// Paper size
 
         if (devMode->dmFields & DM_PAPERSIZE)


@@ -495,7 +562,7 @@ void wxPrintData::ConvertFromNative()
                 else
                 {
                     // Shouldn't really get here
                 else
                 {
                     // Shouldn't really get here

-                    wxFAIL_MSG(_T("Couldn't find paper size in paper database."));
+                    wxFAIL_MSG(wxT("Couldn't find paper size in paper database."));

 
                     m_paperId = wxPAPER_NONE;
                     m_paperSize.x = 0;
 
                     m_paperId = wxPAPER_NONE;
                     m_paperSize.x = 0;


@@ -505,7 +572,7 @@ void wxPrintData::ConvertFromNative()
             else
             {
                 // Shouldn't really get here
             else
             {
                 // Shouldn't really get here

-                wxFAIL_MSG(_T("Paper database wasn't initialized in wxPrintData::ConvertFromNative."));
+                wxFAIL_MSG(wxT("Paper database wasn't initialized in wxPrintData::ConvertFromNative."));

 
                 m_paperId = wxPAPER_NONE;
                 m_paperSize.x = 0;
 
                 m_paperId = wxPAPER_NONE;
                 m_paperSize.x = 0;


@@ -521,13 +588,13 @@ void wxPrintData::ConvertFromNative()
         else
         {
             // Shouldn't really get here
         else
         {
             // Shouldn't really get here

-            wxFAIL_MSG(_T("Couldn't find paper size from DEVMODE."));
+            wxFAIL_MSG(wxT("Couldn't find paper size from DEVMODE."));

 
             m_paperSize.x = 0;
             m_paperSize.y = 0;
             m_paperId = wxPAPER_NONE;
         }
 
             m_paperSize.x = 0;
             m_paperSize.y = 0;
             m_paperId = wxPAPER_NONE;
         }

-
+#endif

 
         //// Duplex
 
 
         //// Duplex
 


@@ -583,10 +650,63 @@ void wxPrintData::ConvertFromNative()
 
         GlobalUnlock(hDevMode);
     }
 
         GlobalUnlock(hDevMode);
     }

+
+    if (hDevNames)
+    {
+        LPDEVNAMES lpDevNames = (LPDEVNAMES)GlobalLock(hDevNames);
+        if (lpDevNames)
+        {
+            // TODO: Unicode-ification
+
+            // Get the port name
+            // port is obsolete in WIN32
+            // m_printData.SetPortName((LPSTR)lpDevNames + lpDevNames->wDriverOffset);
+
+            // Get the printer name
+            wxString printerName = (LPSTR)lpDevNames + lpDevNames->wDeviceOffset;
+
+            // Not sure if we should check for this mismatch
+//            wxASSERT_MSG( (m_printerName == "" || (devName == m_printerName)), "Printer name obtained from DEVMODE and DEVNAMES were different!");
+
+            if (printerName != "")
+                m_printerName = printerName;
+
+            GlobalUnlock(hDevNames);
+        }
+    }

 }
 
 #endif
 
 }
 
 #endif
 

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

 void wxPrintData::operator=(const wxPrintData& data)
 {
     m_printNoCopies = data.m_printNoCopies;
 void wxPrintData::operator=(const wxPrintData& data)
 {
     m_printNoCopies = data.m_printNoCopies;


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

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

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


@@ -656,6 +778,7 @@ wxPrintDialogData::wxPrintDialogData()
     m_printAllPages = FALSE;
     m_printCollate = FALSE;
     m_printToFile = FALSE;
     m_printAllPages = FALSE;
     m_printCollate = FALSE;
     m_printToFile = FALSE;

+    m_printSelection = FALSE;

     m_printEnableSelection = FALSE;
     m_printEnablePageNumbers = TRUE;
     m_printEnablePrintToFile = TRUE;
     m_printEnableSelection = FALSE;
     m_printEnablePageNumbers = TRUE;
     m_printEnablePrintToFile = TRUE;


@@ -665,6 +788,11 @@ wxPrintDialogData::wxPrintDialogData()
 
 wxPrintDialogData::wxPrintDialogData(const wxPrintDialogData& dialogData)
 {
 
 wxPrintDialogData::wxPrintDialogData(const wxPrintDialogData& dialogData)
 {

+#ifdef __WXMSW__
+    m_printDlgData = NULL;
+#elif defined( __WXMAC__ )
+    m_macPrintInfo = NULL ;
+#endif

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


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

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

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


@@ -681,6 +811,7 @@ wxPrintDialogData::wxPrintDialogData(const wxPrintData& printData)
     m_printAllPages = FALSE;
     m_printCollate = FALSE;
     m_printToFile = FALSE;
     m_printAllPages = FALSE;
     m_printCollate = FALSE;
     m_printToFile = FALSE;

+    m_printSelection = FALSE;

     m_printEnableSelection = FALSE;
     m_printEnablePageNumbers = TRUE;
     m_printEnablePrintToFile = TRUE;
     m_printEnableSelection = FALSE;
     m_printEnablePageNumbers = TRUE;
     m_printEnablePrintToFile = TRUE;


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

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

 #endif
 }
 
 #endif
 }
 


@@ -717,8 +851,8 @@ void wxPrintDialogData::ConvertToNative()
 #ifdef __GNUWIN32__
         pd->lStructSize    = 66 ;
 #else
 #ifdef __GNUWIN32__
         pd->lStructSize    = 66 ;
 #else

-#endif

         pd->lStructSize    = sizeof(PRINTDLG);
         pd->lStructSize    = sizeof(PRINTDLG);

+#endif

         pd->hwndOwner      = (HWND)NULL;
         pd->hDevMode       = NULL; // Will be created by PrintDlg
         pd->hDevNames      = NULL; // Ditto
         pd->hwndOwner      = (HWND)NULL;
         pd->hDevMode       = NULL; // Will be created by PrintDlg
         pd->hDevNames      = NULL; // Ditto


@@ -734,11 +868,22 @@ void wxPrintDialogData::ConvertToNative()
         GlobalFree(pd->hDevMode);
     }
 
         GlobalFree(pd->hDevMode);
     }
 

-    pd->hDevMode = (HGLOBAL) m_printData.GetNativeData();
+    // Pass the devnames data to the PRINTDLG structure, since it'll
+    // be needed when PrintDlg is called.
+    if (pd->hDevNames)
+    {
+        GlobalFree(pd->hDevNames);
+    }
+
+    pd->hDevMode = (HGLOBAL)(DWORD) m_printData.GetNativeData();

 
     m_printData.SetNativeData((void*) NULL);
 
 
     m_printData.SetNativeData((void*) NULL);
 

-    wxASSERT_MSG( (pd->hDevMode), _T("hDevMode must be non-NULL in ConvertToNative!"));
+    wxASSERT_MSG( (pd->hDevMode), wxT("hDevMode must be non-NULL in ConvertToNative!"));
+
+    pd->hDevNames = (HGLOBAL)(DWORD) m_printData.GetNativeDataDevNames();
+
+    m_printData.SetNativeDataDevNames((void*) NULL);

 
     pd->hDC = (HDC) NULL;
     pd->nFromPage = (UINT)m_printFromPage;
 
     pd->hDC = (HDC) NULL;
     pd->nFromPage = (UINT)m_printFromPage;


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

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

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


@@ -768,6 +913,8 @@ void wxPrintDialogData::ConvertToNative()
 
     if ( m_printAllPages )
         pd->Flags |= PD_ALLPAGES;
 
     if ( m_printAllPages )
         pd->Flags |= PD_ALLPAGES;

+    if ( m_printAllPages )
+        pd->Flags |= PD_SELECTION;

     if ( m_printCollate )
         pd->Flags |= PD_COLLATE;
     if ( m_printToFile )
     if ( m_printCollate )
         pd->Flags |= PD_COLLATE;
     if ( m_printToFile )


@@ -796,12 +943,24 @@ void wxPrintDialogData::ConvertFromNative()
         if (m_printData.GetNativeData())
         {
             // Make sure we don't leak memory
         if (m_printData.GetNativeData())
         {
             // Make sure we don't leak memory

-            GlobalFree((HGLOBAL) m_printData.GetNativeData());
+            GlobalFree((HGLOBAL)(DWORD) m_printData.GetNativeData());

         }
         }

-        m_printData.SetNativeData((void*) pd->hDevMode);
+        m_printData.SetNativeData((void*)(long) pd->hDevMode);

         pd->hDevMode = NULL;
     }
 
         pd->hDevMode = NULL;
     }
 

+    // Pass the devnames data back to the wxPrintData structure where it really belongs.
+    if (pd->hDevNames)
+    {
+        if (m_printData.GetNativeDataDevNames())
+        {
+            // Make sure we don't leak memory
+            GlobalFree((HGLOBAL)(DWORD) m_printData.GetNativeDataDevNames());
+        }
+        m_printData.SetNativeDataDevNames((void*)(long) pd->hDevNames);
+        pd->hDevNames = NULL;
+    }
+

     // Now convert the DEVMODE object, passed down from the PRINTDLG object,
     // into wxWindows form.
     m_printData.ConvertFromNative();
     // Now convert the DEVMODE object, passed down from the PRINTDLG object,
     // into wxWindows form.
     m_printData.ConvertFromNative();


@@ -813,6 +972,7 @@ void wxPrintDialogData::ConvertFromNative()
     m_printNoCopies = pd->nCopies ;
 
     m_printAllPages = ((pd->Flags & PD_ALLPAGES) == PD_ALLPAGES);
     m_printNoCopies = pd->nCopies ;
 
     m_printAllPages = ((pd->Flags & PD_ALLPAGES) == PD_ALLPAGES);

+    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_printEnablePrintToFile = ((pd->Flags & PD_DISABLEPRINTTOFILE) != PD_DISABLEPRINTTOFILE);
     m_printCollate = ((pd->Flags & PD_COLLATE) == PD_COLLATE);
     m_printToFile = ((pd->Flags & PD_PRINTTOFILE) == PD_PRINTTOFILE);
     m_printEnablePrintToFile = ((pd->Flags & PD_DISABLEPRINTTOFILE) != PD_DISABLEPRINTTOFILE);


@@ -850,6 +1010,38 @@ void wxPrintDialogData::SetOwnerWindow(wxWindow* win)
 }
 #endif // MSW
 
 }
 #endif // MSW
 

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

 void wxPrintDialogData::operator=(const wxPrintDialogData& data)
 {
     m_printFromPage = data.m_printFromPage;
 void wxPrintDialogData::operator=(const wxPrintDialogData& data)
 {
     m_printFromPage = data.m_printFromPage;


@@ -860,6 +1052,7 @@ void wxPrintDialogData::operator=(const wxPrintDialogData& data)
     m_printAllPages = data.m_printAllPages;
     m_printCollate = data.m_printCollate;
     m_printToFile = data.m_printToFile;
     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_printEnableSelection = data.m_printEnableSelection;
     m_printEnablePageNumbers = data.m_printEnablePageNumbers;
     m_printEnableHelp = data.m_printEnableHelp;


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

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

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


@@ -904,6 +1099,11 @@ wxPageSetupDialogData::wxPageSetupDialogData()
 
 wxPageSetupDialogData::wxPageSetupDialogData(const wxPageSetupDialogData& dialogData)
 {
 
 wxPageSetupDialogData::wxPageSetupDialogData(const wxPageSetupDialogData& dialogData)
 {

+#if defined(__WIN95__)
+    m_pageSetupData = NULL;
+#elif defined( __WXMAC__ )
+    m_macPageSetupInfo = NULL ;
+#endif

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


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

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

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


@@ -940,8 +1142,13 @@ wxPageSetupDialogData::~wxPageSetupDialogData()
     PAGESETUPDLG *pd = (PAGESETUPDLG *)m_pageSetupData;
     if ( pd && pd->hDevMode )
         GlobalFree(pd->hDevMode);
     PAGESETUPDLG *pd = (PAGESETUPDLG *)m_pageSetupData;
     if ( pd && pd->hDevMode )
         GlobalFree(pd->hDevMode);

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

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

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

 #endif
 }
 
 #endif
 }
 


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

+        pd->hDevNames = NULL;

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


@@ -992,12 +1200,25 @@ void wxPageSetupDialogData::ConvertToNative()
         pd->hDevMode = NULL;
     }
 
         pd->hDevMode = NULL;
     }
 

-

     pd->hDevMode = (HGLOBAL) m_printData.GetNativeData();
 
     m_printData.SetNativeData((void*) NULL);
 
     pd->hDevMode = (HGLOBAL) m_printData.GetNativeData();
 
     m_printData.SetNativeData((void*) NULL);
 

-    wxASSERT_MSG( (pd->hDevMode), _T("hDevMode must be non-NULL in ConvertToNative!"));
+    wxASSERT_MSG( (pd->hDevMode), wxT("hDevMode must be non-NULL in ConvertToNative!"));
+
+    // Pass the devnames data (created in m_printData.ConvertToNative)
+    // to the PRINTDLG structure, since it'll
+    // be needed when PrintDlg is called.
+
+    if (pd->hDevNames)
+    {
+        GlobalFree(pd->hDevNames);
+        pd->hDevNames = NULL;
+    }
+
+    pd->hDevNames = (HGLOBAL) m_printData.GetNativeDataDevNames();
+
+    m_printData.SetNativeDataDevNames((void*) NULL);

 
 //        pd->hDevMode = GlobalAlloc(GMEM_MOVEABLE, sizeof(DEVMODE));
 
 
 //        pd->hDevMode = GlobalAlloc(GMEM_MOVEABLE, sizeof(DEVMODE));
 


@@ -1023,7 +1244,7 @@ void wxPageSetupDialogData::ConvertToNative()
 
     pd->lStructSize = sizeof( PAGESETUPDLG );
     pd->hwndOwner=(HWND)NULL;
 
     pd->lStructSize = sizeof( PAGESETUPDLG );
     pd->hwndOwner=(HWND)NULL;

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

     pd->hInstance=(HINSTANCE)NULL;
 
     pd->ptPaperSize.x = m_paperSize.x * 100;
     pd->hInstance=(HINSTANCE)NULL;
 
     pd->ptPaperSize.x = m_paperSize.x * 100;


@@ -1078,6 +1299,20 @@ void wxPageSetupDialogData::ConvertFromNative()
 
     m_printData.ConvertFromNative();
 
 
     m_printData.ConvertFromNative();
 

+    // Pass the devnames data back to the wxPrintData structure where it really belongs.
+    if (pd->hDevNames)
+    {
+        if (m_printData.GetNativeDataDevNames())
+        {
+            // Make sure we don't leak memory
+            GlobalFree((HGLOBAL) m_printData.GetNativeDataDevNames());
+        }
+        m_printData.SetNativeDataDevNames((void*) pd->hDevNames);
+        pd->hDevNames = NULL;
+    }
+
+    m_printData.ConvertFromNative();
+

     pd->Flags = PSD_MARGINS|PSD_MINMARGINS;
 
     m_defaultMinMargins = ((pd->Flags & PSD_DEFAULTMINMARGINS) == PSD_DEFAULTMINMARGINS);
     pd->Flags = PSD_MARGINS|PSD_MINMARGINS;
 
     m_defaultMinMargins = ((pd->Flags & PSD_DEFAULTMINMARGINS) == PSD_DEFAULTMINMARGINS);


@@ -1115,6 +1350,69 @@ void wxPageSetupDialogData::SetOwnerWindow(wxWindow* win)
 }
 #endif // Win95
 
 }
 #endif // Win95
 

+#ifdef __WXMAC__
+void wxPageSetupDialogData::ConvertToNative()
+{
+    if ( !m_macPageSetupInfo )
+    {
+        m_macPageSetupInfo = (THPrint) NewHandleClear( sizeof( TPrint ) ) ;
+        if ( m_macPageSetupInfo )
+        {
+            ::PrintDefault( m_macPageSetupInfo ) ;
+        }
+    }
+    if ( m_macPageSetupInfo )
+    {
+        // on mac the paper rect has a negative top left corner, because the page rect (printable area) is at 0,0
+        (**m_macPageSetupInfo).rPaper.left = int( ((double) m_minMarginTopLeft.x)*mm2pt ) ;
+        (**m_macPageSetupInfo).rPaper.top = int( ((double) m_minMarginTopLeft.y)*mm2pt ) ;
+
+        (**m_macPageSetupInfo).rPaper.right = int( ((double) m_paperSize.x - m_minMarginTopLeft.x)*mm2pt ) ;
+        (**m_macPageSetupInfo).rPaper.bottom = int( ((double) m_paperSize.y - m_minMarginTopLeft.y)*mm2pt ) ;
+
+        (**m_macPageSetupInfo).prInfo.rPage.left = 0 ;
+        (**m_macPageSetupInfo).prInfo.rPage.top = 0 ;
+        (**m_macPageSetupInfo).prInfo.rPage.right =  int( ((double) m_paperSize.x - m_minMarginTopLeft.x - m_minMarginBottomRight.x)*mm2pt ) ;
+        (**m_macPageSetupInfo).prInfo.rPage.bottom =  int( ((double) m_paperSize.y - m_minMarginTopLeft.y - m_minMarginBottomRight.y)*mm2pt ) ;
+
+        //TODO add custom fields in dialog for margins
+
+    }
+}
+
+void wxPageSetupDialogData::ConvertFromNative()
+{
+    if ( m_macPageSetupInfo )
+    {
+        m_paperSize.x = ((double) (**m_macPageSetupInfo).rPaper.right - (**m_macPageSetupInfo).rPaper.left ) * pt2mm ;
+        m_paperSize.y = ((double) (**m_macPageSetupInfo).rPaper.bottom - (**m_macPageSetupInfo).rPaper.top ) * pt2mm ;
+
+        m_minMarginTopLeft.x = ((double) -(**m_macPageSetupInfo).rPaper.left ) * pt2mm ;
+        m_minMarginTopLeft.y = ((double) -(**m_macPageSetupInfo).rPaper.top ) * pt2mm ;
+
+        m_minMarginBottomRight.x = ((double) (**m_macPageSetupInfo).rPaper.right - (**m_macPageSetupInfo).prInfo.rPage.right ) * pt2mm ;
+        m_minMarginBottomRight.y = ((double)(**m_macPageSetupInfo).rPaper.bottom - (**m_macPageSetupInfo).prInfo.rPage.bottom ) * pt2mm ;
+
+        // adjust minimal values
+        //TODO add custom fields in dialog for margins
+
+        if ( m_marginTopLeft.x < m_minMarginTopLeft.x )
+            m_marginTopLeft.x = m_minMarginTopLeft.x ;
+
+        if ( m_marginBottomRight.x < m_minMarginBottomRight.x )
+            m_marginBottomRight.x = m_minMarginBottomRight.x ;
+
+        if ( m_marginTopLeft.y < m_minMarginTopLeft.y )
+            m_marginTopLeft.y = m_minMarginTopLeft.y ;
+
+        if ( m_marginBottomRight.y < m_minMarginBottomRight.y )
+            m_marginBottomRight.y = m_minMarginBottomRight.y ;
+
+    }
+}
+#endif
+
+

 // 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)
 // 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)


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

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

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


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

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

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


@@ -1166,3 +1464,4 @@ void wxPageSetupDialogData::CalculatePaperSizeFromId()
     }
 }
 
     }
 }
 

+#endif // wxUSE_PRINTING_ARCHITECTURE