Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

setting origin to printable area for wxMac

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19928 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2003-04-02 08:21:29 +00:00
parent 8ea5271ee7
commit aa812de01b
2 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/mac/carbon/dcprint.cpp
View File

@@ -145,9 +145,9 @@ wxPrinterDC::wxPrinterDC(const wxPrintData& printdata)
m_ok = TRUE ; m_ok = TRUE ;
m_minY = m_minX = 0 ; m_minY = m_minX = 0 ;
#if TARGET_CARBON #if TARGET_CARBON
PMRect rPaper; PMRect rPage;
err = PMGetAdjustedPaperRect((PMPageFormat)m_printData.m_macPageFormat, &rPaper); err = PMGetAdjustedPageRect((PMPageFormat)m_printData.m_macPageFormat, &rPage);
if ( err != noErr ) if ( err != noErr )
{ {
message.Printf( wxT("Print Error %ld"), err ) ; message.Printf( wxT("Print Error %ld"), err ) ;
@@ -161,11 +161,11 @@ wxPrinterDC::wxPrinterDC(const wxPrintData& printdata)
m_ok = FALSE; m_ok = FALSE;
return; return;
} }
m_maxX = wxCoord(rPaper.right - rPaper.left) ; m_maxX = wxCoord(rPage.right - rPage.left) ;
m_maxY = wxCoord(rPaper.bottom - rPaper.top); m_maxY = wxCoord(rPage.bottom - rPage.top);
#else #else
m_maxX = (**(THPrint)m_printData.m_macPrintSettings).rPaper.right - (**(THPrint)m_printData.m_macPrintSettings).rPaper.left ; m_maxX = (**(THPrint)m_printData.m_macPrintSettings).rPage.right - (**(THPrint)m_printData.m_macPrintSettings).rPage.left ;
m_maxY = (**(THPrint)m_printData.m_macPrintSettings).rPaper.bottom - (**(THPrint)m_printData.m_macPrintSettings).rPaper.top ; m_maxY = (**(THPrint)m_printData.m_macPrintSettings).rPage.bottom - (**(THPrint)m_printData.m_macPrintSettings).rPage.top ;
#endif #endif
} }
@@ -275,9 +275,9 @@ bool wxPrinterDC::StartDoc( const wxString& WXUNUSED(message) )
m_ok = TRUE ; m_ok = TRUE ;
m_minY = m_minX = 0 ; m_minY = m_minX = 0 ;
#if TARGET_CARBON #if TARGET_CARBON
PMRect rPaper; PMRect rPage;
err = PMGetAdjustedPaperRect((PMPageFormat)m_printData.m_macPageFormat, &rPaper); err = PMGetAdjustedPageRect((PMPageFormat)m_printData.m_macPageFormat, &rPage);
if ( err != noErr ) if ( err != noErr )
{ {
message.Printf( wxT("Print Error %d"), err ) ; message.Printf( wxT("Print Error %d"), err ) ;
@@ -291,11 +291,11 @@ bool wxPrinterDC::StartDoc( const wxString& WXUNUSED(message) )
m_ok = FALSE; m_ok = FALSE;
return m_ok; return m_ok;
} }
m_maxX = rPaper.right - rPaper.left ; m_maxX = rPage.right - rPage.left ;
m_maxY = rPaper.bottom - rPaper.top ; m_maxY = rPage.bottom - rPage.top ;
#else #else
m_maxX = (**(THPrint)m_printData.m_macPrintSettings).rPaper.right - (**(THPrint)m_printData.m_macPrintSettings).rPaper.left ; m_maxX = (**(THPrint)m_printData.m_macPrintSettings).rPage.right - (**(THPrint)m_printData.m_macPrintSettings).rPage.left ;
m_maxY = (**(THPrint)m_printData.m_macPrintSettings).rPaper.bottom - (**(THPrint)m_printData.m_macPrintSettings).rPaper.top ; m_maxY = (**(THPrint)m_printData.m_macPrintSettings).rPage.bottom - (**(THPrint)m_printData.m_macPrintSettings).rPage.top ;
#endif #endif
return m_ok ; return m_ok ;
} }
@@ -397,13 +397,13 @@ void wxPrinterDC::StartPage(void)
::SetPort( macPrintFormerPort ) ; ::SetPort( macPrintFormerPort ) ;
m_ok = FALSE ; m_ok = FALSE ;
} }
PMRect rPaper; PMRect rPage;
err = PMGetAdjustedPaperRect((PMPageFormat)m_printData.m_macPageFormat, &rPaper); err = PMGetAdjustedPageRect((PMPageFormat)m_printData.m_macPageFormat, &rPage);
if ( !err ) if ( !err )
{ {
m_macLocalOrigin.x = rPaper.left ; m_macLocalOrigin.x = rPage.left ;
m_macLocalOrigin.y = rPaper.top ; m_macLocalOrigin.y = rPage.top ;
} }
#endif #endif
} }

32
src/mac/dcprint.cpp
View File

@@ -145,9 +145,9 @@ wxPrinterDC::wxPrinterDC(const wxPrintData& printdata)
m_ok = TRUE ; m_ok = TRUE ;
m_minY = m_minX = 0 ; m_minY = m_minX = 0 ;
#if TARGET_CARBON #if TARGET_CARBON
PMRect rPaper; PMRect rPage;
err = PMGetAdjustedPaperRect((PMPageFormat)m_printData.m_macPageFormat, &rPaper); err = PMGetAdjustedPageRect((PMPageFormat)m_printData.m_macPageFormat, &rPage);
if ( err != noErr ) if ( err != noErr )
{ {
message.Printf( wxT("Print Error %ld"), err ) ; message.Printf( wxT("Print Error %ld"), err ) ;
@@ -161,11 +161,11 @@ wxPrinterDC::wxPrinterDC(const wxPrintData& printdata)
m_ok = FALSE; m_ok = FALSE;
return; return;
} }
m_maxX = wxCoord(rPaper.right - rPaper.left) ; m_maxX = wxCoord(rPage.right - rPage.left) ;
m_maxY = wxCoord(rPaper.bottom - rPaper.top); m_maxY = wxCoord(rPage.bottom - rPage.top);
#else #else
m_maxX = (**(THPrint)m_printData.m_macPrintSettings).rPaper.right - (**(THPrint)m_printData.m_macPrintSettings).rPaper.left ; m_maxX = (**(THPrint)m_printData.m_macPrintSettings).rPage.right - (**(THPrint)m_printData.m_macPrintSettings).rPage.left ;
m_maxY = (**(THPrint)m_printData.m_macPrintSettings).rPaper.bottom - (**(THPrint)m_printData.m_macPrintSettings).rPaper.top ; m_maxY = (**(THPrint)m_printData.m_macPrintSettings).rPage.bottom - (**(THPrint)m_printData.m_macPrintSettings).rPage.top ;
#endif #endif
} }
@@ -275,9 +275,9 @@ bool wxPrinterDC::StartDoc( const wxString& WXUNUSED(message) )
m_ok = TRUE ; m_ok = TRUE ;
m_minY = m_minX = 0 ; m_minY = m_minX = 0 ;
#if TARGET_CARBON #if TARGET_CARBON
PMRect rPaper; PMRect rPage;
err = PMGetAdjustedPaperRect((PMPageFormat)m_printData.m_macPageFormat, &rPaper); err = PMGetAdjustedPageRect((PMPageFormat)m_printData.m_macPageFormat, &rPage);
if ( err != noErr ) if ( err != noErr )
{ {
message.Printf( wxT("Print Error %d"), err ) ; message.Printf( wxT("Print Error %d"), err ) ;
@@ -291,11 +291,11 @@ bool wxPrinterDC::StartDoc( const wxString& WXUNUSED(message) )
m_ok = FALSE; m_ok = FALSE;
return m_ok; return m_ok;
} }
m_maxX = rPaper.right - rPaper.left ; m_maxX = rPage.right - rPage.left ;
m_maxY = rPaper.bottom - rPaper.top ; m_maxY = rPage.bottom - rPage.top ;
#else #else
m_maxX = (**(THPrint)m_printData.m_macPrintSettings).rPaper.right - (**(THPrint)m_printData.m_macPrintSettings).rPaper.left ; m_maxX = (**(THPrint)m_printData.m_macPrintSettings).rPage.right - (**(THPrint)m_printData.m_macPrintSettings).rPage.left ;
m_maxY = (**(THPrint)m_printData.m_macPrintSettings).rPaper.bottom - (**(THPrint)m_printData.m_macPrintSettings).rPaper.top ; m_maxY = (**(THPrint)m_printData.m_macPrintSettings).rPage.bottom - (**(THPrint)m_printData.m_macPrintSettings).rPage.top ;
#endif #endif
return m_ok ; return m_ok ;
} }
@@ -397,13 +397,13 @@ void wxPrinterDC::StartPage(void)
::SetPort( macPrintFormerPort ) ; ::SetPort( macPrintFormerPort ) ;
m_ok = FALSE ; m_ok = FALSE ;
} }
PMRect rPaper; PMRect rPage;
err = PMGetAdjustedPaperRect((PMPageFormat)m_printData.m_macPageFormat, &rPaper); err = PMGetAdjustedPageRect((PMPageFormat)m_printData.m_macPageFormat, &rPage);
if ( !err ) if ( !err )
{ {
m_macLocalOrigin.x = rPaper.left ; m_macLocalOrigin.x = rPage.left ;
m_macLocalOrigin.y = rPaper.top ; m_macLocalOrigin.y = rPage.top ;
} }
#endif #endif
} }