Chianti, Pinot noir, WINE..
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@2717 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -61,6 +61,11 @@
|
||||
#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>
|
||||
@@ -319,7 +324,9 @@ void wxPrintData::ConvertToNative()
|
||||
|
||||
//// Orientation
|
||||
|
||||
#ifndef __WXWINE__
|
||||
devMode->dmOrientation = m_printOrientation;
|
||||
#endif
|
||||
devMode->dmFields = DM_ORIENTATION;
|
||||
|
||||
//// Collation
|
||||
@@ -353,6 +360,7 @@ void wxPrintData::ConvertToNative()
|
||||
|
||||
devMode->dmFields |= DM_COLOR;
|
||||
|
||||
#ifndef __WXWINE__
|
||||
//// Paper size
|
||||
|
||||
if (m_paperId == wxPAPER_NONE)
|
||||
@@ -374,6 +382,7 @@ void wxPrintData::ConvertToNative()
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
//// Duplex
|
||||
|
||||
@@ -433,10 +442,12 @@ void wxPrintData::ConvertFromNative()
|
||||
{
|
||||
DEVMODE *devMode = (DEVMODE*) GlobalLock(hDevMode);
|
||||
|
||||
#ifndef __WXWINE__
|
||||
//// Orientation
|
||||
|
||||
if (devMode->dmFields & DM_ORIENTATION)
|
||||
m_printOrientation = devMode->dmOrientation;
|
||||
#endif
|
||||
|
||||
//// Collation
|
||||
|
||||
@@ -484,6 +495,7 @@ void wxPrintData::ConvertFromNative()
|
||||
else
|
||||
m_colour = TRUE;
|
||||
|
||||
#ifndef __WXWINE__
|
||||
//// Paper size
|
||||
|
||||
if (devMode->dmFields & DM_PAPERSIZE)
|
||||
@@ -532,7 +544,7 @@ void wxPrintData::ConvertFromNative()
|
||||
m_paperSize.y = 0;
|
||||
m_paperId = wxPAPER_NONE;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
//// Duplex
|
||||
|
||||
|
Reference in New Issue
Block a user