conditional compilation for Universal Interfaces (3.4 or later)

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

diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp
index 523c9841b6fde5ec6c9fc0b8e117738354c817f6..741840dc8a1fe179ab3943e73d1b0a1b9ccc652f 100644 (file)
--- a/src/common/cmndata.cpp
+++ b/src/common/cmndata.cpp
@@ -40,7 +40,7 @@
 #include "wx/log.h"
 
 // For compatibility
 #include "wx/log.h"
 
 // For compatibility

-#if (defined(__WXMOTIF__) || defined(__WXGTK__) || defined(__WXPM__)) && wxUSE_POSTSCRIPT
+#if (defined(__WXMOTIF__) || defined(__WXGTK__) || defined(__WXPM__) || defined(__WXMAC__)) && wxUSE_POSTSCRIPT

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


@@ -181,7 +181,7 @@ wxPrintData::wxPrintData()
     m_macPrintSettings = kPMNoPrintSettings;
 #else
        m_macPrintInfo = (THPrint) NewHandleClear( sizeof( TPrint ) ) ;
     m_macPrintSettings = kPMNoPrintSettings;
 #else
        m_macPrintInfo = (THPrint) NewHandleClear( sizeof( TPrint ) ) ;

-       (**m_macPrintInfo).iPrVersion = 0;                                      // something invalid 
+       (**m_macPrintInfo).iPrVersion = 0;                                      // something invalid

 
        (**m_macPrintInfo).prInfo.iHRes = 72;
        (**m_macPrintInfo).prInfo.iVRes = 72;
 
        (**m_macPrintInfo).prInfo.iHRes = 72;
        (**m_macPrintInfo).prInfo.iVRes = 72;


@@ -190,8 +190,8 @@ wxPrintData::wxPrintData()
 
        Rect r2 = { -18, -36, 8*72 - 18, 11*72 - 36  } ;
        (**m_macPrintInfo).rPaper = r2;
 
        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 
+       (**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
 #endif
     m_printOrientation = wxPORTRAIT;
 #endif
 #endif
     m_printOrientation = wxPORTRAIT;


@@ -259,7 +259,7 @@ wxPrintData::~wxPrintData()
     }
 #else
        wxASSERT( m_macPrintInfo ) ;
     }
 #else
        wxASSERT( m_macPrintInfo ) ;

-       // we should perhaps delete 
+       // we should perhaps delete

 #endif
 #endif
 }
 #endif
 #endif
 }


@@ -915,11 +915,11 @@ void wxPrintDialogData::ConvertToNative()
     m_printData.SetNativeDataDevNames((void*) NULL);
 
     pd->hDC = (HDC) NULL;
     m_printData.SetNativeDataDevNames((void*) NULL);
 
     pd->hDC = (HDC) NULL;

-    pd->nFromPage = (UINT)m_printFromPage;
-    pd->nToPage = (UINT)m_printToPage;
-    pd->nMinPage = (UINT)m_printMinPage;
-    pd->nMaxPage = (UINT)m_printMaxPage;
-    pd->nCopies = (UINT)m_printNoCopies;
+    pd->nFromPage = (WORD)m_printFromPage;
+    pd->nToPage = (WORD)m_printToPage;
+    pd->nMinPage = (WORD)m_printMinPage;
+    pd->nMaxPage = (WORD)m_printMaxPage;
+    pd->nCopies = (WORD)m_printNoCopies;

 
     pd->Flags = PD_RETURNDC ;
 
 
     pd->Flags = PD_RETURNDC ;