X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/669b65b94575865adc226d35a0de0dd81dde1e5f..90b903c26306d88d3920589125ea1a03664e1b22:/src/mac/carbon/dc.cpp diff --git a/src/mac/carbon/dc.cpp b/src/mac/carbon/dc.cpp index 940a6960ce..1d07f86074 100644 --- a/src/mac/carbon/dc.cpp +++ b/src/mac/carbon/dc.cpp @@ -1,59 +1,63 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: dc.cpp +// Name: src/mac/carbon/dc.cpp // Purpose: wxDC class // Author: Stefan Csomor // Modified by: // Created: 01/02/97 // RCS-ID: $Id$ // Copyright: (c) Stefan Csomor -// Licence: wxWindows licence +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// -#ifdef __GNUG__ -#pragma implementation "dc.h" -#endif +#include "wx/wxprec.h" #include "wx/dc.h" -#include "wx/app.h" + +#if !wxMAC_USE_CORE_GRAPHICS + +#ifndef WX_PRECOMP + #include "wx/log.h" + #include "wx/app.h" +#endif + #include "wx/mac/uma.h" #include "wx/dcmemory.h" #include "wx/dcprint.h" #include "wx/region.h" #include "wx/image.h" -#include "wx/log.h" -#if __MSL__ >= 0x6000 -#include "math.h" -using namespace std ; +#ifdef __MSL__ + #if __MSL__ >= 0x6000 + namespace std {} + using namespace std ; + #endif #endif #include "wx/mac/private.h" -#include "ATSUnicode.h" -#include "TextCommon.h" -#include "TextEncodingConverter.h" -#if !USE_SHARED_LIBRARY -IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject) +#ifndef __DARWIN__ +#include +#include +#include #endif + +// set to 0 if problems arise +#define wxMAC_EXPERIMENTAL_DC 1 + + +IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject) + //----------------------------------------------------------------------------- // constants //----------------------------------------------------------------------------- -#define mm2inches 0.0393700787402 -#define inches2mm 25.4 -#define mm2twips 56.6929133859 -#define twips2mm 0.0176388888889 -#define mm2pt 2.83464566929 -#define pt2mm 0.352777777778 -#if !defined( __DARWIN__ ) || defined(__MWERKS__) -#ifndef M_PI -const double M_PI = 3.14159265358979 ; -#endif -#endif const double RAD2DEG = 180.0 / M_PI; const short kEmulatedMode = -1 ; const short kUnsupportedMode = -2 ; +extern TECObjectRef s_TECNativeCToUnicode ; + + wxMacPortSetter::wxMacPortSetter( const wxDC* dc ) : m_ph( (GrafPtr) dc->m_macPort ) { @@ -67,47 +71,89 @@ wxMacPortSetter::~wxMacPortSetter() m_dc->MacCleanupPort(&m_ph) ; } -wxMacWindowClipper::wxMacWindowClipper( const wxWindow* win ) +#if wxMAC_EXPERIMENTAL_DC +class wxMacFastPortSetter +{ +public : + wxMacFastPortSetter( const wxDC *dc ) + { + wxASSERT( dc->Ok() ) ; + m_swapped = QDSwapPort( (GrafPtr) dc->m_macPort , &m_oldPort ) ; + m_clipRgn = NewRgn() ; + GetClip( m_clipRgn ) ; + m_dc = dc ; + dc->MacSetupPort( NULL ) ; + } + + ~wxMacFastPortSetter() + { + // SetPort( (GrafPtr) m_dc->m_macPort ) ; + SetClip( m_clipRgn ) ; + if ( m_swapped ) + SetPort( m_oldPort ) ; + m_dc->MacCleanupPort( NULL ) ; + DisposeRgn( m_clipRgn ) ; + } + +private : + bool m_swapped ; + RgnHandle m_clipRgn ; + GrafPtr m_oldPort ; + const wxDC* m_dc ; +} ; + +#else +typedef wxMacPortSetter wxMacFastPortSetter ; +#endif + +wxMacWindowClipper::wxMacWindowClipper( const wxWindow* win ) : + wxMacPortSaver( (GrafPtr) GetWindowPort((WindowRef) win->MacGetTopLevelWindowRef()) ) { + m_newPort =(GrafPtr) GetWindowPort((WindowRef) win->MacGetTopLevelWindowRef()) ; m_formerClip = NewRgn() ; m_newClip = NewRgn() ; GetClip( m_formerClip ) ; - + if ( win ) { -#if 0 - // this clipping area was set to the parent window's drawing area, lead to problems - // with MacOSX controls drawing outside their wx' rectangle - RgnHandle insidergn = NewRgn() ; - int x = 0 , y = 0; - wxWindow *parent = win->GetParent() ; - parent->MacWindowToRootWindow( &x,&y ) ; - wxSize size = parent->GetSize() ; - SetRectRgn( insidergn , parent->MacGetLeftBorderSize() , parent->MacGetTopBorderSize() , - size.x - parent->MacGetRightBorderSize(), - size.y - parent->MacGetBottomBorderSize()) ; - CopyRgn( (RgnHandle) parent->MacGetVisibleRegion(false).GetWXHRGN() , m_newClip ) ; - SectRgn( m_newClip , insidergn , m_newClip ) ; - OffsetRgn( m_newClip , x , y ) ; - SetClip( m_newClip ) ; - DisposeRgn( insidergn ) ; -#else - int x = 0 , y = 0; - win->MacWindowToRootWindow( &x,&y ) ; - CopyRgn( (RgnHandle) ((wxWindow*)win)->MacGetVisibleRegion().GetWXHRGN() , m_newClip ) ; - OffsetRgn( m_newClip , x , y ) ; + // guard against half constructed objects, this just leads to a empty clip + if ( win->GetPeer() ) + { + int x = 0 , y = 0; + win->MacWindowToRootWindow( &x, &y ) ; + + // get area including focus rect + CopyRgn( (RgnHandle) ((wxWindow*)win)->MacGetVisibleRegion(true).GetWXHRGN() , m_newClip ) ; + if ( !EmptyRgn( m_newClip ) ) + OffsetRgn( m_newClip , x , y ) ; + } + SetClip( m_newClip ) ; -#endif } } -wxMacWindowClipper::~wxMacWindowClipper() +wxMacWindowClipper::~wxMacWindowClipper() { + SetPort( m_newPort ) ; SetClip( m_formerClip ) ; DisposeRgn( m_newClip ) ; DisposeRgn( m_formerClip ) ; } +wxMacWindowStateSaver::wxMacWindowStateSaver( const wxWindow* win ) : + wxMacWindowClipper( win ) +{ + // the port is already set at this point + m_newPort = (GrafPtr) GetWindowPort((WindowRef) win->MacGetTopLevelWindowRef()) ; + GetThemeDrawingState( &m_themeDrawingState ) ; +} + +wxMacWindowStateSaver::~wxMacWindowStateSaver() +{ + SetPort( m_newPort ) ; + SetThemeDrawingState( m_themeDrawingState , true ) ; +} + //----------------------------------------------------------------------------- // Local functions //----------------------------------------------------------------------------- @@ -131,85 +177,101 @@ void wxMacCalculateColour( int logical_func , const RGBColor &srcColor , RGBColo dstColor.green = dstColor.green & srcColor.green ; dstColor.blue = dstColor.blue & srcColor.blue ; break ; + case wxAND_INVERT: // (NOT src) AND dst dstColor.red = dstColor.red & ~srcColor.red ; dstColor.green = dstColor.green & ~srcColor.green ; dstColor.blue = dstColor.blue & ~srcColor.blue ; break ; + case wxAND_REVERSE:// src AND (NOT dst) dstColor.red = ~dstColor.red & srcColor.red ; dstColor.green = ~dstColor.green & srcColor.green ; dstColor.blue = ~dstColor.blue & srcColor.blue ; break ; + case wxCLEAR: // 0 dstColor.red = 0 ; dstColor.green = 0 ; dstColor.blue = 0 ; break ; + case wxCOPY: // src dstColor.red = srcColor.red ; dstColor.green = srcColor.green ; dstColor.blue = srcColor.blue ; break ; + case wxEQUIV: // (NOT src) XOR dst dstColor.red = dstColor.red ^ ~srcColor.red ; dstColor.green = dstColor.green ^ ~srcColor.green ; dstColor.blue = dstColor.blue ^ ~srcColor.blue ; break ; + case wxINVERT: // NOT dst dstColor.red = ~dstColor.red ; dstColor.green = ~dstColor.green ; dstColor.blue = ~dstColor.blue ; break ; + case wxNAND: // (NOT src) OR (NOT dst) dstColor.red = ~dstColor.red | ~srcColor.red ; dstColor.green = ~dstColor.green | ~srcColor.green ; dstColor.blue = ~dstColor.blue | ~srcColor.blue ; break ; + case wxNOR: // (NOT src) AND (NOT dst) dstColor.red = ~dstColor.red & ~srcColor.red ; dstColor.green = ~dstColor.green & ~srcColor.green ; dstColor.blue = ~dstColor.blue & ~srcColor.blue ; break ; - case wxNO_OP: // dst - break ; + case wxOR: // src OR dst dstColor.red = dstColor.red | srcColor.red ; dstColor.green = dstColor.green | srcColor.green ; dstColor.blue = dstColor.blue | srcColor.blue ; break ; + case wxOR_INVERT: // (NOT src) OR dst dstColor.red = dstColor.red | ~srcColor.red ; dstColor.green = dstColor.green | ~srcColor.green ; dstColor.blue = dstColor.blue | ~srcColor.blue ; break ; + case wxOR_REVERSE: // src OR (NOT dst) dstColor.red = ~dstColor.red | srcColor.red ; dstColor.green = ~dstColor.green | srcColor.green ; dstColor.blue = ~dstColor.blue | srcColor.blue ; break ; + case wxSET: // 1 dstColor.red = 0xFFFF ; dstColor.green = 0xFFFF ; dstColor.blue = 0xFFFF ; break ; + case wxSRC_INVERT: // (NOT src) dstColor.red = ~srcColor.red ; dstColor.green = ~srcColor.green ; dstColor.blue = ~srcColor.blue ; break ; + case wxXOR: // src XOR dst dstColor.red = dstColor.red ^ srcColor.red ; dstColor.green = dstColor.green ^ srcColor.green ; dstColor.blue = dstColor.blue ^ srcColor.blue ; break ; + + case wxNO_OP: // dst + default: + break ; } } wxDC::wxDC() { - m_ok = FALSE; - m_colour = TRUE; + m_ok = false; + m_colour = true; m_mm_to_pix_x = mm2pt; m_mm_to_pix_y = mm2pt; m_internalDeviceOriginX = 0; @@ -222,11 +284,10 @@ wxDC::wxDC() m_userScaleY = 1.0; m_scaleX = 1.0; m_scaleY = 1.0; - m_needComputeScaleX = FALSE; - m_needComputeScaleY = FALSE; + m_needComputeScaleX = false; + m_needComputeScaleY = false; m_macPort = NULL ; m_macMask = NULL ; - m_ok = FALSE ; m_macFontInstalled = false ; m_macBrushInstalled = false ; m_macPenInstalled = false ; @@ -238,11 +299,13 @@ wxDC::wxDC() m_pen = *wxBLACK_PEN; m_font = *wxNORMAL_FONT; m_brush = *wxWHITE_BRUSH; + #ifdef __WXDEBUG__ - // needed to debug possible errors with two active drawing methods at the same time on + // needed to debug possible errors with two active drawing methods at the same time on // the same DC m_macCurrentPortStateHelper = NULL ; #endif + m_macATSUIStyle = NULL ; m_macAliasWasEnabled = false; m_macForegroundPixMap = NULL ; @@ -261,10 +324,14 @@ void wxDC::MacSetupPort(wxMacPortStateHelper* help) const wxASSERT( m_macCurrentPortStateHelper == NULL ) ; m_macCurrentPortStateHelper = help ; #endif + SetClip( (RgnHandle) m_macCurrentClipRgn); + +#if ! wxMAC_EXPERIMENTAL_DC m_macFontInstalled = false ; m_macBrushInstalled = false ; m_macPenInstalled = false ; +#endif } void wxDC::MacCleanupPort(wxMacPortStateHelper* help) const @@ -273,16 +340,19 @@ void wxDC::MacCleanupPort(wxMacPortStateHelper* help) const wxASSERT( m_macCurrentPortStateHelper == help ) ; m_macCurrentPortStateHelper = NULL ; #endif - if( m_macATSUIStyle ) + + if ( m_macATSUIStyle ) { ::ATSUDisposeStyle((ATSUStyle)m_macATSUIStyle); m_macATSUIStyle = NULL ; } + if ( m_macAliasWasEnabled ) { SetAntiAliasedTextEnabled(m_macFormerAliasState, m_macFormerAliasSize); m_macAliasWasEnabled = false ; } + if ( m_macForegroundPixMap ) { Pattern blackColor ; @@ -290,6 +360,7 @@ void wxDC::MacCleanupPort(wxMacPortStateHelper* help) const DisposePixPat( (PixPatHandle) m_macForegroundPixMap ) ; m_macForegroundPixMap = NULL ; } + if ( m_macBackgroundPixMap ) { Pattern whiteColor ; @@ -301,15 +372,17 @@ void wxDC::MacCleanupPort(wxMacPortStateHelper* help) const void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask ) { - wxCHECK_RET( Ok(), wxT("invalid window dc") ); - wxCHECK_RET( bmp.Ok(), wxT("invalid bitmap") ); - wxMacPortSetter helper(this) ; + wxCHECK_RET( Ok(), wxT("wxDC::DoDrawBitmap - invalid DC") ); + wxCHECK_RET( bmp.Ok(), wxT("wxDC::DoDrawBitmap - invalid bitmap") ); + + wxMacFastPortSetter helper(this) ; wxCoord xx = XLOG2DEVMAC(x); wxCoord yy = YLOG2DEVMAC(y); wxCoord w = bmp.GetWidth(); wxCoord h = bmp.GetHeight(); wxCoord ww = XLOG2DEVREL(w); wxCoord hh = YLOG2DEVREL(h); + // Set up drawing mode short mode = (m_logicalFunction == wxCOPY ? srcCopy : //m_logicalFunction == wxCLEAR ? WHITENESS : @@ -324,62 +397,55 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask //m_logicalFunction == wxSRC_OR ? srcOr : //m_logicalFunction == wxSRC_AND ? SRCAND : srcCopy ); - if ( bmp.GetBitmapType() == kMacBitmapTypePict ) { - Rect bitmaprect = { 0 , 0 , hh, ww }; - ::OffsetRect( &bitmaprect, xx, yy ) ; - ::DrawPicture( (PicHandle) bmp.GetPict(), &bitmaprect ) ; - } - else if ( bmp.GetBitmapType() == kMacBitmapTypeGrafWorld ) + + GWorldPtr maskworld = NULL ; + GWorldPtr bmapworld = MAC_WXHBITMAP( bmp.GetHBITMAP((WXHBITMAP*)&maskworld) ); + PixMapHandle bmappixels ; + + // Set foreground and background colours (for bitmaps depth = 1) + if (bmp.GetDepth() == 1) { - GWorldPtr bmapworld = MAC_WXHBITMAP( bmp.GetHBITMAP() ); - PixMapHandle bmappixels ; - // Set foreground and background colours (for bitmaps depth = 1) - if(bmp.GetDepth() == 1) - { - RGBColor fore = MAC_WXCOLORREF(m_textForegroundColour.GetPixel()); - RGBColor back = MAC_WXCOLORREF(m_textBackgroundColour.GetPixel()); - RGBForeColor(&fore); - RGBBackColor(&back); - } - else - { - RGBColor white = { 0xFFFF, 0xFFFF,0xFFFF} ; - RGBColor black = { 0,0,0} ; - RGBForeColor( &black ) ; - RGBBackColor( &white ) ; - } - bmappixels = GetGWorldPixMap( bmapworld ) ; - wxCHECK_RET(LockPixels(bmappixels), - wxT("DoDrawBitmap: Unable to lock pixels")); - Rect source = { 0, 0, h, w }; - Rect dest = { yy, xx, yy + hh, xx + ww }; - if ( useMask && bmp.GetMask() ) + RGBColor fore = MAC_WXCOLORREF(m_textForegroundColour.GetPixel()); + RGBColor back = MAC_WXCOLORREF(m_textBackgroundColour.GetPixel()); + RGBForeColor(&fore); + RGBBackColor(&back); + } + else + { + RGBColor white = { 0xFFFF, 0xFFFF, 0xFFFF } ; + RGBColor black = { 0, 0, 0 } ; + RGBForeColor( &black ) ; + RGBBackColor( &white ) ; + } + bmappixels = GetGWorldPixMap( bmapworld ) ; + + wxCHECK_RET(LockPixels(bmappixels), + wxT("wxDC::DoDrawBitmap - failed to lock pixels")); + + Rect source = { 0, 0, h, w }; + Rect dest = { yy, xx, yy + hh, xx + ww }; + if ( useMask && maskworld ) + { + if ( LockPixels(GetGWorldPixMap(MAC_WXHBITMAP(maskworld)))) { - if( LockPixels(GetGWorldPixMap(MAC_WXHBITMAP(bmp.GetMask()->GetMaskBitmap())))) - { - CopyDeepMask - ( - GetPortBitMapForCopyBits(bmapworld), - GetPortBitMapForCopyBits(MAC_WXHBITMAP(bmp.GetMask()->GetMaskBitmap())), - GetPortBitMapForCopyBits( MAC_WXHBITMAP(m_macPort) ), - &source, &source, &dest, mode, NULL - ); - UnlockPixels(GetGWorldPixMap(MAC_WXHBITMAP(bmp.GetMask()->GetMaskBitmap()))); - } + CopyDeepMask + ( + GetPortBitMapForCopyBits(bmapworld), + GetPortBitMapForCopyBits(MAC_WXHBITMAP(maskworld)), + GetPortBitMapForCopyBits( MAC_WXHBITMAP(m_macPort) ), + &source, &source, &dest, mode, NULL + ); + UnlockPixels(GetGWorldPixMap(MAC_WXHBITMAP(maskworld))); } - else { - CopyBits( GetPortBitMapForCopyBits( bmapworld ), - GetPortBitMapForCopyBits( MAC_WXHBITMAP(m_macPort) ), - &source, &dest, mode, NULL ) ; - } - UnlockPixels( bmappixels ) ; } - else if ( bmp.GetBitmapType() == kMacBitmapTypeIcon ) + else { - Rect bitmaprect = { 0 , 0 , bmp.GetHeight(), bmp.GetWidth() } ; - OffsetRect( &bitmaprect, xx, yy ) ; - PlotCIconHandle( &bitmaprect , atNone , ttNone , MAC_WXHICON(bmp.GetHICON()) ) ; + CopyBits( GetPortBitMapForCopyBits( bmapworld ), + GetPortBitMapForCopyBits( MAC_WXHBITMAP(m_macPort) ), + &source, &dest, mode, NULL ) ; } + UnlockPixels( bmappixels ) ; + m_macPenInstalled = false ; m_macBrushInstalled = false ; m_macFontInstalled = false ; @@ -387,31 +453,44 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask void wxDC::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y ) { - wxCHECK_RET(Ok(), wxT("Invalid dc wxDC::DoDrawIcon")); - wxCHECK_RET(icon.Ok(), wxT("Invalid icon wxDC::DoDrawIcon")); - DoDrawBitmap( icon , x , y , icon.GetMask() != NULL ) ; + wxCHECK_RET(Ok(), wxT("wxDC::DoDrawIcon - invalid DC")); + wxCHECK_RET(icon.Ok(), wxT("wxDC::DoDrawIcon - invalid icon")); + + wxMacFastPortSetter helper(this) ; + + wxCoord xx = XLOG2DEVMAC(x); + wxCoord yy = YLOG2DEVMAC(y); + wxCoord w = icon.GetWidth(); + wxCoord h = icon.GetHeight(); + wxCoord ww = XLOG2DEVREL(w); + wxCoord hh = YLOG2DEVREL(h); + + Rect r = { yy , xx, yy + hh, xx + ww } ; + PlotIconRef( &r , kAlignNone , kTransformNone , kPlotIconRefNormalFlags , MAC_WXHICON( icon.GetHICON() ) ) ; } void wxDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height ) { - wxCHECK_RET(Ok(), wxT("wxDC::DoSetClippingRegion Invalid DC")); + wxCHECK_RET(Ok(), wxT("wxDC::DoSetClippingRegion - invalid DC")); + wxCoord xx, yy, ww, hh; xx = XLOG2DEVMAC(x); yy = YLOG2DEVMAC(y); ww = XLOG2DEVREL(width); hh = YLOG2DEVREL(height); + SetRectRgn( (RgnHandle) m_macCurrentClipRgn , xx , yy , xx + ww , yy + hh ) ; SectRgn( (RgnHandle) m_macCurrentClipRgn , (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ; - if( m_clipping ) + if ( m_clipping ) { m_clipX1 = wxMax( m_clipX1 , xx ); m_clipY1 = wxMax( m_clipY1 , yy ); - m_clipX2 = wxMin( m_clipX2, (xx + ww)); - m_clipY2 = wxMin( m_clipY2, (yy + hh)); + m_clipX2 = wxMin( m_clipX2, (xx + ww) ); + m_clipY2 = wxMin( m_clipY2, (yy + hh) ); } else { - m_clipping = TRUE; + m_clipping = true; m_clipX1 = xx; m_clipY1 = yy; m_clipX2 = xx + ww; @@ -419,15 +498,11 @@ void wxDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord hei } } -void wxDC::DoSetClippingRegionAsRegion( const wxRegion ®ion ) +void wxDC::DoSetClippingRegionAsRegion( const wxRegion ®ion ) { - wxCHECK_RET( Ok(), wxT("invalid window dc") ) ; - if (region.Empty()) - { - DestroyClippingRegion(); - return; - } - wxMacPortSetter helper(this) ; + wxCHECK_RET(Ok(), wxT("wxDC::DoSetClippingRegionAsRegion - invalid DC")); + + wxMacFastPortSetter helper(this) ; wxCoord x, y, w, h; region.GetBox( x, y, w, h ); wxCoord xx, yy, ww, hh; @@ -435,6 +510,7 @@ void wxDC::DoSetClippingRegionAsRegion( const wxRegion ®ion ) yy = YLOG2DEVMAC(y); ww = XLOG2DEVREL(w); hh = YLOG2DEVREL(h); + // if we have a scaling that we cannot map onto native regions // we must use the box if ( ww != w || hh != h ) @@ -445,20 +521,19 @@ void wxDC::DoSetClippingRegionAsRegion( const wxRegion ®ion ) { CopyRgn( (RgnHandle) region.GetWXHRGN() , (RgnHandle) m_macCurrentClipRgn ) ; if ( xx != x || yy != y ) - { OffsetRgn( (RgnHandle) m_macCurrentClipRgn , xx - x , yy - y ) ; - } + SectRgn( (RgnHandle) m_macCurrentClipRgn , (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ; - if( m_clipping ) + if ( m_clipping ) { m_clipX1 = wxMax( m_clipX1 , xx ); m_clipY1 = wxMax( m_clipY1 , yy ); - m_clipX2 = wxMin( m_clipX2, (xx + ww)); - m_clipY2 = wxMin( m_clipY2, (yy + hh)); + m_clipX2 = wxMin( m_clipX2, (xx + ww) ); + m_clipY2 = wxMin( m_clipY2, (yy + hh) ); } else { - m_clipping = TRUE; + m_clipping = true; m_clipX1 = xx; m_clipY1 = yy; m_clipX2 = xx + ww; @@ -469,30 +544,35 @@ void wxDC::DoSetClippingRegionAsRegion( const wxRegion ®ion ) void wxDC::DestroyClippingRegion() { - wxMacPortSetter helper(this) ; + wxMacFastPortSetter helper(this) ; + CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ; - m_clipping = FALSE; + ResetClipping(); } void wxDC::DoGetSizeMM( int* width, int* height ) const { - int w = 0; - int h = 0; + int w = 0, h = 0; + GetSize( &w, &h ); - *width = long( double(w) / (m_scaleX*m_mm_to_pix_x) ); - *height = long( double(h) / (m_scaleY*m_mm_to_pix_y) ); + if (width) + *width = long( double(w) / (m_scaleX * m_mm_to_pix_x) ); + if (height) + *height = long( double(h) / (m_scaleY * m_mm_to_pix_y) ); } void wxDC::SetTextForeground( const wxColour &col ) { - wxCHECK_RET(Ok(), wxT("Invalid DC")); + wxCHECK_RET(Ok(), wxT("wxDC::SetTextForeground - invalid DC")); + m_textForegroundColour = col; m_macFontInstalled = false ; } void wxDC::SetTextBackground( const wxColour &col ) { - wxCHECK_RET(Ok(), wxT("Invalid DC")); + wxCHECK_RET(Ok(), wxT("wxDC::SetTextBackground - invalid DC")); + m_textBackgroundColour = col; m_macFontInstalled = false ; } @@ -502,26 +582,31 @@ void wxDC::SetMapMode( int mode ) switch (mode) { case wxMM_TWIPS: - SetLogicalScale( twips2mm*m_mm_to_pix_x, twips2mm*m_mm_to_pix_y ); + SetLogicalScale( twips2mm * m_mm_to_pix_x, twips2mm * m_mm_to_pix_y ); break; + case wxMM_POINTS: - SetLogicalScale( pt2mm*m_mm_to_pix_x, pt2mm*m_mm_to_pix_y ); + SetLogicalScale( pt2mm * m_mm_to_pix_x, pt2mm * m_mm_to_pix_y ); break; + case wxMM_METRIC: SetLogicalScale( m_mm_to_pix_x, m_mm_to_pix_y ); break; + case wxMM_LOMETRIC: - SetLogicalScale( m_mm_to_pix_x/10.0, m_mm_to_pix_y/10.0 ); + SetLogicalScale( m_mm_to_pix_x / 10.0, m_mm_to_pix_y / 10.0 ); break; + default: case wxMM_TEXT: SetLogicalScale( 1.0, 1.0 ); break; } + if (mode != wxMM_TEXT) { - m_needComputeScaleX = TRUE; - m_needComputeScaleY = TRUE; + m_needComputeScaleX = true; + m_needComputeScaleY = true; } } @@ -543,7 +628,8 @@ void wxDC::SetLogicalScale( double x, double y ) void wxDC::SetLogicalOrigin( wxCoord x, wxCoord y ) { - m_logicalOriginX = x * m_signX; // is this still correct ? + // is this still correct ? + m_logicalOriginX = x * m_signX; m_logicalOriginY = y * m_signY; ComputeScaleAndOrigin(); } @@ -555,20 +641,6 @@ void wxDC::SetDeviceOrigin( wxCoord x, wxCoord y ) ComputeScaleAndOrigin(); } -#if 0 -void wxDC::SetInternalDeviceOrigin( long x, long y ) -{ - m_internalDeviceOriginX = x; - m_internalDeviceOriginY = y; - ComputeScaleAndOrigin(); -} -void wxDC::GetInternalDeviceOrigin( long *x, long *y ) -{ - if (x) *x = m_internalDeviceOriginX; - if (y) *y = m_internalDeviceOriginY; -} -#endif - void wxDC::SetAxisOrientation( bool xLeftRight, bool yBottomUp ) { m_signX = (xLeftRight ? 1 : -1); @@ -584,9 +656,8 @@ wxSize wxDC::GetPPI() const int wxDC::GetDepth() const { if ( IsPortColor( (CGrafPtr) m_macPort ) ) - { return ( (**GetPortPixMap( (CGrafPtr) m_macPort)).pixelSize ) ; - } + return 1 ; } @@ -599,63 +670,66 @@ void wxDC::ComputeScaleAndOrigin() m_scaleY = m_logicalScaleY * m_userScaleY; m_deviceOriginX = m_internalDeviceOriginX + m_externalDeviceOriginX; m_deviceOriginY = m_internalDeviceOriginY + m_externalDeviceOriginY; + // CMB: if scale has changed call SetPen to recalulate the line width if (m_scaleX != origScaleX || m_scaleY != origScaleY) { // this is a bit artificial, but we need to force wxDC to think // the pen has changed - wxPen* pen = & GetPen(); - wxPen tempPen; - m_pen = tempPen; - SetPen(* pen); + wxPen pen(GetPen()); + m_pen = wxNullPen; + SetPen(pen); } } -void wxDC::SetPalette( const wxPalette& palette ) +void wxDC::SetPalette( const wxPalette& palette ) { } -void wxDC::SetBackgroundMode( int mode ) +void wxDC::SetBackgroundMode( int mode ) { m_backgroundMode = mode ; } -void wxDC::SetFont( const wxFont &font ) +void wxDC::SetFont( const wxFont &font ) { m_font = font; m_macFontInstalled = false ; } -void wxDC::SetPen( const wxPen &pen ) +void wxDC::SetPen( const wxPen &pen ) { if ( m_pen == pen ) return ; + m_pen = pen; m_macPenInstalled = false ; } -void wxDC::SetBrush( const wxBrush &brush ) +void wxDC::SetBrush( const wxBrush &brush ) { if (m_brush == brush) return; + m_brush = brush; m_macBrushInstalled = false ; } -void wxDC::SetBackground( const wxBrush &brush ) +void wxDC::SetBackground( const wxBrush &brush ) { if (m_backgroundBrush == brush) return; + m_backgroundBrush = brush; - if (!m_backgroundBrush.Ok()) - return; - m_macBrushInstalled = false ; + if (m_backgroundBrush.Ok()) + m_macBrushInstalled = false ; } -void wxDC::SetLogicalFunction( int function ) +void wxDC::SetLogicalFunction( int function ) { if (m_logicalFunction == function) return; + m_logicalFunction = function ; m_macFontInstalled = false ; m_macBrushInstalled = false ; @@ -671,32 +745,38 @@ bool wxDC::DoFloodFill(wxCoord x, wxCoord y, return wxDoFloodFill(this, x, y, col, style); } -bool wxDC::DoGetPixel( wxCoord x, wxCoord y, wxColour *col ) const +bool wxDC::DoGetPixel( wxCoord x, wxCoord y, wxColour *col ) const { - wxCHECK_MSG( Ok(), false, wxT("wxDC::DoGetPixel Invalid DC") ); - wxMacPortSetter helper(this) ; + wxCHECK_MSG( Ok(), false, wxT("wxDC::DoGetPixel - invalid DC") ); + + wxMacFastPortSetter helper(this) ; + + // NOTE: Get/SetCPixel are slow! RGBColor colour; GetCPixel( XLOG2DEVMAC(x), YLOG2DEVMAC(y), &colour ); - // Convert from Mac colour to wx - col->Set( colour.red >> 8, - colour.green >> 8, - colour.blue >> 8); + + // convert from Mac colour to wx + col->Set( colour.red >> 8, colour.green >> 8, colour.blue >> 8); + return true ; } -void wxDC::DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 ) +void wxDC::DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 ) { - wxCHECK_RET(Ok(), wxT("Invalid DC")); - wxMacPortSetter helper(this) ; + wxCHECK_RET(Ok(), wxT("wxDC::DoDrawLine - invalid DC")); + + wxMacFastPortSetter helper(this) ; + if (m_pen.GetStyle() != wxTRANSPARENT) { MacInstallPen() ; wxCoord offset = ( (m_pen.GetWidth() == 0 ? 1 : - m_pen.GetWidth() ) * (wxCoord)m_scaleX - 1) / 2; + m_pen.GetWidth() ) * (wxCoord)m_scaleX - 1) / 2; wxCoord xx1 = XLOG2DEVMAC(x1) - offset; wxCoord yy1 = YLOG2DEVMAC(y1) - offset; wxCoord xx2 = XLOG2DEVMAC(x2) - offset; wxCoord yy2 = YLOG2DEVMAC(y2) - offset; + if ((m_pen.GetCap() == wxCAP_ROUND) && (m_pen.GetWidth() <= 1)) { @@ -709,6 +789,7 @@ void wxDC::DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 ) if (yy1 > yy2) yy2++; } + if (yy1 == yy2) { if (xx1 < xx2) @@ -717,29 +798,33 @@ void wxDC::DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 ) xx2++; } } + ::MoveTo(xx1, yy1); ::LineTo(xx2, yy2); } } -void wxDC::DoCrossHair( wxCoord x, wxCoord y ) +void wxDC::DoCrossHair( wxCoord x, wxCoord y ) { - wxCHECK_RET( Ok(), wxT("wxDC::DoCrossHair Invalid window dc") ); - wxMacPortSetter helper(this) ; + wxCHECK_RET(Ok(), wxT("wxDC::DoCrossHair - invalid DC")); + + wxMacFastPortSetter helper(this) ; + if (m_pen.GetStyle() != wxTRANSPARENT) { - int w = 0; - int h = 0; + int w = 0, h = 0; + GetSize( &w, &h ); wxCoord xx = XLOG2DEVMAC(x); wxCoord yy = YLOG2DEVMAC(y); + MacInstallPen(); ::MoveTo( XLOG2DEVMAC(0), yy ); ::LineTo( XLOG2DEVMAC(w), yy ); ::MoveTo( xx, YLOG2DEVMAC(0) ); ::LineTo( xx, YLOG2DEVMAC(h) ); CalcBoundingBox(x, y); - CalcBoundingBox(x+w, y+h); + CalcBoundingBox(x + w, y + h); } } @@ -755,28 +840,36 @@ void wxDC::DoCrossHair( wxCoord x, wxCoord y ) static double wxConvertWXangleToMACangle(double angle) { double newAngle = 90 - angle ; - if ( newAngle < 0 ) + + while ( newAngle > 360 ) + newAngle -= 360 ; + while ( newAngle < 0 ) newAngle += 360 ; + return newAngle ; } -void wxDC::DoDrawArc( wxCoord x1, wxCoord y1, +void wxDC::DoDrawArc( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, wxCoord xc, wxCoord yc ) { - wxCHECK_RET(Ok(), wxT("wxDC::DoDrawArc Invalid DC")); - wxMacPortSetter helper(this) ; + wxCHECK_RET(Ok(), wxT("wxDC::DoDrawArc - invalid DC")); + + wxMacFastPortSetter helper(this) ; + wxCoord xx1 = XLOG2DEVMAC(x1); wxCoord yy1 = YLOG2DEVMAC(y1); wxCoord xx2 = XLOG2DEVMAC(x2); wxCoord yy2 = YLOG2DEVMAC(y2); wxCoord xxc = XLOG2DEVMAC(xc); wxCoord yyc = YLOG2DEVMAC(yc); + double dx = xx1 - xxc; double dy = yy1 - yyc; - double radius = sqrt((double)(dx*dx+dy*dy)); - wxCoord rad = (wxCoord)radius; + double radius = sqrt((double)(dx * dx + dy * dy)); + wxCoord rad = (wxCoord)radius; double radius1, radius2; + if (xx1 == xx2 && yy1 == yy2) { radius1 = 0.0; @@ -790,161 +883,207 @@ void wxDC::DoDrawArc( wxCoord x1, wxCoord y1, { radius1 = (xx1 - xxc == 0) ? (yy1 - yyc < 0) ? 90.0 : -90.0 : - -atan2(double(yy1-yyc), double(xx1-xxc)) * RAD2DEG; + -atan2(double(yy1 - yyc), double(xx1 - xxc)) * RAD2DEG; radius2 = (xx2 - xxc == 0) ? (yy2 - yyc < 0) ? 90.0 : -90.0 : - -atan2(double(yy2-yyc), double(xx2-xxc)) * RAD2DEG; + -atan2(double(yy2 - yyc), double(xx2 - xxc)) * RAD2DEG; } + wxCoord alpha2 = wxCoord(radius2 - radius1); wxCoord alpha1 = wxCoord(wxConvertWXangleToMACangle(radius1)); - if( (xx1 > xx2) || (yy1 > yy2) ) { - alpha2 *= -1; - } + while ( alpha2 < 0 ) + alpha2 += 360 ; + alpha2 = -alpha2 ; Rect r = { yyc - rad, xxc - rad, yyc + rad, xxc + rad }; - if(m_brush.GetStyle() != wxTRANSPARENT) { + + if (m_brush.GetStyle() != wxTRANSPARENT) + { MacInstallBrush(); PaintArc(&r, alpha1, alpha2); } - if(m_pen.GetStyle() != wxTRANSPARENT) { + + if (m_pen.GetStyle() != wxTRANSPARENT) + { MacInstallPen(); FrameArc(&r, alpha1, alpha2); } } -void wxDC::DoDrawEllipticArc( wxCoord x, wxCoord y, wxCoord w, wxCoord h, +void wxDC::DoDrawEllipticArc( wxCoord x, wxCoord y, wxCoord w, wxCoord h, double sa, double ea ) { - wxCHECK_RET(Ok(), wxT("wxDC::DoDrawEllepticArc Invalid DC")); - wxMacPortSetter helper(this) ; + wxCHECK_RET(Ok(), wxT("wxDC::DoDrawEllepticArc - invalid DC")); + wxMacFastPortSetter helper(this) ; Rect r; - double angle = sa - ea; // Order important Mac in opposite direction to wx + + // Order important Mac in opposite direction to wx // we have to make sure that the filling is always counter-clockwise + double angle = sa - ea; if ( angle > 0 ) angle -= 360 ; + wxCoord xx = XLOG2DEVMAC(x); wxCoord yy = YLOG2DEVMAC(y); wxCoord ww = m_signX * XLOG2DEVREL(w); wxCoord hh = m_signY * YLOG2DEVREL(h); + // handle -ve width and/or height - if (ww < 0) { ww = -ww; xx = xx - ww; } - if (hh < 0) { hh = -hh; yy = yy - hh; } + if (ww < 0) + { + ww = -ww; + xx = xx - ww; + } + + if (hh < 0) + { + hh = -hh; + yy = yy - hh; + } + sa = wxConvertWXangleToMACangle(sa); r.top = yy; r.left = xx; r.bottom = yy + hh; r.right = xx + ww; - if(m_brush.GetStyle() != wxTRANSPARENT) { + + if (m_brush.GetStyle() != wxTRANSPARENT) + { MacInstallBrush(); PaintArc(&r, (short)sa, (short)angle); } - if(m_pen.GetStyle() != wxTRANSPARENT) { + + if (m_pen.GetStyle() != wxTRANSPARENT) + { MacInstallPen(); FrameArc(&r, (short)sa, (short)angle); } } -void wxDC::DoDrawPoint( wxCoord x, wxCoord y ) +void wxDC::DoDrawPoint( wxCoord x, wxCoord y ) { - wxCHECK_RET(Ok(), wxT("Invalid DC")); - wxMacPortSetter helper(this) ; + wxCHECK_RET(Ok(), wxT("wxDC::DoDrawPoint - invalid DC")); + + wxMacFastPortSetter helper(this) ; + if (m_pen.GetStyle() != wxTRANSPARENT) { wxCoord xx1 = XLOG2DEVMAC(x); wxCoord yy1 = YLOG2DEVMAC(y); RGBColor pencolor = MAC_WXCOLORREF( m_pen.GetColour().GetPixel()); - ::SetCPixel( xx1,yy1,&pencolor) ; + + // NOTE: Get/SetCPixel are slow! + ::SetCPixel( xx1, yy1, &pencolor) ; CalcBoundingBox(x, y); } } -void wxDC::DoDrawLines(int n, wxPoint points[], +void wxDC::DoDrawLines(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset) { - wxCHECK_RET(Ok(), wxT("Invalid DC")); - wxMacPortSetter helper(this) ; + wxCHECK_RET(Ok(), wxT("wxDC::DoDrawLines - invalid DC")); + if (m_pen.GetStyle() == wxTRANSPARENT) return; + + wxMacFastPortSetter helper(this) ; + MacInstallPen() ; wxCoord offset = ( (m_pen.GetWidth() == 0 ? 1 : m_pen.GetWidth() ) * (wxCoord)m_scaleX - 1) / 2 ; + wxCoord x1, x2 , y1 , y2 ; x1 = XLOG2DEVMAC(points[0].x + xoffset); y1 = YLOG2DEVMAC(points[0].y + yoffset); - ::MoveTo(x1 - offset, y1 - offset ); + + ::MoveTo( x1 - offset, y1 - offset ); for (int i = 0; i < n-1; i++) { - x2 = XLOG2DEVMAC(points[i+1].x + xoffset); - y2 = YLOG2DEVMAC(points[i+1].y + yoffset); + x2 = XLOG2DEVMAC(points[i + 1].x + xoffset); + y2 = YLOG2DEVMAC(points[i + 1].y + yoffset); ::LineTo( x2 - offset, y2 - offset ); } } -void wxDC::DoDrawPolygon(int n, wxPoint points[], +void wxDC::DoDrawPolygon(int n, wxPoint points[], wxCoord xoffset, wxCoord yoffset, int fillStyle ) { - wxCHECK_RET(Ok(), wxT("Invalid DC")); - wxMacPortSetter helper(this) ; - wxCoord x1, x2 , y1 , y2 ; + wxCHECK_RET(Ok(), wxT("wxDC::DoDrawPolygon - invalid DC")); + if ( m_brush.GetStyle() == wxTRANSPARENT && m_pen.GetStyle() == wxTRANSPARENT ) return ; + + wxMacFastPortSetter helper(this) ; + + wxCoord x1, x2 , y1 , y2 ; PolyHandle polygon = OpenPoly(); x2 = x1 = XLOG2DEVMAC(points[0].x + xoffset); y2 = y1 = YLOG2DEVMAC(points[0].y + yoffset); - ::MoveTo(x1,y1); + + ::MoveTo(x1, y1); for (int i = 1; i < n; i++) { x2 = XLOG2DEVMAC(points[i].x + xoffset); y2 = YLOG2DEVMAC(points[i].y + yoffset); ::LineTo(x2, y2); } + // close the polyline if necessary if ( x1 != x2 || y1 != y2 ) - { - ::LineTo(x1,y1 ) ; - } + ::LineTo( x1, y1 ) ; ClosePoly(); + if (m_brush.GetStyle() != wxTRANSPARENT) { MacInstallBrush(); ::PaintPoly( polygon ); } + if (m_pen.GetStyle() != wxTRANSPARENT) { MacInstallPen() ; ::FramePoly( polygon ) ; } + KillPoly( polygon ); } void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) { - wxCHECK_RET(Ok(), wxT("Invalid DC")); - wxMacPortSetter helper(this) ; + wxCHECK_RET(Ok(), wxT("wxDC::DoDrawRectangle - invalid DC")); + + wxMacFastPortSetter helper(this) ; + wxCoord xx = XLOG2DEVMAC(x); wxCoord yy = YLOG2DEVMAC(y); wxCoord ww = m_signX * XLOG2DEVREL(width); wxCoord hh = m_signY * YLOG2DEVREL(height); + // CMB: draw nothing if transformed w or h is 0 if (ww == 0 || hh == 0) return; + // CMB: handle -ve width and/or height if (ww < 0) { ww = -ww; xx = xx - ww; } + if (hh < 0) { hh = -hh; yy = yy - hh; } + Rect rect = { yy , xx , yy + hh , xx + ww } ; + if (m_brush.GetStyle() != wxTRANSPARENT) { MacInstallBrush() ; ::PaintRect( &rect ) ; } + if (m_pen.GetStyle() != wxTRANSPARENT) { MacInstallPen() ; @@ -952,38 +1091,45 @@ void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) } } -void wxDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, +void wxDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius) { - wxCHECK_RET(Ok(), wxT("Invalid DC")); - wxMacPortSetter helper(this) ; + wxCHECK_RET(Ok(), wxT("wxDC::DoDrawRoundedRectangle - invalid DC")); + + wxMacFastPortSetter helper(this) ; if (radius < 0.0) radius = - radius * ((width < height) ? width : height); wxCoord xx = XLOG2DEVMAC(x); wxCoord yy = YLOG2DEVMAC(y); wxCoord ww = m_signX * XLOG2DEVREL(width); wxCoord hh = m_signY * YLOG2DEVREL(height); + // CMB: draw nothing if transformed w or h is 0 if (ww == 0 || hh == 0) return; + // CMB: handle -ve width and/or height if (ww < 0) { ww = -ww; xx = xx - ww; } + if (hh < 0) { hh = -hh; yy = yy - hh; } + Rect rect = { yy , xx , yy + hh , xx + ww } ; + if (m_brush.GetStyle() != wxTRANSPARENT) { MacInstallBrush() ; ::PaintRoundRect( &rect , int(radius * 2) , int(radius * 2) ) ; } + if (m_pen.GetStyle() != wxTRANSPARENT) { MacInstallPen() ; @@ -991,34 +1137,42 @@ void wxDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, } } -void wxDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height) +void wxDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height) { - wxCHECK_RET(Ok(), wxT("Invalid DC")); - wxMacPortSetter helper(this) ; + wxCHECK_RET(Ok(), wxT("wxDC::DoDrawEllipse - invalid DC")); + + wxMacFastPortSetter helper(this) ; + wxCoord xx = XLOG2DEVMAC(x); wxCoord yy = YLOG2DEVMAC(y); wxCoord ww = m_signX * XLOG2DEVREL(width); wxCoord hh = m_signY * YLOG2DEVREL(height); + // CMB: draw nothing if transformed w or h is 0 if (ww == 0 || hh == 0) return; + // CMB: handle -ve width and/or height if (ww < 0) { ww = -ww; xx = xx - ww; } + if (hh < 0) { hh = -hh; yy = yy - hh; } + Rect rect = { yy , xx , yy + hh , xx + ww } ; + if (m_brush.GetStyle() != wxTRANSPARENT) { MacInstallBrush() ; ::PaintOval( &rect ) ; } + if (m_pen.GetStyle() != wxTRANSPARENT) { MacInstallPen() ; @@ -1026,26 +1180,31 @@ void wxDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height) } } -bool wxDC::CanDrawBitmap(void) const +bool wxDC::CanDrawBitmap(void) const { return true ; } -bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, +bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, wxDC *source, wxCoord xsrc, wxCoord ysrc, int logical_func , bool useMask, - wxCoord xsrcMask, wxCoord ysrcMask ) + wxCoord xsrcMask, wxCoord ysrcMask ) { - wxCHECK_MSG(Ok(), false, wxT("wxDC::DoBlit Illegal dc")); - wxCHECK_MSG(source->Ok(), false, wxT("wxDC::DoBlit Illegal source DC")); + wxCHECK_MSG(Ok(), false, wxT("wxDC::DoBlit - invalid DC")); + wxCHECK_MSG(source->Ok(), false, wxT("wxDC::DoBlit - invalid source DC")); + if ( logical_func == wxNO_OP ) - return TRUE ; + return true ; + if (xsrcMask == -1 && ysrcMask == -1) { - xsrcMask = xsrc; ysrcMask = ysrc; + xsrcMask = xsrc; + ysrcMask = ysrc; } + // correct the parameter in case this dc does not have a mask at all if ( useMask && !source->m_macMask ) useMask = false ; + Rect srcrect , dstrect ; srcrect.top = source->YLOG2DEVMAC(ysrc) ; srcrect.left = source->XLOG2DEVMAC(xsrc) ; @@ -1057,73 +1216,94 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, dstrect.right = XLOG2DEVMAC(xdest + width ) ; short mode = kUnsupportedMode ; bool invertDestinationFirst = false ; + switch ( logical_func ) { case wxAND: // src AND dst mode = adMin ; // ok break ; + case wxAND_INVERT: // (NOT src) AND dst mode = notSrcOr ; // ok break ; + case wxAND_REVERSE:// src AND (NOT dst) invertDestinationFirst = true ; mode = srcOr ; break ; + case wxCLEAR: // 0 mode = kEmulatedMode ; break ; + case wxCOPY: // src mode = srcCopy ; // ok break ; + case wxEQUIV: // (NOT src) XOR dst mode = srcXor ; // ok break ; + case wxINVERT: // NOT dst mode = kEmulatedMode ; //or hilite ; break ; + case wxNAND: // (NOT src) OR (NOT dst) invertDestinationFirst = true ; mode = srcBic ; break ; + case wxNOR: // (NOT src) AND (NOT dst) invertDestinationFirst = true ; mode = notSrcOr ; break ; + case wxNO_OP: // dst mode = kEmulatedMode ; // this has already been handled upon entry break ; + case wxOR: // src OR dst mode = notSrcBic ; break ; + case wxOR_INVERT: // (NOT src) OR dst mode = srcBic ; break ; + case wxOR_REVERSE: // src OR (NOT dst) invertDestinationFirst = true ; mode = notSrcBic ; break ; + case wxSET: // 1 mode = kEmulatedMode ; break ; + case wxSRC_INVERT: // (NOT src) mode = notSrcCopy ; // ok break ; + case wxXOR: // src XOR dst mode = notSrcXor ; // ok break ; + default : break ; } + if ( mode == kUnsupportedMode ) { wxFAIL_MSG(wxT("unsupported blitting mode" )); - return FALSE ; + + return false ; } + CGrafPtr sourcePort = (CGrafPtr) source->m_macPort ; PixMapHandle bmappixels = GetGWorldPixMap( sourcePort ) ; if ( LockPixels(bmappixels) ) { - wxMacPortSetter helper(this) ; + wxMacFastPortSetter helper(this) ; + if ( source->GetDepth() == 1 ) { RGBForeColor( &MAC_WXCOLORREF(m_textForegroundColour.GetPixel()) ) ; @@ -1132,11 +1312,13 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, else { // the modes need this, otherwise we'll end up having really nice colors... - RGBColor white = { 0xFFFF, 0xFFFF,0xFFFF} ; - RGBColor black = { 0,0,0} ; + RGBColor white = { 0xFFFF, 0xFFFF, 0xFFFF } ; + RGBColor black = { 0, 0, 0 } ; + RGBForeColor( &black ) ; RGBBackColor( &white ) ; } + if ( useMask && source->m_macMask ) { if ( mode == srcCopy ) @@ -1157,9 +1339,11 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, BitMapToRegion( clipRgn , (BitMap*) *GetGWorldPixMap( MAC_WXHBITMAP(source->m_macMask) ) ) ; UnlockPixels( GetGWorldPixMap( MAC_WXHBITMAP(source->m_macMask) ) ) ; OffsetRgn( clipRgn , -srcrect.left + dstrect.left, -srcrect.top + dstrect.top ) ; + if ( mode == kEmulatedMode ) { Pattern pat ; + ::PenPat(GetQDGlobalsBlack(&pat)); if ( logical_func == wxSET ) { @@ -1187,13 +1371,14 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, Point srcPoint = { srcrect.top + y , srcrect.left + x } ; if ( PtInRgn( dstPoint , clipRgn ) ) { - RGBColor srcColor ; - RGBColor dstColor ; + RGBColor srcColor, dstColor ; + + // NOTE: Get/SetCPixel are slow! SetPort( (GrafPtr) sourcePort ) ; - GetCPixel( srcPoint.h , srcPoint.v , &srcColor) ; + GetCPixel( srcPoint.h , srcPoint.v , &srcColor ) ; SetPort( (GrafPtr) m_macPort ) ; GetCPixel( dstPoint.h , dstPoint.v , &dstColor ) ; - wxMacCalculateColour( logical_func , srcColor , dstColor ) ; + wxMacCalculateColour( logical_func , srcColor , dstColor ) ; SetCPixel( dstPoint.h , dstPoint.v , &dstColor ) ; } } @@ -1203,13 +1388,13 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, else { if ( invertDestinationFirst ) - { MacInvertRgn( clipRgn ) ; - } + CopyBits( GetPortBitMapForCopyBits( sourcePort ) , GetPortBitMapForCopyBits( MAC_WXHBITMAP(m_macPort) ) , &srcrect, &dstrect, mode, clipRgn ) ; } + DisposeRgn( clipRgn ) ; } } @@ -1217,9 +1402,11 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, { RgnHandle clipRgn = NewRgn() ; SetRectRgn( clipRgn , dstrect.left , dstrect.top , dstrect.right , dstrect.bottom ) ; + if ( mode == kEmulatedMode ) { Pattern pat ; + ::PenPat(GetQDGlobalsBlack(&pat)); if ( logical_func == wxSET ) { @@ -1229,7 +1416,8 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, } else if ( logical_func == wxCLEAR ) { - RGBColor col= { 0x0000, 0x0000, 0x0000 } ; + RGBColor col = { 0x0000, 0x0000, 0x0000 } ; + ::RGBForeColor( &col ) ; ::PaintRgn( clipRgn ) ; } @@ -1246,13 +1434,14 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, Point dstPoint = { dstrect.top + y , dstrect.left + x } ; Point srcPoint = { srcrect.top + y , srcrect.left + x } ; { - RGBColor srcColor ; - RGBColor dstColor ; + RGBColor srcColor, dstColor ; + + // NOTE: Get/SetCPixel are slow! SetPort( (GrafPtr) sourcePort ) ; - GetCPixel( srcPoint.h , srcPoint.v , &srcColor) ; + GetCPixel( srcPoint.h , srcPoint.v , &srcColor) ; SetPort( (GrafPtr) m_macPort ) ; GetCPixel( dstPoint.h , dstPoint.v , &dstColor ) ; - wxMacCalculateColour( logical_func , srcColor , dstColor ) ; + wxMacCalculateColour( logical_func , srcColor , dstColor ) ; SetCPixel( dstPoint.h , dstPoint.v , &dstColor ) ; } } @@ -1262,98 +1451,94 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, else { if ( invertDestinationFirst ) - { MacInvertRgn( clipRgn ) ; - } + CopyBits( GetPortBitMapForCopyBits( sourcePort ) , GetPortBitMapForCopyBits( MAC_WXHBITMAP(m_macPort) ) , &srcrect, &dstrect, mode, NULL ) ; } + DisposeRgn( clipRgn ) ; } + UnlockPixels( bmappixels ) ; } + m_macPenInstalled = false ; m_macBrushInstalled = false ; m_macFontInstalled = false ; - return TRUE; -} - -inline Fixed IntToFixed( int inInt ) -{ - return (((SInt32) inInt) << 16); -} -inline int FixedToInt( Fixed inFixed ) -{ - return (((SInt32) inFixed) >> 16); + return true; } -void wxDC::DoDrawRotatedText(const wxString& str, wxCoord x, wxCoord y, +void wxDC::DoDrawRotatedText(const wxString& str, wxCoord x, wxCoord y, double angle) { - wxCHECK_RET( Ok(), wxT("wxDC::DoDrawRotatedText Invalid window dc") ); - - if (angle == 0.0 ) - { - DrawText(str, x, y); - return; - } + // TODO: support text background color (only possible by hand, ATSUI does not support it) + wxCHECK_RET( Ok(), wxT("wxDC::DoDrawRotatedText - invalid DC") ); - if ( str.Length() == 0 ) + if ( str.empty() ) return ; - - wxMacPortSetter helper(this) ; + + wxMacFastPortSetter helper(this) ; MacInstallFont() ; - wxFontRefData * font = (wxFontRefData*) m_font.GetRefData() ; +#if 0 if ( 0 ) { m_macFormerAliasState = IsAntiAliasedTextEnabled(&m_macFormerAliasSize); - SetAntiAliasedTextEnabled(true, SInt16(m_scaleY * font->m_macFontSize)); + SetAntiAliasedTextEnabled(true, SInt16(m_scaleY * m_font.MacGetFontSize())); m_macAliasWasEnabled = true ; } +#endif + OSStatus status = noErr ; ATSUTextLayout atsuLayout ; - UniCharCount chars = str.Length() ; + UniCharCount chars = str.length() ; + UniChar* ubuf = NULL ; + +#if SIZEOF_WCHAR_T == 4 + wxMBConvUTF16 converter ; #if wxUSE_UNICODE - status = ::ATSUCreateTextLayoutWithTextPtr( (UniCharArrayPtr) (const wxChar*) str , 0 , str.Length() , str.Length() , 1 , - &chars , (ATSUStyle*) &m_macATSUIStyle , &atsuLayout ) ; + size_t unicharlen = converter.WC2MB( NULL , str.wc_str() , 0 ) ; + ubuf = (UniChar*) malloc( unicharlen + 2 ) ; + converter.WC2MB( (char*) ubuf , str.wc_str(), unicharlen + 2 ) ; #else - TECObjectRef ec; - status = TECCreateConverter(&ec, - wxApp::s_macDefaultEncodingIsPC - ? (int)kTextEncodingWindowsLatin1 - : (int)kTextEncodingMacRoman, - kTextEncodingUnicodeDefault); - - wxASSERT_MSG( status == noErr , wxT("couldn't start converter") ) ; - ByteCount byteOutLen ; - ByteCount byteInLen = str.Length() ; - ByteCount byteBufferLen = byteInLen *2 ; - char* buf = new char[byteBufferLen] ; - status = TECConvertText(ec, (ConstTextPtr)str.c_str() , byteInLen, &byteInLen, - (TextPtr)buf, byteBufferLen, &byteOutLen); - wxASSERT_MSG( status == noErr , wxT("couldn't convert text") ) ; - status = TECDisposeConverter(ec); - wxASSERT_MSG( status == noErr , wxT("couldn't dispose converter") ) ; - status = ::ATSUCreateTextLayoutWithTextPtr( (UniCharArrayPtr) buf , 0 , byteOutLen / 2 , byteOutLen / 2 , 1 , - &chars , (ATSUStyle*) &m_macATSUIStyle , &atsuLayout ) ; + const wxWCharBuffer wchar = str.wc_str( wxConvLocal ) ; + size_t unicharlen = converter.WC2MB( NULL , wchar.data() , 0 ) ; + ubuf = (UniChar*) malloc( unicharlen + 2 ) ; + converter.WC2MB( (char*) ubuf , wchar.data() , unicharlen + 2 ) ; +#endif + chars = unicharlen / 2 ; +#else +#if wxUSE_UNICODE + ubuf = (UniChar*) str.wc_str() ; +#else + wxWCharBuffer wchar = str.wc_str( wxConvLocal ) ; + chars = wxWcslen( wchar.data() ) ; + ubuf = (UniChar*) wchar.data() ; +#endif #endif + + status = ::ATSUCreateTextLayoutWithTextPtr( (UniCharArrayPtr) ubuf , 0 , chars , chars , 1 , + &chars , (ATSUStyle*) &m_macATSUIStyle , &atsuLayout ) ; + wxASSERT_MSG( status == noErr , wxT("couldn't create the layout of the rotated text") ); + + status = ::ATSUSetTransientFontMatching( atsuLayout , true ) ; + wxASSERT_MSG( status == noErr , wxT("couldn't setup transient font matching") ); + int iAngle = int( angle ); int drawX = XLOG2DEVMAC(x) ; int drawY = YLOG2DEVMAC(y) ; - - ATSUTextMeasurement textBefore ; - ATSUTextMeasurement textAfter ; - ATSUTextMeasurement ascent ; - ATSUTextMeasurement descent ; - - + + ATSUTextMeasurement textBefore, textAfter ; + ATSUTextMeasurement ascent, descent ; + if ( abs(iAngle) > 0 ) { Fixed atsuAngle = IntToFixed( iAngle ) ; + ATSUAttributeTag atsuTags[] = { kATSULineRotationTag , @@ -1366,132 +1551,84 @@ void wxDC::DoDrawRotatedText(const wxString& str, wxCoord x, wxCoord y, { &atsuAngle , } ; + status = ::ATSUSetLayoutControls(atsuLayout , sizeof(atsuTags)/sizeof(ATSUAttributeTag), atsuTags, atsuSizes, atsuValues ) ; } + status = ::ATSUMeasureText( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd, &textBefore , &textAfter, &ascent , &descent ); - - drawX += (int)(sin(angle/RAD2DEG) * FixedToInt(ascent)); - drawY += (int)(cos(angle/RAD2DEG) * FixedToInt(ascent)); + + drawX += (int)(sin(angle / RAD2DEG) * FixedToInt(ascent)); + drawY += (int)(cos(angle / RAD2DEG) * FixedToInt(ascent)); status = ::ATSUDrawText( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd, IntToFixed(drawX) , IntToFixed(drawY) ); + wxASSERT_MSG( status == noErr , wxT("couldn't draw the rotated text") ); + Rect rect ; status = ::ATSUMeasureTextImage( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd, IntToFixed(drawX) , IntToFixed(drawY) , &rect ); wxASSERT_MSG( status == noErr , wxT("couldn't measure the rotated text") ); + OffsetRect( &rect , -m_macLocalOrigin.x , -m_macLocalOrigin.y ) ; CalcBoundingBox(XDEV2LOG(rect.left), YDEV2LOG(rect.top) ); CalcBoundingBox(XDEV2LOG(rect.right), YDEV2LOG(rect.bottom) ); ::ATSUDisposeTextLayout(atsuLayout); -#if wxUSE_UNICODE -#else - delete[] buf ; + +#if SIZEOF_WCHAR_T == 4 + free( ubuf ) ; #endif } -void wxDC::DoDrawText(const wxString& strtext, wxCoord x, wxCoord y) +void wxDC::DoDrawText(const wxString& strtext, wxCoord x, wxCoord y) { - wxCHECK_RET(Ok(), wxT("wxDC::DoDrawText Invalid DC")); + wxCHECK_RET(Ok(), wxT("wxDC::DoDrawText - invalid DC")); - wxMacPortSetter helper(this) ; + wxMacFastPortSetter helper(this) ; long xx = XLOG2DEVMAC(x); long yy = YLOG2DEVMAC(y); -#if TARGET_CARBON +#if TARGET_CARBON bool useDrawThemeText = ( DrawThemeTextBox != (void*) kUnresolvedCFragSymbolAddress ) ; - if ( IsKindOf(CLASSINFO( wxPrinterDC ) ) || m_font.GetNoAntiAliasing() ) + if ( UMAGetSystemVersion() < 0x1000 || IsKindOf(CLASSINFO( wxPrinterDC ) ) || m_font.GetNoAntiAliasing() ) useDrawThemeText = false ; #endif + MacInstallFont() ; - if ( 0 ) - { - m_macFormerAliasState = IsAntiAliasedTextEnabled(&m_macFormerAliasSize); - SetAntiAliasedTextEnabled(true, 8); - m_macAliasWasEnabled = true ; - } + FontInfo fi ; ::GetFontInfo( &fi ) ; + #if TARGET_CARBON if ( !useDrawThemeText ) -#endif yy += fi.ascent ; +#else + yy += fi.ascent ; +#endif + + ::TextMode( (m_backgroundMode == wxTRANSPARENT) ? srcOr : srcCopy ) ; ::MoveTo( xx , yy ); - if ( m_backgroundMode == wxTRANSPARENT ) - { - ::TextMode( srcOr) ; - } - else - { - ::TextMode( srcCopy ) ; - } - int length = strtext.Length() ; - int laststop = 0 ; - int i = 0 ; int line = 0 ; { - while( i < length ) - { - if( strtext[i] == 13 || strtext[i] == 10) - { - wxString linetext = strtext.Mid( laststop , i - laststop ) ; -#if TARGET_CARBON - if ( useDrawThemeText ) - { - Rect frame = { yy + line*(fi.descent + fi.ascent + fi.leading) ,xx , yy + (line+1)*(fi.descent + fi.ascent + fi.leading) , xx + 10000 } ; - wxMacCFStringHolder mString( linetext ) ; - if ( m_backgroundMode != wxTRANSPARENT ) - { - Point bounds={0,0} ; - Rect background = frame ; - SInt16 baseline ; - ::GetThemeTextDimensions( mString, - kThemeCurrentPortFont, - kThemeStateActive, - false, - &bounds, - &baseline ); - background.right = background.left + bounds.h ; - background.bottom = background.top + bounds.v ; - ::EraseRect( &background ) ; - } - ::DrawThemeTextBox( mString, - kThemeCurrentPortFont, - kThemeStateActive, - false, - &frame, - teJustLeft, - nil ); - line++ ; - } - else -#endif - { - wxCharBuffer text = wxMacStringToCString(linetext) ; - ::DrawText( text , 0 , strlen(text) ) ; - line++ ; - ::MoveTo( xx , yy + line*(fi.descent + fi.ascent + fi.leading) ); - } - laststop = i+1 ; - } - i++ ; - } - wxString linetext = strtext.Mid( laststop , i - laststop ) ; + wxString linetext = strtext ; + #if TARGET_CARBON if ( useDrawThemeText ) { - Rect frame = { yy + line*(fi.descent + fi.ascent + fi.leading) ,xx , yy + (line+1)*(fi.descent + fi.ascent + fi.leading) , xx + 10000 } ; - wxMacCFStringHolder mString( linetext ) ; + Rect frame = { + yy + line*(fi.descent + fi.ascent + fi.leading), xx , + yy + (line+1)*(fi.descent + fi.ascent + fi.leading) , xx + 10000 } ; + wxMacCFStringHolder mString( linetext , m_font.GetEncoding()) ; if ( m_backgroundMode != wxTRANSPARENT ) { - Point bounds={0,0} ; + Point bounds = {0, 0} ; Rect background = frame ; SInt16 baseline ; ::GetThemeTextDimensions( mString, - kThemeCurrentPortFont, + m_font.MacGetThemeFontID() , kThemeStateActive, false, &bounds, @@ -1500,121 +1637,78 @@ void wxDC::DoDrawText(const wxString& strtext, wxCoord x, wxCoord y) background.bottom = background.top + bounds.v ; ::EraseRect( &background ) ; } + ::DrawThemeTextBox( mString, - kThemeCurrentPortFont, + m_font.MacGetThemeFontID() , kThemeStateActive, false, &frame, teJustLeft, - nil ); + NULL ); } else #endif { - wxCharBuffer text = wxMacStringToCString(linetext) ; + wxCharBuffer text = linetext.mb_str(wxConvLocal) ; ::DrawText( text , 0 , strlen(text) ) ; } } + ::TextMode( srcOr ) ; } -bool wxDC::CanGetTextExtent() const +bool wxDC::CanGetTextExtent() const { - wxCHECK_MSG(Ok(), false, wxT("Invalid DC")); + wxCHECK_MSG(Ok(), false, wxT("wxDC::CanGetTextExtent - invalid DC")); + return true ; } -void wxDC::DoGetTextExtent( const wxString &strtext, wxCoord *width, wxCoord *height, +void wxDC::DoGetTextExtent( const wxString &strtext, wxCoord *width, wxCoord *height, wxCoord *descent, wxCoord *externalLeading , wxFont *theFont ) const { - wxCHECK_RET(Ok(), wxT("Invalid DC")); - wxMacPortSetter helper(this) ; + wxCHECK_RET(Ok(), wxT("wxDC::DoGetTextExtent - invalid DC")); + + wxMacFastPortSetter helper(this) ; wxFont formerFont = m_font ; if ( theFont ) { // work around the constness *((wxFont*)(&m_font)) = *theFont ; } + MacInstallFont() ; FontInfo fi ; ::GetFontInfo( &fi ) ; -#if TARGET_CARBON + +#if TARGET_CARBON bool useGetThemeText = ( GetThemeTextDimensions != (void*) kUnresolvedCFragSymbolAddress ) ; - if ( IsKindOf(CLASSINFO( wxPrinterDC ) ) || ((wxFont*)&m_font)->GetNoAntiAliasing() ) + if ( UMAGetSystemVersion() < 0x1000 || IsKindOf(CLASSINFO( wxPrinterDC ) ) || ((wxFont*)&m_font)->GetNoAntiAliasing() ) useGetThemeText = false ; #endif + if ( height ) *height = YDEV2LOGREL( fi.descent + fi.ascent ) ; if ( descent ) *descent =YDEV2LOGREL( fi.descent ); if ( externalLeading ) *externalLeading = YDEV2LOGREL( fi.leading ) ; - int length = strtext.Length() ; - /* - const char *text = NULL ; - wxString macText ; - if ( wxApp::s_macDefaultEncodingIsPC ) - { - macText = wxMacMakeMacStringFromPC( string ) ; - text = macText ; - length = macText.Length() ; - } - else - { - text = string ; - length = string.Length() ; - } - */ - int laststop = 0 ; - int i = 0 ; + int curwidth = 0 ; if ( width ) { *width = 0 ; - while( i < length ) - { - if( strtext[i] == 13 || strtext[i] == 10) - { - wxString linetext = strtext.Mid( laststop , i - laststop ) ; - if ( height ) - *height += YDEV2LOGREL( fi.descent + fi.ascent + fi.leading ) ; -#if TARGET_CARBON - if ( useGetThemeText ) - { - Point bounds={0,0} ; - SInt16 baseline ; - wxMacCFStringHolder mString( linetext ) ; - ::GetThemeTextDimensions( mString, - kThemeCurrentPortFont, - kThemeStateActive, - false, - &bounds, - &baseline ); - curwidth = bounds.h ; - } - else -#endif - { - wxCharBuffer text = wxMacStringToCString(linetext) ; - curwidth = ::TextWidth( text , 0 , strlen(text) ) ; - } - if ( curwidth > *width ) - *width = XDEV2LOGREL( curwidth ) ; - laststop = i+1 ; - } - i++ ; - } - - wxString linetext = strtext.Mid( laststop , i - laststop ) ; -#if TARGET_CARBON + wxString linetext = strtext ; + if ( useGetThemeText ) { - Point bounds={0,0} ; + Point bounds = {0, 0} ; SInt16 baseline ; - wxMacCFStringHolder mString( linetext ) ; + wxMacCFStringHolder mString( linetext , m_font.GetEncoding() ) ; + ThemeFontID themeFont = m_font.MacGetThemeFontID() ; ::GetThemeTextDimensions( mString, - kThemeCurrentPortFont, + themeFont , kThemeStateActive, false, &bounds, @@ -1622,14 +1716,15 @@ void wxDC::DoGetTextExtent( const wxString &strtext, wxCoord *width, wxCoord *h curwidth = bounds.h ; } else -#endif { - wxCharBuffer text = wxMacStringToCString(linetext) ; + wxCharBuffer text = linetext.mb_str(wxConvLocal) ; curwidth = ::TextWidth( text , 0 , strlen(text) ) ; } + if ( curwidth > *width ) *width = XDEV2LOGREL( curwidth ) ; } + if ( theFont ) { // work around the constness @@ -1638,26 +1733,89 @@ void wxDC::DoGetTextExtent( const wxString &strtext, wxCoord *width, wxCoord *h } } -wxCoord wxDC::GetCharWidth(void) const +bool wxDC::DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const { - wxCHECK_MSG(Ok(), 1, wxT("Invalid DC")); - wxMacPortSetter helper(this) ; + wxCHECK_MSG(Ok(), false, wxT("wxDC::DoGetPartialTextExtents - invalid DC")); + + widths.Empty(); + widths.Add(0, text.length()); + + if (text.length() == 0) + return false; + + wxMacFastPortSetter helper(this) ; MacInstallFont() ; - int width = 0 ; + #if TARGET_CARBON bool useGetThemeText = ( GetThemeTextDimensions != (void*) kUnresolvedCFragSymbolAddress ) ; - if ( ((wxFont*)&m_font)->GetNoAntiAliasing() ) + if ( UMAGetSystemVersion() < 0x1000 || IsKindOf(CLASSINFO( wxPrinterDC ) ) || ((wxFont*)&m_font)->GetNoAntiAliasing() ) useGetThemeText = false ; + + if ( useGetThemeText ) + { + // If anybody knows how to do this more efficiently yet still handle + // the fractional glyph widths that may be present when using AA + // fonts, please change it. Currently it is measuring from the + // beginning of the string for each succeeding substring, which is much + // slower than this should be. + for (size_t i=0; iGetNoAntiAliasing() ) + useGetThemeText = false ; + if ( useGetThemeText ) { - Point bounds={0,0} ; + Point bounds = {0, 0} ; SInt16 baseline ; CFStringRef mString = CFStringCreateWithBytes( NULL , (UInt8*) text , 1 , CFStringGetSystemEncoding(), false ) ; ::GetThemeTextDimensions( mString, - kThemeCurrentPortFont, + m_font.MacGetThemeFontID(), kThemeStateActive, false, &bounds, @@ -1670,28 +1828,32 @@ wxCoord wxDC::GetCharWidth(void) const { width = ::TextWidth( text , 0 , 1 ) ; } + return YDEV2LOGREL(width) ; } -wxCoord wxDC::GetCharHeight(void) const +wxCoord wxDC::GetCharHeight(void) const { - wxCHECK_MSG(Ok(), 1, wxT("Invalid DC")); - wxMacPortSetter helper(this) ; + wxCHECK_MSG(Ok(), 1, wxT("wxDC::GetCharHeight - invalid DC")); + + wxMacFastPortSetter helper(this) ; MacInstallFont() ; FontInfo fi ; ::GetFontInfo( &fi ) ; + return YDEV2LOGREL( fi.descent + fi.ascent ); } -void wxDC::Clear(void) +void wxDC::Clear(void) { - wxCHECK_RET(Ok(), wxT("Invalid DC")); - wxMacPortSetter helper(this) ; + wxCHECK_RET(Ok(), wxT("wxDC::Clear - invalid DC")); + + wxMacFastPortSetter helper(this) ; Rect rect = { -31000 , -31000 , 31000 , 31000 } ; - if (m_backgroundBrush.GetStyle() != wxTRANSPARENT) + + if ( m_backgroundBrush.Ok() && m_backgroundBrush.GetStyle() != wxTRANSPARENT) { ::PenNormal() ; - //MacInstallBrush() ; MacSetupBackgroundForCurrentPort( m_backgroundBrush ) ; ::EraseRect( &rect ) ; } @@ -1700,68 +1862,61 @@ void wxDC::Clear(void) void wxDC::MacInstallFont() const { wxCHECK_RET(Ok(), wxT("Invalid DC")); + // if ( m_macFontInstalled ) // return ; + Pattern blackColor ; MacSetupBackgroundForCurrentPort(m_backgroundBrush) ; - wxFontRefData * font = (wxFontRefData*) m_font.GetRefData() ; - if ( font ) + if ( m_backgroundMode != wxTRANSPARENT ) { - ::TextFont( font->m_macFontNum ) ; - ::TextSize( short(m_scaleY * font->m_macFontSize) ) ; - ::TextFace( font->m_macFontStyle ) ; - m_macFontInstalled = true ; - m_macBrushInstalled = false ; - m_macPenInstalled = false ; - RGBColor forecolor = MAC_WXCOLORREF( m_textForegroundColour.GetPixel()); - RGBColor backcolor = MAC_WXCOLORREF( m_textBackgroundColour.GetPixel()); - ::RGBForeColor( &forecolor ); - ::RGBBackColor( &backcolor ); - } - else - { - FontFamilyID fontId ; - Str255 fontName ; - SInt16 fontSize ; - Style fontStyle ; - GetThemeFont(kThemeSmallSystemFont , GetApplicationScript() , fontName , &fontSize , &fontStyle ) ; - GetFNum( fontName, &fontId ); - ::TextFont( fontId ) ; - ::TextSize( short(m_scaleY * fontSize) ) ; - ::TextFace( fontStyle ) ; - // todo reset after spacing changes - or store the current spacing somewhere - m_macFontInstalled = true ; - m_macBrushInstalled = false ; - m_macPenInstalled = false ; - RGBColor forecolor = MAC_WXCOLORREF( m_textForegroundColour.GetPixel()); - RGBColor backcolor = MAC_WXCOLORREF( m_textBackgroundColour.GetPixel()); - ::RGBForeColor( &forecolor ); - ::RGBBackColor( &backcolor ); + Pattern whiteColor ; + ::BackPat(GetQDGlobalsWhite(&whiteColor)); } + + wxASSERT( m_font.Ok() ) ; + + ::TextFont( m_font.MacGetFontNum() ) ; + ::TextSize( (short)(m_scaleY * m_font.MacGetFontSize()) ) ; + ::TextFace( m_font.MacGetFontStyle() ) ; + m_macFontInstalled = true ; + m_macBrushInstalled = false ; + m_macPenInstalled = false ; + RGBColor forecolor = MAC_WXCOLORREF( m_textForegroundColour.GetPixel()); + RGBColor backcolor = MAC_WXCOLORREF( m_textBackgroundColour.GetPixel()); + ::RGBForeColor( &forecolor ); + ::RGBBackColor( &backcolor ); + + // TODO: short mode = patCopy ; - // todo : - switch( m_logicalFunction ) + switch ( m_logicalFunction ) { case wxCOPY: // src mode = patCopy ; break ; + case wxINVERT: // NOT dst ::PenPat(GetQDGlobalsBlack(&blackColor)); mode = patXor ; break ; + case wxXOR: // src XOR dst mode = patXor ; break ; + case wxOR_REVERSE: // src OR (NOT dst) mode = notPatOr ; break ; + case wxSRC_INVERT: // (NOT src) mode = notPatCopy ; break ; + case wxAND: // src AND dst mode = adMin ; break ; - // unsupported TODO + + // TODO: unsupported case wxCLEAR: // 0 case wxAND_REVERSE:// src AND (NOT dst) case wxAND_INVERT: // (NOT src) AND dst @@ -1775,199 +1930,151 @@ void wxDC::MacInstallFont() const // case wxSRC_OR: // source _bitmap_ OR destination // case wxSRC_AND: // source _bitmap_ AND destination break ; + + default: + break ; } + ::PenMode( mode ) ; OSStatus status = noErr ; - Fixed atsuSize = IntToFixed( int(m_scaleY * font->m_macFontSize) ) ; - Style qdStyle = font->m_macFontStyle ; - ATSUFontID atsuFont = font->m_macATSUFontID ; - status = ::ATSUCreateStyle((ATSUStyle *)&m_macATSUIStyle) ; - wxASSERT_MSG( status == noErr , wxT("couldn't create ATSU style") ) ; + status = ATSUCreateAndCopyStyle( (ATSUStyle) m_font.MacGetATSUStyle() , (ATSUStyle*) &m_macATSUIStyle ) ; + wxASSERT_MSG( status == noErr , wxT("couldn't set create ATSU style") ) ; + + Fixed atsuSize = IntToFixed( int(m_scaleY * m_font.MacGetFontSize()) ) ; ATSUAttributeTag atsuTags[] = { - kATSUFontTag , kATSUSizeTag , - // kATSUColorTag , - // kATSUBaselineClassTag , - kATSUVerticalCharacterTag, - kATSUQDBoldfaceTag , - kATSUQDItalicTag , - kATSUQDUnderlineTag , - kATSUQDCondensedTag , - kATSUQDExtendedTag , } ; ByteCount atsuSizes[sizeof(atsuTags)/sizeof(ATSUAttributeTag)] = { - sizeof( ATSUFontID ) , sizeof( Fixed ) , - // sizeof( RGBColor ) , - // sizeof( BslnBaselineClass ) , - sizeof( ATSUVerticalCharacterType), - sizeof( Boolean ) , - sizeof( Boolean ) , - sizeof( Boolean ) , - sizeof( Boolean ) , - sizeof( Boolean ) , } ; - Boolean kTrue = true ; - Boolean kFalse = false ; - //BslnBaselineClass kBaselineDefault = kBSLNHangingBaseline ; - ATSUVerticalCharacterType kHorizontal = kATSUStronglyHorizontal; ATSUAttributeValuePtr atsuValues[sizeof(atsuTags)/sizeof(ATSUAttributeTag)] = { - &atsuFont , &atsuSize , - // &MAC_WXCOLORREF( m_textForegroundColour.GetPixel() ) , - // &kBaselineDefault , - &kHorizontal, - (qdStyle & bold) ? &kTrue : &kFalse , - (qdStyle & italic) ? &kTrue : &kFalse , - (qdStyle & underline) ? &kTrue : &kFalse , - (qdStyle & condense) ? &kTrue : &kFalse , - (qdStyle & extend) ? &kTrue : &kFalse , } ; + status = ::ATSUSetAttributes((ATSUStyle)m_macATSUIStyle, sizeof(atsuTags)/sizeof(ATSUAttributeTag) , atsuTags, atsuSizes, atsuValues); - wxASSERT_MSG( status == noErr , wxT("couldn't set create ATSU style") ) ; + + wxASSERT_MSG( status == noErr , wxT("couldn't modify ATSU style") ) ; } -Pattern gHatchPatterns[] = +Pattern gPatterns[] = { - { { 0xFF , 0xFF , 0xFF , 0xFF , 0xFF , 0xFF , 0xFF , 0xFF } }, - { { 0x01 , 0x02 , 0x04 , 0x08 , 0x10 , 0x20 , 0x40 , 0x80 } }, - { { 0x80 , 0x40 , 0x20 , 0x10 , 0x08 , 0x04 , 0x02 , 0x01 } }, - { { 0x10 , 0x10 , 0x10 , 0xFF , 0x10 , 0x10 , 0x10 , 0x10 } }, - { { 0x00 , 0x00 , 0x00 , 0xFF , 0x00 , 0x00 , 0x00 , 0x00 } }, - { { 0x10 , 0x10 , 0x10 , 0x10 , 0x10 , 0x10 , 0x10 , 0x10 } }, - { { 0x81 , 0x42 , 0x24 , 0x18 , 0x18 , 0x24 , 0x42 , 0x81 } } + // hatch patterns + { { 0xFF , 0xFF , 0xFF , 0xFF , 0xFF , 0xFF , 0xFF , 0xFF } } , + { { 0x01 , 0x02 , 0x04 , 0x08 , 0x10 , 0x20 , 0x40 , 0x80 } } , + { { 0x80 , 0x40 , 0x20 , 0x10 , 0x08 , 0x04 , 0x02 , 0x01 } } , + { { 0x10 , 0x10 , 0x10 , 0xFF , 0x10 , 0x10 , 0x10 , 0x10 } } , + { { 0x00 , 0x00 , 0x00 , 0xFF , 0x00 , 0x00 , 0x00 , 0x00 } } , + { { 0x10 , 0x10 , 0x10 , 0x10 , 0x10 , 0x10 , 0x10 , 0x10 } } , + { { 0x81 , 0x42 , 0x24 , 0x18 , 0x18 , 0x24 , 0x42 , 0x81 } } , + + // dash patterns + { { 0xCC , 0x99 , 0x33 , 0x66 , 0xCC , 0x99 , 0x33 , 0x66 } } , // DOT + { { 0xFE , 0xFD , 0xFB , 0xF7 , 0xEF , 0xDF , 0xBF , 0x7F } } , // LONG_DASH + { { 0xEE , 0xDD , 0xBB , 0x77 , 0xEE , 0xDD , 0xBB , 0x77 } } , // SHORT_DASH + { { 0xDE , 0xBD , 0x7B , 0xF6 , 0xED , 0xDB , 0xB7 , 0x6F } } , // DOT_DASH } ; -static void wxMacGetHatchPattern(int hatchStyle, Pattern *pattern) +static void wxMacGetPattern(int penStyle, Pattern *pattern) { - int theIndex = 1 ; - switch(hatchStyle) + int index = 0; // solid pattern by default + switch (penStyle) { - case wxBDIAGONAL_HATCH: - theIndex = 2; - break; - case wxFDIAGONAL_HATCH: - theIndex = 3; - break; - case wxCROSS_HATCH: - theIndex = 4; - break; - case wxHORIZONTAL_HATCH: - theIndex = 5; - break; - case wxVERTICAL_HATCH: - theIndex = 6; - break; - case wxCROSSDIAG_HATCH: - theIndex = 7; - break; - default: - theIndex = 1; // solid pattern - break; + // hatches + case wxBDIAGONAL_HATCH: index = 1; break; + case wxFDIAGONAL_HATCH: index = 2; break; + case wxCROSS_HATCH: index = 3; break; + case wxHORIZONTAL_HATCH: index = 4; break; + case wxVERTICAL_HATCH: index = 5; break; + case wxCROSSDIAG_HATCH: index = 6; break; + + // dashes + case wxDOT: index = 7; break; + case wxLONG_DASH: index = 8; break; + case wxSHORT_DASH: index = 9; break; + case wxDOT_DASH: index = 10; break; + + default: + break; } - *pattern = gHatchPatterns[theIndex-1] ; + + *pattern = gPatterns[index]; } void wxDC::MacInstallPen() const { - wxCHECK_RET(Ok(), wxT("Invalid DC")); - Pattern blackColor; + wxCHECK_RET(Ok(), wxT("wxDC::MacInstallPen - invalid DC")); + + //Pattern blackColor; // if ( m_macPenInstalled ) // return ; + RGBColor forecolor = MAC_WXCOLORREF( m_pen.GetColour().GetPixel()); RGBColor backcolor = MAC_WXCOLORREF( m_backgroundBrush.GetColour().GetPixel()); ::RGBForeColor( &forecolor ); ::RGBBackColor( &backcolor ); ::PenNormal() ; - int penWidth = (int) (m_pen.GetWidth() * m_scaleX) ; ; + // null means only one pixel, at whatever resolution + int penWidth = (int) (m_pen.GetWidth() * m_scaleX) ; if ( penWidth == 0 ) penWidth = 1 ; ::PenSize(penWidth, penWidth); + + Pattern pat; int penStyle = m_pen.GetStyle(); - if (penStyle == wxSOLID) + if (penStyle == wxUSER_DASH) { - ::PenPat(GetQDGlobalsBlack(&blackColor)); - } - else if (IS_HATCH(penStyle)) - { - Pattern pat ; - wxMacGetHatchPattern(penStyle, &pat); - ::PenPat(&pat); + // FIXME: there should be exactly 8 items in the dash + wxDash* dash ; + int number = m_pen.GetDashes(&dash) ; + int index = 0; + for ( int i = 0 ; i < 8 ; ++i ) + { + pat.pat[i] = dash[index] ; + if (index < number - 1) + index++; + } } else { - Pattern pat = *GetQDGlobalsBlack(&blackColor) ; - switch( penStyle ) - { - case wxDOT : - for ( int i = 0 ; i < 8 ; ++i ) - { - pat.pat[i] = 0xCC ; - } - break ; - case wxLONG_DASH : - for ( int i = 0 ; i < 8 ; ++i ) - { - pat.pat[i] = 0xFE ; - } - break ; - case wxSHORT_DASH : - for ( int i = 0 ; i < 8 ; ++i ) - { - pat.pat[i] = 0xEE ; - } - break ; - case wxDOT_DASH : - for ( int i = 0 ; i < 8 ; ++i ) - { - pat.pat[i] = 0x6F ; - } - break ; - case wxUSER_DASH : - { - wxDash* dash ; - m_pen.GetDashes(&dash) ; - // right now we don't allocate larger pixmaps - // int number = - m_pen.GetDashes(&dash) ; - for ( int i = 0 ; i < 8 ; ++i ) - { - pat.pat[i] = dash[0] ; - } - } - break ; - } - ::PenPat(&pat); + wxMacGetPattern(penStyle, &pat); } + ::PenPat(&pat); + + // TODO: short mode = patCopy ; - // todo : - switch( m_logicalFunction ) + switch ( m_logicalFunction ) { case wxCOPY: // only foreground color, leave background (thus not patCopy) mode = patOr ; break ; + case wxINVERT: // NOT dst // ::PenPat(GetQDGlobalsBlack(&blackColor)); mode = patXor ; break ; + case wxXOR: // src XOR dst mode = patXor ; break ; + case wxOR_REVERSE: // src OR (NOT dst) mode = notPatOr ; break ; + case wxSRC_INVERT: // (NOT src) mode = notPatCopy ; break ; + case wxAND: // src AND dst mode = adMin ; break ; - // unsupported TODO + + // TODO: unsupported case wxCLEAR: // 0 case wxAND_REVERSE:// src AND (NOT dst) case wxAND_INVERT: // (NOT src) AND dst @@ -1981,7 +2088,11 @@ void wxDC::MacInstallPen() const // case wxSRC_OR: // source _bitmap_ OR destination // case wxSRC_AND: // source _bitmap_ AND destination break ; + + default: + break ; } + ::PenMode( mode ) ; m_macPenInstalled = true ; m_macBrushInstalled = false ; @@ -1991,37 +2102,44 @@ void wxDC::MacInstallPen() const void wxDC::MacSetupBackgroundForCurrentPort(const wxBrush& background ) { Pattern whiteColor ; - switch( background.MacGetBrushKind() ) + + if ( background.Ok() ) { - case kwxMacBrushTheme : + switch ( background.MacGetBrushKind() ) { - ::SetThemeBackground( background.GetMacTheme() , wxDisplayDepth() , true ) ; - break ; - } - case kwxMacBrushThemeBackground : - { - Rect extent ; - ThemeBackgroundKind bg = background.GetMacThemeBackground( &extent ) ; - ::ApplyThemeBackground( bg , &extent ,kThemeStateActive , wxDisplayDepth() , true ) ; - break ; - } - case kwxMacBrushColour : - { - ::RGBBackColor( &MAC_WXCOLORREF( background.GetColour().GetPixel()) ); - int brushStyle = background.GetStyle(); - if (brushStyle == wxSOLID) - ::BackPat(GetQDGlobalsWhite(&whiteColor)); - else if (IS_HATCH(brushStyle)) + case kwxMacBrushTheme : + ::SetThemeBackground( background.MacGetTheme() , wxDisplayDepth() , true ) ; + break ; + + case kwxMacBrushThemeBackground : { - Pattern pat ; - wxMacGetHatchPattern(brushStyle, &pat); - ::BackPat(&pat); + Rect extent ; + ThemeBackgroundKind bg = background.MacGetThemeBackground( &extent ) ; + ::ApplyThemeBackground( bg , &extent, kThemeStateActive , wxDisplayDepth() , true ) ; } - else + break ; + + case kwxMacBrushColour : { - ::BackPat(GetQDGlobalsWhite(&whiteColor)); + ::RGBBackColor( &MAC_WXCOLORREF( background.GetColour().GetPixel()) ); + int brushStyle = background.GetStyle(); + if (brushStyle == wxSOLID) + ::BackPat(GetQDGlobalsWhite(&whiteColor)); + else if (background.IsHatch()) + { + Pattern pat ; + wxMacGetPattern(brushStyle, &pat); + ::BackPat(&pat); + } + else + { + ::BackPat(GetQDGlobalsWhite(&whiteColor)); + } } - break ; + break ; + + default: + break ; } } } @@ -2029,37 +2147,57 @@ void wxDC::MacSetupBackgroundForCurrentPort(const wxBrush& background ) void wxDC::MacInstallBrush() const { wxCHECK_RET(Ok(), wxT("Invalid DC")); - Pattern blackColor ; + // if ( m_macBrushInstalled ) // return ; - // foreground + + Pattern blackColor ; bool backgroundTransparent = (GetBackgroundMode() == wxTRANSPARENT) ; ::RGBForeColor( &MAC_WXCOLORREF( m_brush.GetColour().GetPixel()) ); ::RGBBackColor( &MAC_WXCOLORREF( m_backgroundBrush.GetColour().GetPixel()) ); + int brushStyle = m_brush.GetStyle(); if (brushStyle == wxSOLID) { - ::PenPat(GetQDGlobalsBlack(&blackColor)); + switch ( m_brush.MacGetBrushKind() ) + { + case kwxMacBrushTheme : + { + Pattern whiteColor ; + ::BackPat(GetQDGlobalsWhite(&whiteColor)); + ::SetThemePen( m_brush.MacGetTheme() , wxDisplayDepth() , true ) ; + } + break ; + + default : + ::PenPat(GetQDGlobalsBlack(&blackColor)); + break ; + + } } - else if (IS_HATCH(brushStyle)) + else if (m_brush.IsHatch()) { Pattern pat ; - wxMacGetHatchPattern(brushStyle, &pat); + + wxMacGetPattern(brushStyle, &pat); ::PenPat(&pat); } else if ( m_brush.GetStyle() == wxSTIPPLE || m_brush.GetStyle() == wxSTIPPLE_MASK_OPAQUE ) { // we force this in order to be compliant with wxMSW backgroundTransparent = false ; + // for these the text fore (and back for MASK_OPAQUE) colors are used wxBitmap* bitmap = m_brush.GetStipple() ; int width = bitmap->GetWidth() ; int height = bitmap->GetHeight() ; GWorldPtr gw = NULL ; + if ( m_brush.GetStyle() == wxSTIPPLE ) - gw = MAC_WXHBITMAP(bitmap->GetHBITMAP()) ; + gw = MAC_WXHBITMAP(bitmap->GetHBITMAP(NULL)) ; else - gw = MAC_WXHBITMAP(bitmap->GetMask()->GetMaskBitmap()) ; + gw = MAC_WXHBITMAP(bitmap->GetMask()->GetHBITMAP()) ; + PixMapHandle gwpixmaphandle = GetGWorldPixMap( gw ) ; LockPixels( gwpixmaphandle ) ; bool isMonochrome = !IsPortColor( gw ) ; @@ -2068,6 +2206,7 @@ void wxDC::MacInstallBrush() const if ( (**gwpixmaphandle).pixelSize == 1 ) isMonochrome = true ; } + if ( isMonochrome && width == 8 && height == 8 ) { ::RGBForeColor( &MAC_WXCOLORREF( m_textForegroundColour.GetPixel()) ); @@ -2076,10 +2215,12 @@ void wxDC::MacInstallBrush() const UInt8 *gwbits = (UInt8*) gwbitmap->baseAddr ; int alignment = gwbitmap->rowBytes & 0x7FFF ; Pattern pat ; + for ( int i = 0 ; i < 8 ; ++i ) { - pat.pat[i] = gwbits[i*alignment+0] ; + pat.pat[i] = gwbits[i * alignment + 0] ; } + UnlockPixels( GetGWorldPixMap( gw ) ) ; ::PenPat( &pat ) ; } @@ -2089,6 +2230,7 @@ void wxDC::MacInstallBrush() const // caching scheme before putting this into production Handle image; long imageSize; + PixPatHandle pixpat = NewPixPat() ; CopyPixMap(gwpixmaphandle, (**pixpat).patMap); imageSize = GetPixRowBytes((**pixpat).patMap) * @@ -2096,6 +2238,7 @@ void wxDC::MacInstallBrush() const (**(**pixpat).patMap).bounds.top); PtrToHand( (**gwpixmaphandle).baseAddr, &image, imageSize ); (**pixpat).patData = image; + if ( isMonochrome ) { CTabHandle ctable = ((**((**pixpat).patMap)).pmTable) ; @@ -2112,17 +2255,20 @@ void wxDC::MacInstallBrush() const } ::CTabChanged( ctable ) ; } + ::PenPixPat(pixpat); m_macForegroundPixMap = pixpat ; } + UnlockPixels( gwpixmaphandle ) ; } else { ::PenPat(GetQDGlobalsBlack(&blackColor)); } + short mode = patCopy ; - switch( m_logicalFunction ) + switch ( m_logicalFunction ) { case wxCOPY: // src if ( backgroundTransparent ) @@ -2130,26 +2276,30 @@ void wxDC::MacInstallBrush() const else mode = patCopy ; break ; + case wxINVERT: // NOT dst if ( !backgroundTransparent ) - { ::PenPat(GetQDGlobalsBlack(&blackColor)); - } mode = patXor ; break ; + case wxXOR: // src XOR dst mode = patXor ; break ; + case wxOR_REVERSE: // src OR (NOT dst) mode = notPatOr ; break ; + case wxSRC_INVERT: // (NOT src) mode = notPatCopy ; break ; + case wxAND: // src AND dst mode = adMin ; break ; - // unsupported TODO + + // TODO: unsupported case wxCLEAR: // 0 case wxAND_REVERSE:// src AND (NOT dst) case wxAND_INVERT: // (NOT src) AND dst @@ -2163,7 +2313,11 @@ void wxDC::MacInstallBrush() const // case wxSRC_OR: // source _bitmap_ OR destination // case wxSRC_AND: // source _bitmap_ AND destination break ; + + default: + break ; } + ::PenMode( mode ) ; m_macBrushInstalled = true ; m_macPenInstalled = false ; @@ -2213,3 +2367,5 @@ wxCoord wxDCBase::LogicalToDeviceYRel(wxCoord y) const { return ((wxDC *)this)->YLOG2DEVREL(y); } + +#endif // !wxMAC_USE_CORE_GRAPHICS