#include "wx/dcmemory.h"
#include "wx/region.h"
#include "wx/image.h"
+#include "wx/log.h"
+
#if __MSL__ >= 0x6000
#include "math.h"
+using namespace std ;
#endif
+#include "wx/mac/private.h"
+#include "ATSUnicode.h"
+#include "TextCommon.h"
+#include "TextEncodingConverter.h"
+
#if !USE_SHARED_LIBRARY
IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
#endif
const double M_PI = 3.14159265358979 ;
#endif
const double RAD2DEG = 180.0 / M_PI;
+const short kEmulatedMode = -1 ;
+const short kUnsupportedMode = -2 ;
+
+wxMacPortSetter::wxMacPortSetter( const wxDC* dc ) :
+ m_ph( (GrafPtr) dc->m_macPort )
+{
+ wxASSERT( dc->Ok() ) ;
+ m_dc = dc ;
+ dc->MacSetupPort(&m_ph) ;
+}
+
+wxMacPortSetter::~wxMacPortSetter()
+{
+ m_dc->MacCleanupPort(&m_ph) ;
+}
//-----------------------------------------------------------------------------
// Local functions
// wxDC
//-----------------------------------------------------------------------------
+// this function emulates all wx colour manipulations, used to verify the implementation
+// by setting the mode in the blitting functions to kEmulatedMode
+
+void wxMacCalculateColour( int logical_func , const RGBColor &srcColor , RGBColor &dstColor ) ;
+void wxMacCalculateColour( int logical_func , const RGBColor &srcColor , RGBColor &dstColor )
+{
+ switch ( logical_func )
+ {
+ case wxAND: // src AND dst
+ dstColor.red = dstColor.red & srcColor.red ;
+ 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 ;
+ }
+
+}
+
wxDC::wxDC()
{
m_ok = FALSE;
m_colour = TRUE;
-
+
m_mm_to_pix_x = mm2pt;
m_mm_to_pix_y = mm2pt;
-
+
m_internalDeviceOriginX = 0;
m_internalDeviceOriginY = 0;
m_externalDeviceOriginX = 0;
m_externalDeviceOriginY = 0;
-
+
m_logicalScaleX = 1.0;
m_logicalScaleY = 1.0;
m_userScaleX = 1.0;
m_userScaleY = 1.0;
m_scaleX = 1.0;
m_scaleY = 1.0;
-
+
m_needComputeScaleX = FALSE;
m_needComputeScaleY = FALSE;
-
- m_maxX = m_maxY = -100000;
- m_minY = m_minY = 100000;
m_macPort = NULL ;
m_macMask = NULL ;
m_ok = FALSE ;
-
+
m_macFontInstalled = false ;
m_macBrushInstalled = false ;
m_macPenInstalled = false ;
-
- m_macLocalOrigin.h = m_macLocalOrigin.v = 0 ;
+
+ m_macLocalOrigin.x = m_macLocalOrigin.y = 0 ;
m_macBoundaryClipRgn = NewRgn() ;
m_macCurrentClipRgn = NewRgn() ;
- SetRectRgn( m_macBoundaryClipRgn , -32000 , -32000 , 32000 , 32000 ) ;
- SetRectRgn( m_macCurrentClipRgn , -32000 , -32000 , 32000 , 32000 ) ;
+ SetRectRgn( (RgnHandle) m_macBoundaryClipRgn , -32000 , -32000 , 32000 , 32000 ) ;
+ SetRectRgn( (RgnHandle) m_macCurrentClipRgn , -32000 , -32000 , 32000 , 32000 ) ;
m_pen = *wxBLACK_PEN;
m_font = *wxNORMAL_FONT;
m_brush = *wxWHITE_BRUSH;
-}
-wxMacPortSetter::wxMacPortSetter( const wxDC* dc ) :
- m_ph( dc->m_macPort )
-{
- wxASSERT( dc->Ok() ) ;
-
- dc->MacSetupPort(&m_ph) ;
-}
-
-wxMacPortSetter::~wxMacPortSetter()
-{
+ m_macCurrentPortStateHelper = NULL ;
+ m_macATSUIStyle = NULL ;
+ m_macAliasWasEnabled = false;
+ m_macForegroundPixMap = NULL ;
+ m_macBackgroundPixMap = NULL ;
}
wxDC::~wxDC(void)
{
- DisposeRgn( m_macBoundaryClipRgn ) ;
- DisposeRgn( m_macCurrentClipRgn ) ;
+ DisposeRgn( (RgnHandle) m_macBoundaryClipRgn ) ;
+ DisposeRgn( (RgnHandle) m_macCurrentClipRgn ) ;
}
-void wxDC::MacSetupPort(AGAPortHelper* help) const
+void wxDC::MacSetupPort(wxMacPortStateHelper* help) const
{
- SetClip( m_macCurrentClipRgn);
+ wxASSERT( m_macCurrentPortStateHelper == NULL ) ;
+ m_macCurrentPortStateHelper = help ;
+ SetClip( (RgnHandle) m_macCurrentClipRgn);
m_macFontInstalled = false ;
m_macBrushInstalled = false ;
- m_macPenInstalled = false ;
+ m_macPenInstalled = false ;
+}
+
+void wxDC::MacCleanupPort(wxMacPortStateHelper* help) const
+{
+ wxASSERT( m_macCurrentPortStateHelper == help ) ;
+ m_macCurrentPortStateHelper = NULL ;
+ 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 ;
+ ::PenPat(GetQDGlobalsBlack(&blackColor));
+ DisposePixPat( (PixPatHandle) m_macForegroundPixMap ) ;
+ m_macForegroundPixMap = NULL ;
+ }
+ if ( m_macBackgroundPixMap )
+ {
+ Pattern whiteColor ;
+ ::BackPat(GetQDGlobalsWhite(&whiteColor));
+ DisposePixPat( (PixPatHandle) m_macBackgroundPixMap ) ;
+ m_macBackgroundPixMap = NULL ;
+ }
}
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) ;
-
+
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 :
//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( bmp.GetPict(), &bitmaprect ) ;
+ ::DrawPicture( (PicHandle) bmp.GetPict(), &bitmaprect ) ;
}
else if ( bmp.GetBitmapType() == kMacBitmapTypeGrafWorld )
{
- GWorldPtr bmapworld = bmp.GetHBITMAP();
+ GWorldPtr bmapworld = MAC_WXHBITMAP( bmp.GetHBITMAP() );
PixMapHandle bmappixels ;
-
+
// Set foreground and background colours (for bitmaps depth = 1)
if(bmp.GetDepth() == 1)
{
- RGBColor fore = m_textForegroundColour.GetPixel();
- RGBColor back = m_textBackgroundColour.GetPixel();
+ RGBColor fore = MAC_WXCOLORREF(m_textForegroundColour.GetPixel());
+ RGBColor back = MAC_WXCOLORREF(m_textBackgroundColour.GetPixel());
RGBForeColor(&fore);
RGBBackColor(&back);
}
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() )
{
- if( LockPixels(GetGWorldPixMap(bmp.GetMask()->GetMaskBitmap())))
+ if( LockPixels(GetGWorldPixMap(MAC_WXHBITMAP(bmp.GetMask()->GetMaskBitmap()))))
{
CopyDeepMask
(
GetPortBitMapForCopyBits(bmapworld),
- GetPortBitMapForCopyBits(bmp.GetMask()->GetMaskBitmap()),
- GetPortBitMapForCopyBits( m_macPort ),
+ GetPortBitMapForCopyBits(MAC_WXHBITMAP(bmp.GetMask()->GetMaskBitmap())),
+ GetPortBitMapForCopyBits( MAC_WXHBITMAP(m_macPort) ),
&source, &source, &dest, mode, NULL
);
- UnlockPixels(GetGWorldPixMap(bmp.GetMask()->GetMaskBitmap()));
+ UnlockPixels(GetGWorldPixMap(MAC_WXHBITMAP(bmp.GetMask()->GetMaskBitmap())));
}
}
else {
CopyBits( GetPortBitMapForCopyBits( bmapworld ),
- GetPortBitMapForCopyBits( m_macPort ),
+ GetPortBitMapForCopyBits( MAC_WXHBITMAP(m_macPort) ),
&source, &dest, mode, NULL ) ;
}
UnlockPixels( bmappixels ) ;
{
Rect bitmaprect = { 0 , 0 , bmp.GetHeight(), bmp.GetWidth() } ;
OffsetRect( &bitmaprect, xx, yy ) ;
- PlotCIconHandle( &bitmaprect , atNone , ttNone , bmp.GetHICON() ) ;
+ PlotCIconHandle( &bitmaprect , atNone , ttNone , MAC_WXHICON(bmp.GetHICON()) ) ;
}
m_macPenInstalled = false ;
m_macBrushInstalled = false ;
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 ) ;
}
void wxDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
ww = XLOG2DEVREL(width);
hh = YLOG2DEVREL(height);
- SetRectRgn( m_macCurrentClipRgn , xx , yy , xx + ww , yy + hh ) ;
- SectRgn( m_macCurrentClipRgn , m_macBoundaryClipRgn , m_macCurrentClipRgn ) ;
-
+ SetRectRgn( (RgnHandle) m_macCurrentClipRgn , xx , yy , xx + ww , yy + hh ) ;
+ SectRgn( (RgnHandle) m_macCurrentClipRgn , (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ;
+
if( m_clipping )
{
m_clipX1 = wxMax( m_clipX1 , xx );
}
else
{
- CopyRgn( region.GetWXHRGN() , m_macCurrentClipRgn ) ;
+ CopyRgn( (RgnHandle) region.GetWXHRGN() , (RgnHandle) m_macCurrentClipRgn ) ;
if ( xx != x || yy != y )
{
- OffsetRgn( m_macCurrentClipRgn , xx - x , yy - y ) ;
+ OffsetRgn( (RgnHandle) m_macCurrentClipRgn , xx - x , yy - y ) ;
}
- SectRgn( m_macCurrentClipRgn , m_macBoundaryClipRgn , m_macCurrentClipRgn ) ;
+ SectRgn( (RgnHandle) m_macCurrentClipRgn , (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ;
if( m_clipping )
{
m_clipX1 = wxMax( m_clipX1 , xx );
void wxDC::DestroyClippingRegion()
{
wxMacPortSetter helper(this) ;
- CopyRgn( m_macBoundaryClipRgn , m_macCurrentClipRgn ) ;
+ CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ;
m_clipping = FALSE;
-}
+}
void wxDC::DoGetSize( int* width, int* height ) const
{
*width = m_maxX-m_minX;
}
void wxDC::SetMapMode( int mode )
{
- switch (mode)
+ switch (mode)
{
case wxMM_TWIPS:
SetLogicalScale( twips2mm*m_mm_to_pix_x, twips2mm*m_mm_to_pix_y );
m_signX = (xLeftRight ? 1 : -1);
m_signY = (yBottomUp ? -1 : 1);
ComputeScaleAndOrigin();
-}/*
-
-void wxDC::CalcBoundingBox( long x, long y )
-{
- if (x < m_minX) m_minX = x;
- if (y < m_minY) m_minY = y;
- if (x > m_maxX) m_maxX = x;
- if (y > m_maxY) m_maxY = y;
-}*/
+}
+
wxSize wxDC::GetPPI() const
{
return wxSize(72, 72);
int wxDC::GetDepth() const
{
- return wxDisplayDepth() ;
+ if ( IsPortColor( (CGrafPtr) m_macPort ) )
+ {
+ return ( (**GetPortPixMap( (CGrafPtr) m_macPort)).pixelSize ) ;
+ }
+ return 1 ;
}
void wxDC::ComputeScaleAndOrigin()
m_deviceOriginX = m_internalDeviceOriginX + m_externalDeviceOriginX;
m_deviceOriginY = m_internalDeviceOriginY + m_externalDeviceOriginY;
- // CMB: if scale has changed call SetPen to recalulate the line width
+ // 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
{
if ( m_pen == pen )
return ;
-
+
m_pen = pen;
m_macPenInstalled = false ;
void wxDC::SetBrush( const wxBrush &brush )
{
- if (m_brush == brush)
+ if (m_brush == brush)
return;
-
+
m_brush = brush;
m_macBrushInstalled = false ;
}
void wxDC::SetBackground( const wxBrush &brush )
{
- if (m_backgroundBrush == brush)
+ if (m_backgroundBrush == brush)
return;
-
+
m_backgroundBrush = brush;
-
- if (!m_backgroundBrush.Ok())
+
+ if (!m_backgroundBrush.Ok())
return;
m_macBrushInstalled = false ;
}
void wxDC::SetLogicalFunction( int function )
{
- if (m_logicalFunction == function)
+ if (m_logicalFunction == function)
return;
m_logicalFunction = function ;
m_macPenInstalled = false ;
}
-void wxDC::DoFloodFill( wxCoord x, wxCoord y, const wxColour& col,
- int style )
+extern bool wxDoFloodFill(wxDC *dc, wxCoord x, wxCoord y,
+ const wxColour & col, int style);
+
+bool wxDC::DoFloodFill(wxCoord x, wxCoord y,
+ const wxColour& col, int style)
{
+ 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) ;
void wxDC::DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 )
{
wxCHECK_RET(Ok(), wxT("Invalid DC"));
-
+
wxMacPortSetter helper(this) ;
-
+
if (m_pen.GetStyle() != wxTRANSPARENT)
{
MacInstallPen() ;
xx2++;
}
}
-
+
::MoveTo(xx1, yy1);
::LineTo(xx2, yy2);
}
::LineTo( XLOG2DEVMAC(w), yy );
::MoveTo( xx, YLOG2DEVMAC(0) );
::LineTo( xx, YLOG2DEVMAC(h) );
+
+ CalcBoundingBox(x, y);
+ CalcBoundingBox(x+w, y+h);
+
}
}
Rect r;
double angle = sa - ea; // Order important Mac in opposite direction to wx
-
+
wxCoord xx = XLOG2DEVMAC(x);
wxCoord yy = YLOG2DEVMAC(y);
wxCoord ww = m_signX * XLOG2DEVREL(w);
void wxDC::DoDrawPoint( wxCoord x, wxCoord y )
{
wxCHECK_RET(Ok(), wxT("Invalid DC"));
-
+
wxMacPortSetter helper(this) ;
-
- if (m_pen.GetStyle() != wxTRANSPARENT)
+
+ if (m_pen.GetStyle() != wxTRANSPARENT)
{
- MacInstallPen() ;
- wxCoord xx1 = XLOG2DEVMAC(x);
+ wxCoord xx1 = XLOG2DEVMAC(x);
wxCoord yy1 = YLOG2DEVMAC(y);
-
- ::MoveTo(xx1,yy1);
- ::LineTo(xx1+1, yy1+1);
+ RGBColor pencolor = MAC_WXCOLORREF( m_pen.GetColour().GetPixel());
+ ::SetCPixel( xx1,yy1,&pencolor) ;
+ CalcBoundingBox(x, y);
}
}
{
wxCHECK_RET(Ok(), wxT("Invalid DC"));
wxMacPortSetter helper(this) ;
-
- if (m_pen.GetStyle() == wxTRANSPARENT)
+
+ if (m_pen.GetStyle() == wxTRANSPARENT)
return;
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);
+ y1 = YLOG2DEVMAC(points[0].y + yoffset);
::MoveTo(x1 - offset, y1 - offset );
-
+
for (int i = 0; i < n-1; i++)
{
x2 = XLOG2DEVMAC(points[i+1].x + xoffset);
}
void wxDC::DoDrawPolygon(int n, wxPoint points[],
- wxCoord xoffset, wxCoord yoffset,
- int fillStyle )
+ wxCoord xoffset, wxCoord yoffset,
+ int fillStyle )
{
wxCHECK_RET(Ok(), wxT("Invalid DC"));
wxMacPortSetter helper(this) ;
-
+
wxCoord x1, x2 , y1 , y2 ;
-
+
+ if ( m_brush.GetStyle() == wxTRANSPARENT && m_pen.GetStyle() == wxTRANSPARENT )
+ return ;
+
+ PolyHandle polygon = OpenPoly();
+
+ x1 = XLOG2DEVMAC(points[0].x + xoffset);
+ y1 = YLOG2DEVMAC(points[0].y + yoffset);
+ ::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 ) ;
+ }
+
+ ClosePoly();
+
if (m_brush.GetStyle() != wxTRANSPARENT)
{
- PolyHandle polygon = OpenPoly();
-
- x1 = XLOG2DEVMAC(points[0].x + xoffset);
- y1 = YLOG2DEVMAC(points[0].y + yoffset);
- ::MoveTo(x1,y1);
-
- for (int i = 0; i < n-1; i++)
- {
- x2 = XLOG2DEVMAC(points[i+1].x + xoffset);
- y2 = YLOG2DEVMAC(points[i+1].y + yoffset);
- ::LineTo(x2, y2);
- }
-
- ClosePoly();
MacInstallBrush();
::PaintPoly( polygon );
-
- KillPoly( polygon );
+
}
-
- if (m_pen.GetStyle() != wxTRANSPARENT)
+
+ if (m_pen.GetStyle() != wxTRANSPARENT)
{
- PolyHandle polygon = OpenPoly();
-
- x1 = XLOG2DEVMAC(points[0].x + xoffset);
- y1 = YLOG2DEVMAC(points[0].y + yoffset);
- ::MoveTo(x1,y1);
-
- for (int i = 0; i < n-1; i++)
- {
- x2 = XLOG2DEVMAC(points[i+1].x + xoffset);
- y2 = YLOG2DEVMAC(points[i+1].y + yoffset);
- ::LineTo(x2, y2);
- }
-
- // return to origin to close path
- ::LineTo(x1,y1);
-
- ClosePoly();
-
+
MacInstallPen() ;
::FramePoly( polygon ) ;
-
- KillPoly( polygon );
+
}
+ KillPoly( polygon );
}
void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
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)
+ if (ww == 0 || hh == 0)
return;
-
+
// CMB: handle -ve width and/or height
- if (ww < 0)
- {
- ww = -ww;
- xx = xx - ww;
+ if (ww < 0)
+ {
+ ww = -ww;
+ xx = xx - ww;
}
-
- if (hh < 0)
- {
- hh = -hh;
- yy = yy - hh;
+
+ if (hh < 0)
+ {
+ hh = -hh;
+ yy = yy - hh;
}
-
+
Rect rect = { yy , xx , yy + hh , xx + ww } ;
-
- if (m_brush.GetStyle() != wxTRANSPARENT)
+
+ if (m_brush.GetStyle() != wxTRANSPARENT)
{
MacInstallBrush() ;
::PaintRect( &rect ) ;
}
-
- if (m_pen.GetStyle() != wxTRANSPARENT)
+
+ if (m_pen.GetStyle() != wxTRANSPARENT)
{
MacInstallPen() ;
::FrameRect( &rect ) ;
{
wxCHECK_RET(Ok(), wxT("Invalid DC"));
wxMacPortSetter helper(this) ;
-
- if (radius < 0.0)
+
+ 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)
+ if (ww == 0 || hh == 0)
return;
-
+
// CMB: handle -ve width and/or height
- if (ww < 0)
- {
- ww = -ww;
- xx = xx - ww;
+ if (ww < 0)
+ {
+ ww = -ww;
+ xx = xx - ww;
}
-
- if (hh < 0)
- {
- hh = -hh;
- yy = yy - hh;
+
+ if (hh < 0)
+ {
+ hh = -hh;
+ yy = yy - hh;
}
-
+
Rect rect = { yy , xx , yy + hh , xx + ww } ;
-
- if (m_brush.GetStyle() != wxTRANSPARENT)
+
+ if (m_brush.GetStyle() != wxTRANSPARENT)
{
MacInstallBrush() ;
::PaintRoundRect( &rect , int(radius * 2) , int(radius * 2) ) ;
}
-
- if (m_pen.GetStyle() != wxTRANSPARENT)
+
+ if (m_pen.GetStyle() != wxTRANSPARENT)
{
MacInstallPen() ;
::FrameRoundRect( &rect , int(radius * 2) , int(radius * 2) ) ;
}
-
-bool wxDC::CanDrawBitmap(void) const
+
+bool wxDC::CanDrawBitmap(void) const
{
return true ;
}
{
wxCHECK_MSG(Ok(), false, wxT("wxDC::DoBlit Illegal dc"));
wxCHECK_MSG(source->Ok(), false, wxT("wxDC::DoBlit Illegal source DC"));
- wxMacPortSetter helper(this) ;
- /* TODO: use the mask origin when drawing transparently */
+ if ( logical_func == wxNO_OP )
+ return TRUE ;
+
if (xsrcMask == -1 && ysrcMask == -1)
{
xsrcMask = xsrc; ysrcMask = ysrc;
}
- CGrafPtr sourcePort = (CGrafPtr) source->m_macPort ;
- PixMapHandle bmappixels = GetGWorldPixMap( sourcePort ) ;
- RGBColor white = { 0xFFFF, 0xFFFF,0xFFFF} ;
- RGBColor black = { 0,0,0} ;
- RGBColor forecolor = m_textForegroundColour.GetPixel();
- RGBColor backcolor = m_textBackgroundColour.GetPixel();
- RGBForeColor( &forecolor ) ;
- RGBBackColor( &backcolor ) ;
+ // 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) ;
+ srcrect.right = source->XLOG2DEVMAC(xsrc + width ) ;
+ srcrect.bottom = source->YLOG2DEVMAC(ysrc + height) ;
+ dstrect.top = YLOG2DEVMAC(ydest) ;
+ dstrect.left = XLOG2DEVMAC(xdest) ;
+ dstrect.bottom = YLOG2DEVMAC(ydest + height ) ;
+ dstrect.right = XLOG2DEVMAC(xdest + width ) ;
+ short mode = kUnsupportedMode ;
+ bool invertDestinationFirst = false ;
+ switch ( logical_func )
+ {
+ case wxAND: // src AND dst
+ mode = srcOr ; // 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("unsupported blitting mode" );
+ return FALSE ;
+ }
+
+ CGrafPtr sourcePort = (CGrafPtr) source->m_macPort ;
+ PixMapHandle bmappixels = GetGWorldPixMap( sourcePort ) ;
if ( LockPixels(bmappixels) )
{
- Rect srcrect , dstrect ;
- srcrect.top = source->YLOG2DEVMAC(ysrc) ;
- srcrect.left = source->XLOG2DEVMAC(xsrc) ;
- srcrect.right = source->XLOG2DEVMAC(xsrc + width ) ;
- srcrect.bottom = source->YLOG2DEVMAC(ysrc + height) ;
- dstrect.top = YLOG2DEVMAC(ydest) ;
- dstrect.left = XLOG2DEVMAC(xdest) ;
- dstrect.bottom = YLOG2DEVMAC(ydest + height ) ;
- dstrect.right = XLOG2DEVMAC(xdest + width ) ;
-
- short mode = (logical_func == wxCOPY ? srcCopy :
- // logical_func == wxCLEAR ? WHITENESS :
- // logical_func == wxSET ? BLACKNESS :
- logical_func == wxINVERT ? hilite :
- // logical_func == wxAND ? MERGECOPY :
- logical_func == wxOR ? srcOr :
- logical_func == wxSRC_INVERT ? notSrcCopy :
- logical_func == wxXOR ? srcXor :
- // logical_func == wxOR_REVERSE ? MERGEPAINT :
- // logical_func == wxAND_REVERSE ? SRCERASE :
- // logical_func == wxSRC_OR ? srcOr :
- // logical_func == wxSRC_AND ? SRCAND :
- srcCopy );
+ wxMacPortSetter helper(this) ;
+
+ if ( source->GetDepth() == 1 )
+ {
+ RGBForeColor( &MAC_WXCOLORREF(m_textForegroundColour.GetPixel()) ) ;
+ RGBBackColor( &MAC_WXCOLORREF(m_textBackgroundColour.GetPixel()) ) ;
+ }
+ else
+ {
+ // the modes need this, otherwise we'll end up having really nice colors...
+ RGBColor white = { 0xFFFF, 0xFFFF,0xFFFF} ;
+ RGBColor black = { 0,0,0} ;
+ RGBForeColor( &black ) ;
+ RGBBackColor( &white ) ;
+ }
if ( useMask && source->m_macMask )
{
if ( mode == srcCopy )
{
- if ( LockPixels( GetGWorldPixMap( source->m_macMask ) ) )
+ if ( LockPixels( GetGWorldPixMap( MAC_WXHBITMAP(source->m_macMask) ) ) )
{
- CopyMask( GetPortBitMapForCopyBits( sourcePort ) ,
- GetPortBitMapForCopyBits( source->m_macMask ) ,
- GetPortBitMapForCopyBits( m_macPort ) ,
+ CopyMask( GetPortBitMapForCopyBits( sourcePort ) ,
+ GetPortBitMapForCopyBits( MAC_WXHBITMAP(source->m_macMask) ) ,
+ GetPortBitMapForCopyBits( MAC_WXHBITMAP(m_macPort) ) ,
&srcrect, &srcrect , &dstrect ) ;
- UnlockPixels( GetGWorldPixMap( source->m_macMask ) ) ;
+ UnlockPixels( GetGWorldPixMap( MAC_WXHBITMAP(source->m_macMask) ) ) ;
}
}
else
{
RgnHandle clipRgn = NewRgn() ;
-
- LockPixels( GetGWorldPixMap( source->m_macMask ) ) ;
- BitMapToRegion( clipRgn , (BitMap*) *GetGWorldPixMap( source->m_macMask ) ) ;
- UnlockPixels( GetGWorldPixMap( source->m_macMask ) ) ;
- //OffsetRgn( clipRgn , -source->m_macMask->portRect.left , -source->m_macMask->portRect.top ) ;
+ LockPixels( GetGWorldPixMap( MAC_WXHBITMAP(source->m_macMask) ) ) ;
+ 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 ) ;
- CopyBits( GetPortBitMapForCopyBits( sourcePort ) ,
- GetPortBitMapForCopyBits( m_macPort ) ,
- &srcrect, &dstrect, mode, clipRgn ) ;
+ if ( mode == kEmulatedMode )
+ {
+ Pattern pat ;
+ ::PenPat(GetQDGlobalsBlack(&pat));
+ if ( logical_func == wxSET )
+ {
+ RGBColor col= { 0xFFFF, 0xFFFF, 0xFFFF } ;
+ ::RGBForeColor( &col ) ;
+ ::PaintRgn( clipRgn ) ;
+ }
+ else if ( logical_func == wxCLEAR )
+ {
+ RGBColor col= { 0x0000, 0x0000, 0x0000 } ;
+ ::RGBForeColor( &col ) ;
+ ::PaintRgn( clipRgn ) ;
+ }
+ else if ( logical_func == wxINVERT )
+ {
+ MacInvertRgn( clipRgn ) ;
+ }
+ else
+ {
+ for ( int y = 0 ; y < srcrect.right - srcrect.left ; ++y )
+ {
+ for ( int x = 0 ; x < srcrect.bottom - srcrect.top ; ++x )
+ {
+ Point dstPoint = { dstrect.top + y , dstrect.left + x } ;
+ Point srcPoint = { srcrect.top + y , srcrect.left + x } ;
+ if ( PtInRgn( dstPoint , clipRgn ) )
+ {
+ RGBColor srcColor ;
+ RGBColor dstColor ;
+
+ SetPort( (GrafPtr) sourcePort ) ;
+ GetCPixel( srcPoint.h , srcPoint.v , &srcColor) ;
+ SetPort( (GrafPtr) m_macPort ) ;
+ GetCPixel( dstPoint.h , dstPoint.v , &dstColor ) ;
+
+ wxMacCalculateColour( logical_func , srcColor , dstColor ) ;
+ SetCPixel( dstPoint.h , dstPoint.v , &dstColor ) ;
+ }
+ }
+ }
+ }
+ }
+ else
+ {
+ if ( invertDestinationFirst )
+ {
+ MacInvertRgn( clipRgn ) ;
+ }
+ CopyBits( GetPortBitMapForCopyBits( sourcePort ) ,
+ GetPortBitMapForCopyBits( MAC_WXHBITMAP(m_macPort) ) ,
+ &srcrect, &dstrect, mode, clipRgn ) ;
+ }
DisposeRgn( clipRgn ) ;
}
}
else
{
- CopyBits( GetPortBitMapForCopyBits( sourcePort ) ,
- GetPortBitMapForCopyBits( m_macPort ) ,
- &srcrect, &dstrect, mode, NULL ) ;
+ 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 )
+ {
+ RGBColor col= { 0xFFFF, 0xFFFF, 0xFFFF } ;
+ ::RGBForeColor( &col ) ;
+ ::PaintRgn( clipRgn ) ;
+ }
+ else if ( logical_func == wxCLEAR )
+ {
+ RGBColor col= { 0x0000, 0x0000, 0x0000 } ;
+ ::RGBForeColor( &col ) ;
+ ::PaintRgn( clipRgn ) ;
+ }
+ else if ( logical_func == wxINVERT )
+ {
+ MacInvertRgn( clipRgn ) ;
+ }
+ else
+ {
+ for ( int y = 0 ; y < srcrect.right - srcrect.left ; ++y )
+ {
+ for ( int x = 0 ; x < srcrect.bottom - srcrect.top ; ++x )
+ {
+ Point dstPoint = { dstrect.top + y , dstrect.left + x } ;
+ Point srcPoint = { srcrect.top + y , srcrect.left + x } ;
+
+ {
+ RGBColor srcColor ;
+ RGBColor dstColor ;
+
+ SetPort( (GrafPtr) sourcePort ) ;
+ GetCPixel( srcPoint.h , srcPoint.v , &srcColor) ;
+ SetPort( (GrafPtr) m_macPort ) ;
+ GetCPixel( dstPoint.h , dstPoint.v , &dstColor ) ;
+
+ wxMacCalculateColour( logical_func , srcColor , dstColor ) ;
+ SetCPixel( dstPoint.h , dstPoint.v , &dstColor ) ;
+ }
+ }
+ }
+ }
+
+ }
+ 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;
}
-void wxDC::DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y,
+inline Fixed IntToFixed( int inInt )
+ {
+ return (((SInt32) inInt) << 16);
+ }
+
+
+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)
+ if (angle == 0.0 )
{
- DrawText(text, x, y);
+ DrawText(str, x, y);
return;
}
- MacInstallFont();
-
- // the size of the text
- wxCoord w, h;
- GetTextExtent(text, &w, &h);
-
- // draw the string normally
- wxBitmap src(w, h);
- wxMemoryDC dc;
- dc.SelectObject(src);
- dc.SetFont(GetFont());
- dc.SetBackground(*wxWHITE_BRUSH);
- dc.SetBrush(*wxBLACK_BRUSH);
- dc.Clear();
- dc.DrawText(text, 0, 0);
- dc.SetFont(wxNullFont);
- dc.SelectObject(wxNullBitmap);
+ if ( str.Length() == 0 )
+ return ;
wxMacPortSetter helper(this) ;
+ MacInstallFont() ;
- // Calculate the size of the rotated bounding box.
- double rad = DegToRad(angle);
- double dx = cos(rad);
- double dy = sin(rad);
-
- // the rectngle vertices are counted clockwise with the first one being at
- // (0, 0) (or, rather, at (x, y))
- double x2 = w * dx;
- double y2 = -w * dy; // y axis points to the bottom, hence minus
- double x4 = h * dy;
- double y4 = h * dx;
- double x3 = x4 + x2;
- double y3 = y4 + y2;
-
- // calc max and min
- wxCoord maxX = (wxCoord)(dmax(x2, dmax(x3, x4)) + 0.5);
- wxCoord maxY = (wxCoord)(dmax(y2, dmax(y3, y4)) + 0.5);
- wxCoord minX = (wxCoord)(dmin(x2, dmin(x3, x4)) - 0.5);
- wxCoord minY = (wxCoord)(dmin(y2, dmin(y3, y4)) - 0.5);
-
- // prepare to blit-with-rotate the bitmap to the DC
- wxImage image(src);
-
- RGBColor colText = m_textForegroundColour.GetPixel();
- RGBColor colBack = m_textBackgroundColour.GetPixel();
-
- unsigned char *data = image.GetData();
-
- wxCoord dstX, dstY;
- double r, angleOrig;
- bool textPixel;
-
- // paint pixel by pixel
- for ( wxCoord srcX = 0; srcX < w; srcX++ )
+ wxString text ;
+ if ( wxApp::s_macDefaultEncodingIsPC )
+ {
+ text = wxMacMakeMacStringFromPC( str ) ;
+ }
+ else
+ {
+ text = str ;
+ }
+
+ wxFontRefData * font = (wxFontRefData*) m_font.GetRefData() ;
+ if ( 0 )
{
- for ( wxCoord srcY = 0; srcY < h; srcY++ )
- {
- // transform source coords to dest coords
- r = sqrt( (double)(srcX * srcX + srcY * srcY) );
- angleOrig = atan2((double)srcY, (double)srcX) - rad;
- dstX = (wxCoord)(r * cos(angleOrig) + 0.5);
- dstY = (wxCoord)(r * sin(angleOrig) + 0.5);
-
- // black pixel?
- textPixel = data[(srcY*w + srcX)*3] == 0;
- if ( textPixel || (m_backgroundMode == wxSOLID) )
- {
- SetCPixel(XLOG2DEVMAC(x + dstX), YLOG2DEVMAC(y + dstY),
- textPixel ? &colText : &colBack);
- }
- }
+ m_macFormerAliasState = IsAntiAliasedTextEnabled(&m_macFormerAliasSize);
+ SetAntiAliasedTextEnabled(true, m_scaleY * font->m_macFontSize);
+ m_macAliasWasEnabled = true ;
}
- // it would be better to draw with non underlined font and draw the line
- // manually here (it would be more straight...)
-#if 0
- if ( m_font.GetUnderlined() )
+ OSStatus status = noErr ;
+
+ TECObjectRef ec;
+ status = TECCreateConverter(&ec, kTextEncodingMacRoman, kTextEncodingUnicodeDefault);
+ wxASSERT_MSG( status == noErr , "couldn't start converter" ) ;
+
+ ByteCount byteOutLen ;
+ ByteCount byteInLen = text.Length() ;
+ ByteCount byteBufferLen = byteInLen *2 ;
+ char* buf = new char[byteBufferLen] ;
+
+ status = TECConvertText(ec, (ConstTextPtr)text.c_str() , byteInLen, &byteInLen,
+ (TextPtr)buf, byteBufferLen, &byteOutLen);
+
+ wxASSERT_MSG( status == noErr , "couldn't convert text" ) ;
+ status = TECDisposeConverter(ec);
+ wxASSERT_MSG( status == noErr , "couldn't dispose converter" ) ;
+
+ ATSUTextLayout atsuLayout ;
+ UniCharCount chars = byteOutLen / 2 ;
+ status = ::ATSUCreateTextLayoutWithTextPtr( (UniCharArrayPtr) buf , 0 , byteOutLen / 2 , byteOutLen / 2 , 1 ,
+ &chars , (ATSUStyle*) &m_macATSUIStyle , &atsuLayout ) ;
+ wxASSERT_MSG( status == noErr , "couldn't create the layout of the rotated text" );
+
+ if ( abs(angle) > 0 )
{
- ::MoveTo(XLOG2DEVMAC(x + x4), YLOG2DEVMAC(y + y4 + font->descent));
- ::LineTo(XLOG2DEVMAC(x + x3), YLOG2DEVMAC(y + y3 + font->descent));
+ Fixed atsuAngle = IntToFixed( angle ) ;
+ ByteCount angleSize = sizeof(Fixed) ;
+ ATSUAttributeTag rotationTag = kATSULineRotationTag ;
+ ATSUAttributeValuePtr angleValue = &atsuAngle ;
+ status = ::ATSUSetLayoutControls(atsuLayout , 1 , &rotationTag , &angleSize , &angleValue ) ;
}
-#endif // 0
- // update the bounding box
- CalcBoundingBox(x + minX, y + minY);
- CalcBoundingBox(x + maxX, y + maxY);
+ status = ::ATSUDrawText( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd,
+ IntToFixed(XLOG2DEVMAC(x) ) , IntToFixed(YLOG2DEVMAC(y) ) );
+ wxASSERT_MSG( status == noErr , "couldn't draw the rotated text" );
+ Rect rect ;
+ status = ::ATSUMeasureTextImage( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd,
+ IntToFixed(XLOG2DEVMAC(x) ) , IntToFixed(YLOG2DEVMAC(y) ) , &rect );
+ wxASSERT_MSG( status == noErr , "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);
+ delete[] buf ;
}
+
void wxDC::DoDrawText(const wxString& strtext, wxCoord x, wxCoord y)
{
wxCHECK_RET(Ok(), wxT("wxDC::DoDrawText Invalid DC"));
long xx = XLOG2DEVMAC(x);
long yy = YLOG2DEVMAC(y);
-
-// if (m_pen.GetStyle() != wxTRANSPARENT)
+#if TARGET_CARBON
+ bool useDrawThemeText = ( DrawThemeTextBox != (void*) kUnresolvedCFragSymbolAddress ) ;
+ 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 ;
+
+ ::MoveTo( xx , yy );
+ if ( m_backgroundMode == wxTRANSPARENT )
{
- MacInstallFont() ;
- /*
- Rect clip = { -32000 , -32000 , 32000 , 32000 } ;
-
- ::ClipRect( &clip ) ;
- */
-
- FontInfo fi ;
- ::GetFontInfo( &fi ) ;
-
- yy += fi.ascent ;
- ::MoveTo( xx , yy );
- if ( m_backgroundMode == wxTRANSPARENT )
- {
- ::TextMode( srcOr) ;
- }
- else
- {
- ::TextMode( srcCopy ) ;
- }
+ ::TextMode( srcOr) ;
+ }
+ else
+ {
+ ::TextMode( srcCopy ) ;
+ }
- const char *text = NULL ;
- int length = 0 ;
- wxString macText ;
+ const char *text = NULL ;
+ int length = 0 ;
+ wxString macText ;
- if ( wxApp::s_macDefaultEncodingIsPC )
- {
- macText = wxMacMakeMacStringFromPC( strtext ) ;
- text = macText ;
- length = macText.Length() ;
- }
- else
- {
- text = strtext ;
- length = strtext.Length() ;
- }
-
- int laststop = 0 ;
- int i = 0 ;
- int line = 0 ;
-
- while( i < length )
- {
- if( text[i] == 13 || text[i] == 10)
- {
- ::DrawText( text , laststop , i - laststop ) ;
- line++ ;
- ::MoveTo( xx , yy + line*(fi.descent + fi.ascent + fi.leading) );
- laststop = i+1 ;
- }
- i++ ;
- }
-
- ::DrawText( text , laststop , i - laststop ) ;
- ::TextMode( srcOr ) ;
+ if ( wxApp::s_macDefaultEncodingIsPC )
+ {
+ macText = wxMacMakeMacStringFromPC( strtext ) ;
+ text = macText ;
+ length = macText.Length() ;
}
+ else
+ {
+ text = strtext ;
+ length = strtext.Length() ;
+ }
+
+ int laststop = 0 ;
+ int i = 0 ;
+ int line = 0 ;
+
+ {
+
+ while( i < length )
+ {
+ if( text[i] == 13 || text[i] == 10)
+ {
+#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 + 1000 } ;
+ CFStringRef mString = CFStringCreateWithBytes( NULL , (UInt8*) text + laststop , i - laststop , CFStringGetSystemEncoding(), false ) ;
+ ::DrawThemeTextBox( mString,
+ kThemeCurrentPortFont,
+ kThemeStateActive,
+ false,
+ &frame,
+ teJustLeft,
+ nil );
+ CFRelease( mString ) ;
+ line++ ;
+ }
+ else
+#endif
+ {
+ ::DrawText( text , laststop , i - laststop ) ;
+ line++ ;
+ ::MoveTo( xx , yy + line*(fi.descent + fi.ascent + fi.leading) );
+ }
+ laststop = i+1 ;
+ }
+ i++ ;
+ }
+#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 + 1000 } ;
+ CFStringRef mString = CFStringCreateWithCString( NULL , text + laststop , kCFStringEncodingMacRoman ) ;
+ ::DrawThemeTextBox( mString,
+ kThemeCurrentPortFont,
+ kThemeStateActive,
+ false,
+ &frame,
+ teJustLeft,
+ nil );
+ CFRelease( mString ) ;
+ }
+ else
+#endif
+ {
+ ::DrawText( text , laststop , i - laststop ) ;
+ }
+ }
+ ::TextMode( srcOr ) ;
}
-bool wxDC::CanGetTextExtent() const
+bool wxDC::CanGetTextExtent() const
{
wxCHECK_MSG(Ok(), false, wxT("Invalid DC"));
-
+
return true ;
}
wxCHECK_RET(Ok(), wxT("Invalid DC"));
wxMacPortSetter helper(this) ;
- wxFont formerFont = m_font ;
-
+ wxFont formerFont = m_font ;
+
if ( theFont )
{
- wxFontRefData * font = (wxFontRefData*) m_font.GetRefData() ;
-
- if ( font )
- {
- ::TextFont( font->m_macFontNum ) ;
- ::TextSize( YLOG2DEVREL( font->m_macFontSize) ) ;
- ::TextFace( font->m_macFontStyle ) ;
- }
- }
- else
- {
- MacInstallFont() ;
+ // work around the constness
+ *((wxFont*)(&m_font)) = *theFont ;
}
+ MacInstallFont() ;
+
FontInfo fi ;
::GetFontInfo( &fi ) ;
+#if TARGET_CARBON
+ bool useGetThemeText = ( GetThemeTextDimensions != (void*) kUnresolvedCFragSymbolAddress ) ;
+ useGetThemeText = false ;
+#endif
if ( height )
*height = YDEV2LOGREL( fi.descent + fi.ascent ) ;
*descent =YDEV2LOGREL( fi.descent );
if ( externalLeading )
*externalLeading = YDEV2LOGREL( fi.leading ) ;
-
+
const char *text = NULL ;
int length = 0 ;
wxString macText ;
text = string ;
length = string.Length() ;
}
-
+
int laststop = 0 ;
int i = 0 ;
int curwidth = 0 ;
if ( width )
{
*width = 0 ;
-
+
while( i < length )
{
if( text[i] == 13 || text[i] == 10)
{
if ( height )
*height += YDEV2LOGREL( fi.descent + fi.ascent + fi.leading ) ;
- curwidth = ::TextWidth( text , laststop , i - laststop ) ;
+#if TARGET_CARBON
+ if ( useGetThemeText )
+ {
+ Point bounds={0,0} ;
+ SInt16 baseline ;
+ CFStringRef mString = CFStringCreateWithBytes( NULL , (UInt8*) text + laststop , i - laststop , CFStringGetSystemEncoding(), false ) ;
+ ::GetThemeTextDimensions( mString,
+ kThemeCurrentPortFont,
+ kThemeStateActive,
+ false,
+ &bounds,
+ &baseline );
+ CFRelease( mString ) ;
+ curwidth = bounds.h ;
+ }
+ else
+#endif
+ {
+ curwidth = ::TextWidth( text , laststop , i - laststop ) ;
+ }
if ( curwidth > *width )
*width = XDEV2LOGREL( curwidth ) ;
laststop = i+1 ;
i++ ;
}
- curwidth = ::TextWidth( text , laststop , i - laststop ) ;
+#if TARGET_CARBON
+ if ( useGetThemeText )
+ {
+ Point bounds={0,0} ;
+ SInt16 baseline ;
+ CFStringRef mString = CFStringCreateWithBytes( NULL , (UInt8*) text + laststop , i - laststop , CFStringGetSystemEncoding(), false ) ;
+ ::GetThemeTextDimensions( mString,
+ kThemeCurrentPortFont,
+ kThemeStateActive,
+ false,
+ &bounds,
+ &baseline );
+ CFRelease( mString ) ;
+ curwidth = bounds.h ;
+ }
+ else
+#endif
+ {
+ curwidth = ::TextWidth( text , laststop , i - laststop ) ;
+ }
if ( curwidth > *width )
*width = XDEV2LOGREL( curwidth ) ;
}
if ( theFont )
{
+ // work around the constness
+ *((wxFont*)(&m_font)) = formerFont ;
m_macFontInstalled = false ;
}
}
wxCoord wxDC::GetCharWidth(void) const
{
wxCHECK_MSG(Ok(), 1, wxT("Invalid DC"));
-
+
wxMacPortSetter helper(this) ;
MacInstallFont() ;
wxCoord wxDC::GetCharHeight(void) const
{
wxCHECK_MSG(Ok(), 1, wxT("Invalid DC"));
-
+
wxMacPortSetter helper(this) ;
MacInstallFont() ;
void wxDC::Clear(void)
{
- wxCHECK_RET(Ok(), wxT("Invalid DC"));
+ wxCHECK_RET(Ok(), wxT("Invalid DC"));
wxMacPortSetter helper(this) ;
- Rect rect = { -32767 , -32767 , 32767 , 32767 } ;
-
- if (m_backgroundBrush.GetStyle() != wxTRANSPARENT)
+ Rect rect = { -31000 , -31000 , 31000 , 31000 } ;
+
+ if (m_backgroundBrush.GetStyle() != wxTRANSPARENT)
{
- MacInstallBrush() ;
+ ::PenNormal() ;
+ //MacInstallBrush() ;
+ MacSetupBackgroundForCurrentPort( m_backgroundBrush ) ;
::EraseRect( &rect ) ;
}
}
// if ( m_macFontInstalled )
// return ;
Pattern blackColor ;
-
+
+ MacSetupBackgroundForCurrentPort(m_backgroundBrush) ;
+
wxFontRefData * font = (wxFontRefData*) m_font.GetRefData() ;
if ( font )
::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 = m_textForegroundColour.GetPixel();
- RGBColor backcolor = m_textBackgroundColour.GetPixel();
+ RGBColor forecolor = MAC_WXCOLORREF( m_textForegroundColour.GetPixel());
+ RGBColor backcolor = MAC_WXCOLORREF( m_textBackgroundColour.GetPixel());
::RGBForeColor( &forecolor );
::RGBBackColor( &backcolor );
}
else
{
- short fontnum ;
-
- GetFNum( "\pGeneva" , &fontnum ) ;
- ::TextFont( fontnum ) ;
- ::TextSize( short(m_scaleY * 10) ) ;
- ::TextFace( 0 ) ;
-
+ 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 = m_textForegroundColour.GetPixel();
- RGBColor backcolor = m_textBackgroundColour.GetPixel();
+ RGBColor forecolor = MAC_WXCOLORREF( m_textForegroundColour.GetPixel());
+ RGBColor backcolor = MAC_WXCOLORREF( m_textBackgroundColour.GetPixel());
::RGBForeColor( &forecolor );
::RGBBackColor( &backcolor );
}
short mode = patCopy ;
// todo :
-
+
switch( m_logicalFunction )
{
case wxCOPY: // src
break ;
}
::PenMode( mode ) ;
+
+ OSStatus status = noErr ;
+
+ Fixed atsuSize = IntToFixed(m_scaleY * font->m_macFontSize) ;
+
+ Style qdStyle = font->m_macFontStyle ;
+ ATSUFontID atsuFont = font->m_macATSUFontID ;
+
+ status = ::ATSUCreateStyle(&(ATSUStyle)m_macATSUIStyle) ;
+ wxASSERT_MSG( status == noErr , "couldn't create ATSU style" ) ;
+
+ 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 , "couldn't set create ATSU style" ) ;
+
}
+Pattern gHatchPatterns[] =
+{
+ { 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 } ,
+} ;
+
static void wxMacGetHatchPattern(int hatchStyle, Pattern *pattern)
{
- int thePatListID = sysPatListID;
- int theIndex;
+ int theIndex = 1 ;
+
switch(hatchStyle)
{
case wxBDIAGONAL_HATCH:
- theIndex = 34; // WCH: this is not good
+ theIndex = 2;
break;
case wxFDIAGONAL_HATCH:
- theIndex = 26;
+ theIndex = 3;
break;
case wxCROSS_HATCH:
- theIndex = 5;
+ theIndex = 4;
break;
case wxHORIZONTAL_HATCH:
- theIndex = 25;
+ theIndex = 5;
break;
case wxVERTICAL_HATCH:
theIndex = 6;
break;
case wxCROSSDIAG_HATCH:
- theIndex = 4; // WCH: this is not good
+ theIndex = 7;
break;
default:
theIndex = 1; // solid pattern
break;
}
- GetIndPattern( pattern, thePatListID, theIndex);
+ *pattern = gHatchPatterns[theIndex-1] ;
}
void wxDC::MacInstallPen() const
// if ( m_macPenInstalled )
// return ;
- RGBColor forecolor = m_pen.GetColour().GetPixel();
- RGBColor backcolor = m_backgroundBrush.GetColour().GetPixel();
+ RGBColor forecolor = MAC_WXCOLORREF( m_pen.GetColour().GetPixel());
+ RGBColor backcolor = MAC_WXCOLORREF( m_backgroundBrush.GetColour().GetPixel());
::RGBForeColor( &forecolor );
::RGBBackColor( &backcolor );
-
+
::PenNormal() ;
int penWidth = m_pen.GetWidth() * (int) m_scaleX ;
// null means only one pixel, at whatever resolution
if ( penWidth == 0 )
- penWidth = 1 ;
+ penWidth = 1 ;
::PenSize(penWidth, penWidth);
int penStyle = m_pen.GetStyle();
-
+
if (penStyle == wxSOLID)
{
::PenPat(GetQDGlobalsBlack(&blackColor));
}
else
{
- ::PenPat(GetQDGlobalsBlack(&blackColor));
+ 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 ;
+ int number = m_pen.GetDashes(&dash) ;
+ // right now we don't allocate larger pixmaps
+ for ( int i = 0 ; i < 8 ; ++i )
+ {
+ pat.pat[i] = dash[0] ;
+ }
+ }
+ break ;
+ }
+ ::PenPat(&pat);
}
short mode = patCopy ;
-
+
// todo :
-
+
switch( m_logicalFunction )
{
- case wxCOPY: // src
- mode = patCopy ;
+ case wxCOPY: // only foreground color, leave background (thus not patCopy)
+ mode = patOr ;
break ;
case wxINVERT: // NOT dst
- ::PenPat(GetQDGlobalsBlack(&blackColor));
+// ::PenPat(GetQDGlobalsBlack(&blackColor));
mode = patXor ;
break ;
case wxXOR: // src XOR dst
m_macFontInstalled = false ;
}
-void wxDC::MacSetupBackgroundForCurrentPort(const wxBrush& background )
+void wxDC::MacSetupBackgroundForCurrentPort(const wxBrush& background )
{
Pattern whiteColor ;
switch( background.MacGetBrushKind() )
}
case kwxMacBrushColour :
{
- ::RGBBackColor( &background.GetColour().GetPixel() );
+ ::RGBBackColor( &MAC_WXCOLORREF( background.GetColour().GetPixel()) );
int brushStyle = background.GetStyle();
if (brushStyle == wxSOLID)
::BackPat(GetQDGlobalsWhite(&whiteColor));
// foreground
- ::RGBForeColor( &m_brush.GetColour().GetPixel() );
+ 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));
+ }
else if (IS_HATCH(brushStyle))
{
Pattern pat ;
wxMacGetHatchPattern(brushStyle, &pat);
::PenPat(&pat);
}
- else
+ else if ( m_brush.GetStyle() == wxSTIPPLE || m_brush.GetStyle() == wxSTIPPLE_MASK_OPAQUE )
{
- ::PenPat(GetQDGlobalsBlack(&blackColor));
- }
+ // 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 ;
-
- // background
-
- MacSetupBackgroundForCurrentPort( m_backgroundBrush ) ;
-
+ if ( m_brush.GetStyle() == wxSTIPPLE )
+ gw = MAC_WXHBITMAP(bitmap->GetHBITMAP()) ;
+ else
+ gw = MAC_WXHBITMAP(bitmap->GetMask()->GetMaskBitmap()) ;
+
+ PixMapHandle gwpixmaphandle = GetGWorldPixMap( gw ) ;
+ LockPixels( gwpixmaphandle ) ;
+
+ bool isMonochrome = !IsPortColor( gw ) ;
+
+ if ( !isMonochrome )
+ {
+ if ( (**gwpixmaphandle).pixelSize == 1 )
+ isMonochrome = true ;
+ }
+
+ if ( isMonochrome && width == 8 && height == 8 )
+ {
+ ::RGBForeColor( &MAC_WXCOLORREF( m_textForegroundColour.GetPixel()) );
+ ::RGBForeColor( &MAC_WXCOLORREF( m_textBackgroundColour.GetPixel()) );
+ BitMap* gwbitmap = (BitMap*) *gwpixmaphandle ; // since the color depth is 1 it is a BitMap
+ 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] ;
+ }
+ UnlockPixels( GetGWorldPixMap( gw ) ) ;
+ ::PenPat( &pat ) ;
+ }
+ else
+ {
+ // this will be the code to handle power of 2 patterns, we will have to arrive at a nice
+ // caching scheme before putting this into production
+ Handle image;
+ long imageSize;
+ PixPatHandle pixpat = NewPixPat() ;
+
+ CopyPixMap(gwpixmaphandle, (**pixpat).patMap);
+ imageSize = GetPixRowBytes((**pixpat).patMap) *
+ ((**(**pixpat).patMap).bounds.bottom -
+ (**(**pixpat).patMap).bounds.top);
+
+ PtrToHand( (**gwpixmaphandle).baseAddr, &image, imageSize );
+ (**pixpat).patData = image;
+ if ( isMonochrome )
+ {
+ CTabHandle ctable = ((**((**pixpat).patMap)).pmTable) ;
+ ColorSpecPtr ctspec = (ColorSpecPtr) &(**ctable).ctTable ;
+ if ( ctspec[0].rgb.red == 0x0000 )
+ {
+ ctspec[1].rgb = MAC_WXCOLORREF( m_textBackgroundColour.GetPixel()) ;
+ ctspec[0].rgb = MAC_WXCOLORREF( m_textForegroundColour.GetPixel()) ;
+ }
+ else
+ {
+ ctspec[0].rgb = MAC_WXCOLORREF( m_textBackgroundColour.GetPixel()) ;
+ ctspec[1].rgb = MAC_WXCOLORREF( m_textForegroundColour.GetPixel()) ;
+ }
+ ::CTabChanged( ctable ) ;
+ }
+ ::PenPixPat(pixpat);
+ m_macForegroundPixMap = pixpat ;
+ }
+ UnlockPixels( gwpixmaphandle ) ;
+ }
+ else
+ {
+ ::PenPat(GetQDGlobalsBlack(&blackColor));
+ }
- // todo :
-
short mode = patCopy ;
switch( m_logicalFunction )
{
case wxCOPY: // src
- mode = patCopy ;
+ if ( backgroundTransparent )
+ mode = patOr ;
+ else
+ mode = patCopy ;
break ;
case wxINVERT: // NOT dst
- ::PenPat(GetQDGlobalsBlack(&blackColor));
+ if ( !backgroundTransparent )
+ {
+ ::PenPat(GetQDGlobalsBlack(&blackColor));
+ }
mode = patXor ;
break ;
case wxXOR: // src XOR dst
projects / wxWidgets.git / blobdiff