#include "wx/log.h"
// For compatibility
-#if (defined(__WXMOTIF__) || defined(__WXGTK__) || defined(__WXPM__) || defined(__WXMAC__)) && wxUSE_POSTSCRIPT
+#if (defined(__WXMOTIF__) || defined(__WXGTK__) || defined(__WXX11__)|| defined(__WXPM__) || defined(__WXMAC__)) && wxUSE_POSTSCRIPT
#define wxCOMPATIBILITY_WITH_PRINTSETUPDATA 1
#endif
IMPLEMENT_DYNAMIC_CLASS(wxColourData, wxObject)
#ifdef __WXMAC__
+ #include "wx/mac/uma.h"
+
+#if defined(TARGET_CARBON) && !defined(__DARWIN__)
+# if PM_USE_SESSION_APIS
+# include <PMCore.h>
+# endif
+# include <PMApplication.h>
+#endif
+
+#ifndef __DARWIN__
+ #include "Printing.h"
+#endif
#define mm2pt 2.83464566929
#define pt2mm 0.352777777778
#endif // Mac
}
wxColourData::wxColourData(const wxColourData& data)
+ : wxObject()
{
(*this) = data;
}
{
}
-void wxColourData::SetCustomColour(int i, wxColour& colour)
+void wxColourData::SetCustomColour(int i, const wxColour& colour)
{
if (i > 15 || i < 0)
return;
#if TARGET_CARBON
m_macPageFormat = kPMNoPageFormat;
m_macPrintSettings = kPMNoPrintSettings;
+
+ #if PM_USE_SESSION_APIS
+ PMPrintSession macPrintSession = kPMNoReference;
+ OSStatus err;
+
+ err = ::UMAPrOpen(&macPrintSession) ;
+ if ( err == noErr )
+ {
+ err = PMCreatePageFormat((PMPageFormat *)&m_macPageFormat);
+
+ // Note that PMPageFormat is not session-specific, but calling
+ // PMSessionDefaultPageFormat assigns values specific to the printer
+ // associated with the current printing session.
+ if ((err == noErr) && (m_macPageFormat != kPMNoPageFormat))
+ {
+ err = PMSessionDefaultPageFormat((PMPrintSession)macPrintSession,
+ (PMPageFormat)m_macPageFormat);
+ }
+
+ err = PMCreatePrintSettings((PMPrintSettings *)&m_macPrintSettings);
+
+ // Note that PMPrintSettings is not session-specific, but calling
+ // PMSessionDefaultPrintSettings assigns values specific to the printer
+ // associated with the current printing session.
+ if ((err == noErr) && (m_macPrintSettings != kPMNoPrintSettings))
+ {
+ err = PMSessionDefaultPrintSettings((PMPrintSession)macPrintSession,
+ (PMPrintSettings)m_macPrintSettings);
+ }
+ }
+ ::UMAPrClose(&macPrintSession) ;
+ #endif
#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
+ m_macPrintSettings = (THPrint) NewHandleClear( sizeof( TPrint ) );
+ (**(THPrint)m_macPrintSettings).iPrVersion = 0; // something invalid
+
+ (**(THPrint)m_macPrintSettings).prInfo.iHRes = 72;
+ (**(THPrint)m_macPrintSettings).prInfo.iVRes = 72;
+ Rect r1 = { 0, 0, 8*72 - 2 * 18, 11*72 - 2 * 36 };
+ (**(THPrint)m_macPrintSettings).prInfo.rPage = r1;// must have its top left & (0,0)
+
+ Rect r2 = { -18, -36, 8*72 - 18, 11*72 - 36 };
+ (**(THPrint)m_macPrintSettings).rPaper = r2;
+ (**(THPrint)m_macPrintSettings).prStl.iPageV = 11 * 120 ; // 11 inches in 120th of an inch
+ (**(THPrint)m_macPrintSettings).prStl.iPageH = 8 * 120 ; // 8 inches in 120th of an inch
#endif
#endif
m_printOrientation = wxPORTRAIT;
}
wxPrintData::wxPrintData(const wxPrintData& printData)
+ : wxObject()
{
#ifdef __WXMSW__
m_devMode = (void*) NULL;
m_devNames = (void*) NULL;
#elif defined( __WXMAC__ )
#if TARGET_CARBON
- m_macPageFormat = kPMNoPageFormat;
+ m_macPageFormat = kPMNoPageFormat;
m_macPrintSettings = kPMNoPrintSettings;
#else
- m_macPrintInfo = NULL ;
+ m_macPrintSettings = NULL;
#endif
#endif
(*this) = printData;
#if TARGET_CARBON
if (m_macPageFormat != kPMNoPageFormat)
{
- (void)PMDisposePageFormat(m_macPageFormat);
- 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
+ wxASSERT( m_macPrintSettings );
+ // we should perhaps delete
#endif
#endif
}
static HGLOBAL wxCreateDevNames(const wxString& driverName, const wxString& printerName, const wxString& portName)
{
- HGLOBAL hDev = NULL;
- // if (!driverName.IsEmpty() && !printerName.IsEmpty() && !portName.IsEmpty())
+ 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);
+ {
+ hDev = GlobalAlloc(GPTR, 4*sizeof(WORD)+
+ ( driverName.Length() + 1 +
+ printerName.Length() + 1 +
+ portName.Length()+1 ) * sizeof(wxChar) );
+ LPDEVNAMES lpDev = (LPDEVNAMES)GlobalLock(hDev);
+ lpDev->wDriverOffset = sizeof(WORD)*4;
+ wxStrcpy((wxChar*)((char*)lpDev + lpDev->wDriverOffset ), driverName);
- lpDev->wDeviceOffset = (WORD)(lpDev->wDriverOffset + driverName.Length()+1);
- wxStrcpy((wxChar*)lpDev + lpDev->wDeviceOffset, printerName);
+ lpDev->wDeviceOffset = (WORD)( lpDev->wDriverOffset +
+ sizeof(wxChar) * ( driverName.Length() + 1 ) );
+ wxStrcpy((wxChar*)((char*)lpDev + lpDev->wDeviceOffset ), printerName);
- lpDev->wOutputOffset = (WORD)(lpDev->wDeviceOffset + printerName.Length()+1);
- wxStrcpy((wxChar*)lpDev + lpDev->wOutputOffset, portName);
+ lpDev->wOutputOffset = (WORD)( lpDev->wDeviceOffset +
+ sizeof(wxChar) * ( printerName.Length() + 1 ) );
+ wxStrcpy((wxChar*)((char*) lpDev + lpDev->wOutputOffset ), portName);
- lpDev->wDefault = 0;
+ lpDev->wDefault = 0;
GlobalUnlock(hDev);
- }
- return hDev;
+ }
+
+ return hDev;
}
void wxPrintData::ConvertToNative()
if (!hDevMode)
{
// Use PRINTDLG as a way of creating a DEVMODE object
- PRINTDLG *pd = new PRINTDLG;
+ PRINTDLG pd;
// GNU-WIN32 has the wrong size PRINTDLG - can't work out why.
#ifdef __GNUWIN32__
- memset(pd, 0, 66);
- pd->lStructSize = 66 ;
+ memset(&pd, 0, 66);
+ pd.lStructSize = 66;
#else
- memset(pd, 0, sizeof(PRINTDLG));
- pd->lStructSize = sizeof(PRINTDLG);
+ memset(&pd, 0, sizeof(PRINTDLG));
+ pd.lStructSize = sizeof(PRINTDLG);
#endif
- pd->hwndOwner = (HWND)NULL;
- pd->hDevMode = NULL; // Will be created by PrintDlg
- pd->hDevNames = NULL; // Ditto
- pd->hInstance = (HINSTANCE) wxGetInstance();
+ pd.hwndOwner = (HWND)NULL;
+ pd.hDevMode = NULL; // Will be created by PrintDlg
+ pd.hDevNames = NULL; // Ditto
+ //pd.hInstance = (HINSTANCE) wxGetInstance();
- pd->Flags = PD_RETURNDEFAULT;
- pd->nCopies = 1;
+ pd.Flags = PD_RETURNDEFAULT;
+ pd.nCopies = 1;
// Fill out the DEVMODE structure
// so we can use it as input in the 'real' PrintDlg
- if (!PrintDlg(pd))
+ if (!PrintDlg(&pd))
{
- if ( pd->hDevMode )
- GlobalFree(pd->hDevMode);
- if ( pd->hDevNames )
- GlobalFree(pd->hDevNames);
- pd->hDevMode = NULL;
- pd->hDevNames = NULL;
+ if ( pd.hDevMode )
+ GlobalFree(pd.hDevMode);
+ if ( pd.hDevNames )
+ GlobalFree(pd.hDevNames);
+ pd.hDevMode = NULL;
+ pd.hDevNames = NULL;
#if defined(__WXDEBUG__) && defined(__WIN32__)
wxString str(wxT("Printing error: "));
}
else
{
- hDevMode = pd->hDevMode;
+ hDevMode = pd.hDevMode;
m_devMode = (void*)(long) hDevMode;
- pd->hDevMode = NULL;
+ 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;
// hDevNames = pd->hDevNames;
// m_devNames = (void*)(long) hDevNames;
// pd->hDevnames = NULL;
}
-
- delete pd;
}
if ( hDevMode )
if (m_printerName != wxT(""))
{
- // TODO: make this Unicode compatible
- int len = wxMin(31, m_printerName.Len());
- int i;
- for (i = 0; i < len; i++)
- devMode->dmDeviceName[i] = m_printerName.GetChar(i);
- devMode->dmDeviceName[i] = 0;
+ //int len = wxMin(31, m_printerName.Len());
+ wxStrncpy((wxChar*)devMode->dmDeviceName,m_printerName.c_str(),31);
+ devMode->dmDeviceName[31] = wxT('\0');
}
//// Colour
if (m_paperId == wxPAPER_NONE)
{
- // DEVMODE is in tenths of a milimeter
+ // DEVMODE is in tenths of a milimeter
devMode->dmPaperWidth = m_paperSize.x * 10;
devMode->dmPaperLength = m_paperSize.y * 10;
devMode->dmPaperSize = DMPAPER_USER;
}
// TODO: I hope it's OK to pass some empty strings to DEVNAMES.
- m_devNames = (void*) (long) wxCreateDevNames("", m_printerName, "");
+ m_devNames = (void*) (long) wxCreateDevNames(wxT(""), m_printerName, wxT(""));
}
void wxPrintData::ConvertFromNative()
#ifndef __WXWINE__
//// Paper size
- if (devMode->dmFields & DM_PAPERSIZE)
+ // We don't know size of user defined paper and some buggy drivers
+ // set both DM_PAPERSIZE and DM_PAPERWIDTH & DM_PAPERLENGTH. Since
+ // dmPaperSize >= DMPAPER_USER wouldn't be in wxWin's database, this
+ // code wouldn't set m_paperSize correctly.
+ if ((devMode->dmFields & DM_PAPERSIZE) && (devMode->dmPaperSize < DMPAPER_USER))
{
if (wxThePrintPaperDatabase)
{
if (paper)
{
m_paperId = paper->GetId();
- m_paperSize.x = paper->GetWidth() / 10 ;
- m_paperSize.y = paper->GetHeight() / 10 ;
+ m_paperSize.x = paper->GetWidth() / 10;
+ m_paperSize.y = paper->GetHeight() / 10;
}
else
{
}
else if ((devMode->dmFields & DM_PAPERWIDTH) && (devMode->dmFields & DM_PAPERLENGTH))
{
- // DEVMODE is in tenths of a milimeter
+ // DEVMODE is in tenths of a milimeter
m_paperSize.x = devMode->dmPaperWidth / 10;
m_paperSize.y = devMode->dmPaperLength / 10;
m_paperId = wxPAPER_NONE;
// m_printData.SetPortName((LPSTR)lpDevNames + lpDevNames->wDriverOffset);
// Get the printer name
- wxString printerName = (LPSTR)lpDevNames + lpDevNames->wDeviceOffset;
+ wxString printerName = (LPTSTR)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!");
#ifdef __WXMAC__
void wxPrintData::ConvertToNative()
{
-#ifdef TARGET_CARBON
+#if TARGET_CARBON
#else
- (**m_macPrintInfo).prJob.iCopies = m_printNoCopies ;
+ (**(THPrint)m_macPrintSettings).prJob.iCopies = m_printNoCopies;
#endif
}
void wxPrintData::ConvertFromNative()
{
-#ifdef TARGET_CARBON
+#if TARGET_CARBON
#else
- m_printNoCopies = (**m_macPrintInfo).prJob.iCopies ;
+ m_printNoCopies = (**(THPrint)m_macPrintSettings).prJob.iCopies;
#endif
}
#endif
void wxPrintData::operator=(const wxPrintData& data)
{
#ifdef __WXMAC__
-#ifdef TARGET_CARBON
+#if TARGET_CARBON
#else
- m_macPrintInfo = data.m_macPrintInfo ;
- HandToHand( (Handle*) &m_macPrintInfo ) ;
+ m_macPrintSettings = data.m_macPrintSettings;
+ HandToHand( (Handle*) &m_macPrintSettings );
#endif
#endif
m_printNoCopies = data.m_printNoCopies;
}
#endif // wxCOMPATIBILITY_WITH_PRINTSETUPDATA
+// Is this data OK for showing the print dialog?
+bool wxPrintData::Ok() const
+{
+#ifdef __WXMSW__
+ ((wxPrintData*)this)->ConvertToNative();
+ return (m_devMode != NULL) ;
+#else
+ return TRUE;
+#endif
+}
// ----------------------------------------------------------------------------
// Print dialog data
}
wxPrintDialogData::wxPrintDialogData(const wxPrintDialogData& dialogData)
+ : wxObject()
{
#ifdef __WXMSW__
m_printDlgData = NULL;
if (!pd)
{
pd = new PRINTDLG;
+ memset( pd, 0, sizeof(PRINTDLG) );
m_printDlgData = (void*) pd;
// GNU-WIN32 has the wrong size PRINTDLG - can't work out why.
#ifdef __GNUWIN32__
- pd->lStructSize = 66 ;
+ pd->lStructSize = 66;
#else
pd->lStructSize = sizeof(PRINTDLG);
#endif
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();
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;
#ifdef __GNUWIN32__
- pd->lStructSize = 66 ;
+ pd->lStructSize = 66;
#else
pd->lStructSize = sizeof( PRINTDLG );
#endif
if ( m_printAllPages )
pd->Flags |= PD_ALLPAGES;
- if ( m_printAllPages )
+ if ( m_printSelection )
pd->Flags |= PD_SELECTION;
if ( m_printCollate )
pd->Flags |= PD_COLLATE;
// into wxWindows form.
m_printData.ConvertFromNative();
- m_printFromPage = pd->nFromPage ;
- m_printToPage = pd->nToPage ;
- m_printMinPage = pd->nMinPage ;
- m_printMaxPage = pd->nMaxPage ;
- m_printNoCopies = pd->nCopies ;
+ m_printFromPage = pd->nFromPage;
+ m_printToPage = pd->nToPage;
+ m_printMinPage = pd->nMinPage;
+ m_printMaxPage = pd->nMaxPage;
+ m_printNoCopies = pd->nCopies;
m_printAllPages = ((pd->Flags & PD_ALLPAGES) == PD_ALLPAGES);
m_printSelection = ((pd->Flags & PD_SELECTION) == PD_SELECTION);
if ( m_printDlgData != NULL && win != NULL)
{
- PRINTDLG *pd = (PRINTDLG *) m_printDlgData ;
+ PRINTDLG *pd = (PRINTDLG *) m_printDlgData;
pd->hwndOwner=(HWND) win->GetHWND();
}
}
#ifdef __WXMAC__
void wxPrintDialogData::ConvertToNative()
{
-#ifdef TARGET_CARBON
+#if TARGET_CARBON
#else
- (**m_printData.m_macPrintInfo).prJob.iFstPage = m_printFromPage ;
- (**m_printData.m_macPrintInfo).prJob.iLstPage = m_printToPage ;
- m_printData.ConvertToNative() ;
+ (**(THPrint)m_printData.m_macPrintSettings).prJob.iFstPage = m_printFromPage;
+ (**(THPrint)m_printData.m_macPrintSettings).prJob.iLstPage = m_printToPage;
+ m_printData.ConvertToNative();
#endif
}
void wxPrintDialogData::ConvertFromNative()
{
-#ifdef TARGET_CARBON
+#if TARGET_CARBON
#else
- m_printData.ConvertFromNative() ;
- m_printFromPage = (**m_printData.m_macPrintInfo).prJob.iFstPage ;
- m_printToPage = (**m_printData.m_macPrintInfo).prJob.iLstPage ;
+ m_printData.ConvertFromNative();
+ m_printFromPage = (**(THPrint)m_printData.m_macPrintSettings).prJob.iFstPage;
+ m_printToPage = (**(THPrint)m_printData.m_macPrintSettings).prJob.iLstPage;
#endif
}
#endif
}
wxPageSetupDialogData::wxPageSetupDialogData(const wxPageSetupDialogData& dialogData)
+ : wxObject()
{
#if defined(__WIN95__)
m_pageSetupData = NULL;
#endif
}
-void wxPageSetupDialogData::operator=(const wxPageSetupDialogData& data)
+wxPageSetupDialogData& wxPageSetupDialogData::operator=(const wxPageSetupDialogData& data)
{
m_paperSize = data.m_paperSize;
m_minMarginTopLeft = data.m_minMarginTopLeft;
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;
+
+ return *this;
}
#if defined(__WIN95__)
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
pd->hwndOwner=(HWND)NULL;
// pd->hDevNames=(HWND)NULL;
pd->hInstance=(HINSTANCE)NULL;
- // PAGESETUPDLG is in hundreds of a mm
+ // PAGESETUPDLG is in hundreds of a mm
pd->ptPaperSize.x = m_paperSize.x * 100;
pd->ptPaperSize.y = m_paperSize.y * 100;
void wxPageSetupDialogData::ConvertFromNative()
{
- PAGESETUPDLG *pd = (PAGESETUPDLG *) m_pageSetupData ;
+ PAGESETUPDLG *pd = (PAGESETUPDLG *) m_pageSetupData;
if ( !pd )
return;
m_getDefaultInfo = ((pd->Flags & PSD_RETURNDEFAULT) == PSD_RETURNDEFAULT);
m_enableHelp = ((pd->Flags & PSD_SHOWHELP) == PSD_SHOWHELP);
- // PAGESETUPDLG is in hundreds of a mm
+ // PAGESETUPDLG is in hundreds of a mm
m_paperSize.x = pd->ptPaperSize.x / 100;
m_paperSize.y = pd->ptPaperSize.y / 100;
m_minMarginBottomRight.x = pd->rtMinMargin.right / 100;
m_minMarginBottomRight.y = pd->rtMinMargin.bottom / 100;
- m_marginTopLeft.x = pd->rtMargin.left / 100 ;
- m_marginTopLeft.y = pd->rtMargin.top / 100 ;
- m_marginBottomRight.x = pd->rtMargin.right / 100 ;
- m_marginBottomRight.y = pd->rtMargin.bottom / 100 ;
+ m_marginTopLeft.x = pd->rtMargin.left / 100;
+ m_marginTopLeft.y = pd->rtMargin.top / 100;
+ m_marginBottomRight.x = pd->rtMargin.right / 100;
+ m_marginBottomRight.y = pd->rtMargin.bottom / 100;
}
void wxPageSetupDialogData::SetOwnerWindow(wxWindow* win)
if ( m_pageSetupData != NULL && win != NULL)
{
- PAGESETUPDLG *pd = (PAGESETUPDLG *) m_pageSetupData ;
+ PAGESETUPDLG *pd = (PAGESETUPDLG *) m_pageSetupData;
pd->hwndOwner=(HWND) win->GetHWND();
}
}
#ifdef __WXMAC__
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
+ m_printData.ConvertToNative();
+ // on mac the paper rect has a negative top left corner, because the page rect (printable area) is at 0,0
+#if 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 ) ;
+ (**(THPrint)m_printData.m_macPrintSettings).rPaper.left = int( ((double) m_minMarginTopLeft.x)*mm2pt );
+ (**(THPrint)m_printData.m_macPrintSettings).rPaper.top = int( ((double) m_minMarginTopLeft.y)*mm2pt );
+
+ (**(THPrint)m_printData.m_macPrintSettings).rPaper.right = int( ((double) m_paperSize.x - m_minMarginTopLeft.x)*mm2pt );
+ (**(THPrint)m_printData.m_macPrintSettings).rPaper.bottom = int( ((double) m_paperSize.y - m_minMarginTopLeft.y)*mm2pt );
+
+ (**(THPrint)m_printData.m_macPrintSettings).prInfo.rPage.left = 0;
+ (**(THPrint)m_printData.m_macPrintSettings).prInfo.rPage.top = 0;
+ (**(THPrint)m_printData.m_macPrintSettings).prInfo.rPage.right = int( ((double) m_paperSize.x - m_minMarginTopLeft.x - m_minMarginBottomRight.x)*mm2pt );
+ (**(THPrint)m_printData.m_macPrintSettings).prInfo.rPage.bottom = int( ((double) m_paperSize.y - m_minMarginTopLeft.y - m_minMarginBottomRight.y)*mm2pt );
#endif
}
void wxPageSetupDialogData::ConvertFromNative()
{
- m_printData.ConvertFromNative () ;
+ m_printData.ConvertFromNative ();
-#ifdef TARGET_CARBON
+#if 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 ;
+ m_paperSize.x = ((double) (**(THPrint)m_printData.m_macPrintSettings).rPaper.right - (**(THPrint)m_printData.m_macPrintSettings).rPaper.left ) * pt2mm;
+ m_paperSize.y = ((double) (**(THPrint)m_printData.m_macPrintSettings).rPaper.bottom - (**(THPrint)m_printData.m_macPrintSettings).rPaper.top ) * pt2mm;
+
+ m_minMarginTopLeft.x = ((double) -(**(THPrint)m_printData.m_macPrintSettings).rPaper.left ) * pt2mm;
+ m_minMarginTopLeft.y = ((double) -(**(THPrint)m_printData.m_macPrintSettings).rPaper.top ) * pt2mm;
+
+ m_minMarginBottomRight.x = ((double) (**(THPrint)m_printData.m_macPrintSettings).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;
#endif
- // 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 ;
+ // 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
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
projects / wxWidgets.git / blobdiff