X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/0ba344c712c77e4a6c7b94263b6f39ab22069039..a148cfb64451d6553cf66d1075b654e54e908210:/src/common/cmndata.cpp

diff --git a/src/common/cmndata.cpp b/src/common/cmndata.cpp
index fa729d693f..1483326154 100644
--- a/src/common/cmndata.cpp
+++ b/src/common/cmndata.cpp
@@ -56,11 +56,6 @@
         #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>
@@ -485,10 +480,7 @@ void wxPrintData::ConvertToNative()
 
         //// Orientation
 
-#ifndef __WXWINE__
         devMode->dmOrientation = m_printOrientation;
-#endif
-        devMode->dmFields = DM_ORIENTATION;
 
         //// Collation
 
@@ -520,7 +512,6 @@ void wxPrintData::ConvertToNative()
 
         devMode->dmFields |= DM_COLOR;
 
-#ifndef __WXWINE__
         //// Paper size
 
         if (m_paperId == wxPAPER_NONE)
@@ -544,7 +535,6 @@ void wxPrintData::ConvertToNative()
                 }
             }
         }
-#endif
 
         //// Duplex
 
@@ -613,12 +603,10 @@ void wxPrintData::ConvertFromNative()
     {
         LPDEVMODE devMode = (LPDEVMODE)GlobalLock(hDevMode);
 
-#ifndef __WXWINE__
         //// Orientation
 
         if (devMode->dmFields & DM_ORIENTATION)
             m_printOrientation = devMode->dmOrientation;
-#endif
 
         //// Collation
 
@@ -658,7 +646,6 @@ void wxPrintData::ConvertFromNative()
         else
             m_colour = TRUE;
 
-#ifndef __WXWINE__
         //// Paper size
 
         // We don't know size of user defined paper and some buggy drivers
@@ -712,7 +699,6 @@ void wxPrintData::ConvertFromNative()
             m_paperSize.y = 0;
             m_paperId = wxPAPER_NONE;
         }
-#endif
 
         //// Duplex
 
@@ -1481,11 +1467,11 @@ void wxPageSetupDialogData::ConvertFromNative()
 	OSStatus err = PMGetAdjustedPaperRect((PMPageFormat)m_printData.m_macPageFormat, &rPaper);
     if ( err == noErr )
     {
-	    m_paperSize.x = ((double) rPaper.right - rPaper.left ) * pt2mm;
-	    m_paperSize.y = ((double) rPaper.bottom - rPaper.top ) * pt2mm;
+	    m_paperSize.x = (int)(((double) rPaper.right - rPaper.left ) * pt2mm);
+	    m_paperSize.y = (int)(((double) rPaper.bottom - rPaper.top ) * pt2mm);
 
-	    m_minMarginTopLeft.x = ((double) - rPaper.left ) * pt2mm;
-	    m_minMarginTopLeft.y = ((double) - rPaper.top ) * pt2mm;
+	    m_minMarginTopLeft.x = (int)(((double) - rPaper.left ) * pt2mm);
+	    m_minMarginTopLeft.y = (int)(((double) - rPaper.top ) * pt2mm);
 
 //	    m_minMarginBottomRight.x = ((double) rPaper.right - (**(THPrint)m_printData.m_macPrintSettings).prInfo.rPage.right ) * pt2mm;
 //	    m_minMarginBottomRight.y = ((double)(**(THPrint)m_printData.m_macPrintSettings).rPaper.bottom - (**(THPrint)m_printData.m_macPrintSettings).prInfo.rPage.bottom ) * pt2mm;