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

OSX fixes for printing

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@19420 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2003-03-02 14:23:20 +00:00
parent 8585e2b506
commit 4a95c88547
2 changed files with 26 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/mac/carbon/dc.cpp
View File

@@ -1054,7 +1054,7 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
switch ( logical_func ) switch ( logical_func )
{ {
case wxAND: // src AND dst case wxAND: // src AND dst
mode = srcOr ; // ok mode = adMin ; // ok
break ; break ;
case wxAND_INVERT: // (NOT src) AND dst case wxAND_INVERT: // (NOT src) AND dst
mode = notSrcOr ; // ok mode = notSrcOr ; // ok
@@ -1385,7 +1385,7 @@ void wxDC::DoDrawText(const wxString& strtext, wxCoord x, wxCoord y)
long yy = YLOG2DEVMAC(y); long yy = YLOG2DEVMAC(y);
#if TARGET_CARBON #if TARGET_CARBON
bool useDrawThemeText = ( DrawThemeTextBox != (void*) kUnresolvedCFragSymbolAddress ) ; bool useDrawThemeText = ( DrawThemeTextBox != (void*) kUnresolvedCFragSymbolAddress ) ;
if ( m_font.GetNoAntiAliasing() ) if ( IsKindOf(CLASSINFO( wxPrinterDC ) ) || m_font.GetNoAntiAliasing() )
useDrawThemeText = false ; useDrawThemeText = false ;
#endif #endif
MacInstallFont() ; MacInstallFont() ;
@@ -1478,6 +1478,7 @@ void wxDC::DoDrawText(const wxString& strtext, wxCoord x, wxCoord y)
{ {
Rect frame = { yy + line*(fi.descent + fi.ascent + fi.leading) ,xx , yy + (line+1)*(fi.descent + fi.ascent + fi.leading) , xx + 10000 } ; Rect frame = { yy + line*(fi.descent + fi.ascent + fi.leading) ,xx , yy + (line+1)*(fi.descent + fi.ascent + fi.leading) , xx + 10000 } ;
CFStringRef mString = CFStringCreateWithCString( NULL , text + laststop , kCFStringEncodingMacRoman ) ; CFStringRef mString = CFStringCreateWithCString( NULL , text + laststop , kCFStringEncodingMacRoman ) ;
if ( m_backgroundMode != wxTRANSPARENT ) if ( m_backgroundMode != wxTRANSPARENT )
{ {
Point bounds={0,0} ; Point bounds={0,0} ;
@@ -1534,7 +1535,7 @@ void wxDC::DoGetTextExtent( const wxString &string, wxCoord *width, wxCoord *he
::GetFontInfo( &fi ) ; ::GetFontInfo( &fi ) ;
#if TARGET_CARBON #if TARGET_CARBON
bool useGetThemeText = ( GetThemeTextDimensions != (void*) kUnresolvedCFragSymbolAddress ) ; bool useGetThemeText = ( GetThemeTextDimensions != (void*) kUnresolvedCFragSymbolAddress ) ;
if ( ((wxFont*)&m_font)->GetNoAntiAliasing() ) if ( IsKindOf(CLASSINFO( wxPrinterDC ) ) || ((wxFont*)&m_font)->GetNoAntiAliasing() )
useGetThemeText = false ; useGetThemeText = false ;
#endif #endif
if ( height ) if ( height )
@@ -1747,10 +1748,12 @@ void wxDC::MacInstallFont() const
case wxSRC_INVERT: // (NOT src) case wxSRC_INVERT: // (NOT src)
mode = notPatCopy ; mode = notPatCopy ;
break ; break ;
case wxAND: // src AND dst
mode = adMin ;
break ;
// unsupported TODO // unsupported TODO
case wxCLEAR: // 0 case wxCLEAR: // 0
case wxAND_REVERSE:// src AND (NOT dst) case wxAND_REVERSE:// src AND (NOT dst)
case wxAND: // src AND dst
case wxAND_INVERT: // (NOT src) AND dst case wxAND_INVERT: // (NOT src) AND dst
case wxNO_OP: // dst case wxNO_OP: // dst
case wxNOR: // (NOT src) AND (NOT dst) case wxNOR: // (NOT src) AND (NOT dst)
@@ -1951,10 +1954,12 @@ void wxDC::MacInstallPen() const
case wxSRC_INVERT: // (NOT src) case wxSRC_INVERT: // (NOT src)
mode = notPatCopy ; mode = notPatCopy ;
break ; break ;
case wxAND: // src AND dst
mode = adMin ;
break ;
// unsupported TODO // unsupported TODO
case wxCLEAR: // 0 case wxCLEAR: // 0
case wxAND_REVERSE:// src AND (NOT dst) case wxAND_REVERSE:// src AND (NOT dst)
case wxAND: // src AND dst
case wxAND_INVERT: // (NOT src) AND dst case wxAND_INVERT: // (NOT src) AND dst
case wxNO_OP: // dst case wxNO_OP: // dst
case wxNOR: // (NOT src) AND (NOT dst) case wxNOR: // (NOT src) AND (NOT dst)
@@ -2131,10 +2136,12 @@ void wxDC::MacInstallBrush() const
case wxSRC_INVERT: // (NOT src) case wxSRC_INVERT: // (NOT src)
mode = notPatCopy ; mode = notPatCopy ;
break ; break ;
case wxAND: // src AND dst
mode = adMin ;
break ;
// unsupported TODO // unsupported TODO
case wxCLEAR: // 0 case wxCLEAR: // 0
case wxAND_REVERSE:// src AND (NOT dst) case wxAND_REVERSE:// src AND (NOT dst)
case wxAND: // src AND dst
case wxAND_INVERT: // (NOT src) AND dst case wxAND_INVERT: // (NOT src) AND dst
case wxNO_OP: // dst case wxNO_OP: // dst
case wxNOR: // (NOT src) AND (NOT dst) case wxNOR: // (NOT src) AND (NOT dst)

19
src/mac/dc.cpp
View File

@@ -1054,7 +1054,7 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
switch ( logical_func ) switch ( logical_func )
{ {
case wxAND: // src AND dst case wxAND: // src AND dst
mode = srcOr ; // ok mode = adMin ; // ok
break ; break ;
case wxAND_INVERT: // (NOT src) AND dst case wxAND_INVERT: // (NOT src) AND dst
mode = notSrcOr ; // ok mode = notSrcOr ; // ok
@@ -1385,7 +1385,7 @@ void wxDC::DoDrawText(const wxString& strtext, wxCoord x, wxCoord y)
long yy = YLOG2DEVMAC(y); long yy = YLOG2DEVMAC(y);
#if TARGET_CARBON #if TARGET_CARBON
bool useDrawThemeText = ( DrawThemeTextBox != (void*) kUnresolvedCFragSymbolAddress ) ; bool useDrawThemeText = ( DrawThemeTextBox != (void*) kUnresolvedCFragSymbolAddress ) ;
if ( m_font.GetNoAntiAliasing() ) if ( IsKindOf(CLASSINFO( wxPrinterDC ) ) || m_font.GetNoAntiAliasing() )
useDrawThemeText = false ; useDrawThemeText = false ;
#endif #endif
MacInstallFont() ; MacInstallFont() ;
@@ -1478,6 +1478,7 @@ void wxDC::DoDrawText(const wxString& strtext, wxCoord x, wxCoord y)
{ {
Rect frame = { yy + line*(fi.descent + fi.ascent + fi.leading) ,xx , yy + (line+1)*(fi.descent + fi.ascent + fi.leading) , xx + 10000 } ; Rect frame = { yy + line*(fi.descent + fi.ascent + fi.leading) ,xx , yy + (line+1)*(fi.descent + fi.ascent + fi.leading) , xx + 10000 } ;
CFStringRef mString = CFStringCreateWithCString( NULL , text + laststop , kCFStringEncodingMacRoman ) ; CFStringRef mString = CFStringCreateWithCString( NULL , text + laststop , kCFStringEncodingMacRoman ) ;
if ( m_backgroundMode != wxTRANSPARENT ) if ( m_backgroundMode != wxTRANSPARENT )
{ {
Point bounds={0,0} ; Point bounds={0,0} ;
@@ -1534,7 +1535,7 @@ void wxDC::DoGetTextExtent( const wxString &string, wxCoord *width, wxCoord *he
::GetFontInfo( &fi ) ; ::GetFontInfo( &fi ) ;
#if TARGET_CARBON #if TARGET_CARBON
bool useGetThemeText = ( GetThemeTextDimensions != (void*) kUnresolvedCFragSymbolAddress ) ; bool useGetThemeText = ( GetThemeTextDimensions != (void*) kUnresolvedCFragSymbolAddress ) ;
if ( ((wxFont*)&m_font)->GetNoAntiAliasing() ) if ( IsKindOf(CLASSINFO( wxPrinterDC ) ) || ((wxFont*)&m_font)->GetNoAntiAliasing() )
useGetThemeText = false ; useGetThemeText = false ;
#endif #endif
if ( height ) if ( height )
@@ -1747,10 +1748,12 @@ void wxDC::MacInstallFont() const
case wxSRC_INVERT: // (NOT src) case wxSRC_INVERT: // (NOT src)
mode = notPatCopy ; mode = notPatCopy ;
break ; break ;
case wxAND: // src AND dst
mode = adMin ;
break ;
// unsupported TODO // unsupported TODO
case wxCLEAR: // 0 case wxCLEAR: // 0
case wxAND_REVERSE:// src AND (NOT dst) case wxAND_REVERSE:// src AND (NOT dst)
case wxAND: // src AND dst
case wxAND_INVERT: // (NOT src) AND dst case wxAND_INVERT: // (NOT src) AND dst
case wxNO_OP: // dst case wxNO_OP: // dst
case wxNOR: // (NOT src) AND (NOT dst) case wxNOR: // (NOT src) AND (NOT dst)
@@ -1951,10 +1954,12 @@ void wxDC::MacInstallPen() const
case wxSRC_INVERT: // (NOT src) case wxSRC_INVERT: // (NOT src)
mode = notPatCopy ; mode = notPatCopy ;
break ; break ;
case wxAND: // src AND dst
mode = adMin ;
break ;
// unsupported TODO // unsupported TODO
case wxCLEAR: // 0 case wxCLEAR: // 0
case wxAND_REVERSE:// src AND (NOT dst) case wxAND_REVERSE:// src AND (NOT dst)
case wxAND: // src AND dst
case wxAND_INVERT: // (NOT src) AND dst case wxAND_INVERT: // (NOT src) AND dst
case wxNO_OP: // dst case wxNO_OP: // dst
case wxNOR: // (NOT src) AND (NOT dst) case wxNOR: // (NOT src) AND (NOT dst)
@@ -2131,10 +2136,12 @@ void wxDC::MacInstallBrush() const
case wxSRC_INVERT: // (NOT src) case wxSRC_INVERT: // (NOT src)
mode = notPatCopy ; mode = notPatCopy ;
break ; break ;
case wxAND: // src AND dst
mode = adMin ;
break ;
// unsupported TODO // unsupported TODO
case wxCLEAR: // 0 case wxCLEAR: // 0
case wxAND_REVERSE:// src AND (NOT dst) case wxAND_REVERSE:// src AND (NOT dst)
case wxAND: // src AND dst
case wxAND_INVERT: // (NOT src) AND dst case wxAND_INVERT: // (NOT src) AND dst
case wxNO_OP: // dst case wxNO_OP: // dst
case wxNOR: // (NOT src) AND (NOT dst) case wxNOR: // (NOT src) AND (NOT dst)