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

even more reformatting

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36397 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Surovell
2005-12-15 00:58:39 +00:00
parent 35853cf203
commit b21d67a04d
1 changed files with 152 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

118
src/mac/carbon/dccg.cpp
View File

@@ -46,15 +46,17 @@ IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject)
const double M_PI = 3.14159265358979 ; const double M_PI = 3.14159265358979 ;
#endif #endif
#endif #endif
const double RAD2DEG = 180.0 / M_PI; const double RAD2DEG = 180.0 / M_PI;
const short kEmulatedMode = -1 ; const short kEmulatedMode = -1 ;
const short kUnsupportedMode = -2 ; const short kUnsupportedMode = -2 ;
extern TECObjectRef s_TECNativeCToUnicode ; extern TECObjectRef s_TECNativeCToUnicode ;
// TODO Update
// The text ctrl implementation still needs that for the non hiview implementation
// TODO Update
// The textctrl implementation still needs that (needs what?) for the non-HIView implementation
//
wxMacWindowClipper::wxMacWindowClipper( const wxWindow* win ) : wxMacWindowClipper::wxMacWindowClipper( const wxWindow* win ) :
wxMacPortSaver( (GrafPtr) GetWindowPort((WindowRef) win->MacGetTopLevelWindowRef()) ) wxMacPortSaver( (GrafPtr) GetWindowPort((WindowRef) win->MacGetTopLevelWindowRef()) )
{ {
@@ -109,6 +111,7 @@ wxMacPortSetter::wxMacPortSetter( const wxDC* dc ) :
{ {
wxASSERT( dc->Ok() ) ; wxASSERT( dc->Ok() ) ;
m_dc = dc ; m_dc = dc ;
// dc->MacSetupPort(&m_ph) ; // dc->MacSetupPort(&m_ph) ;
} }
@@ -147,7 +150,7 @@ wxMacCGPath::~wxMacCGPath()
CGPathRelease( m_path ) ; CGPathRelease( m_path ) ;
} }
// Starts a new subpath at // opens (starts) a new subpath
void wxMacCGPath::MoveToPoint( wxCoord x1 , wxCoord y1 ) void wxMacCGPath::MoveToPoint( wxCoord x1 , wxCoord y1 )
{ {
CGPathMoveToPoint( m_path , NULL , x1 , y1 ) ; CGPathMoveToPoint( m_path , NULL , x1 , y1 ) ;
@@ -313,8 +316,9 @@ void wxMacCGContext::SetNativeContext( CGContextRef cg )
} }
#pragma mark - #pragma mark -
#pragma mark wxMacCGPattern, ImagePattern, HatchPattern classes
// wrapper class for a CGPattern, always allocate on heap, never call destructor // CGPattern wrapper class: always allocate on heap, never call destructor
class wxMacCGPattern class wxMacCGPattern
{ {
@@ -329,7 +333,7 @@ public :
protected : protected :
virtual ~wxMacCGPattern() virtual ~wxMacCGPattern()
{ {
// as this is called only when our m_patternRef is been released; // as this is called only when the m_patternRef is been released;
// don't release it again // don't release it again
} }
@@ -507,10 +511,12 @@ public :
protected : protected :
~HatchPattern() {} ~HatchPattern() {}
int m_hatch ;
CGRect m_imageBounds ; CGRect m_imageBounds ;
int m_hatch ;
} ; } ;
#pragma mark -
void wxMacCGContext::SetPen( const wxPen &pen ) void wxMacCGContext::SetPen( const wxPen &pen )
{ {
m_pen = pen ; m_pen = pen ;
@@ -827,8 +833,8 @@ wxDC::~wxDC()
void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask ) void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask )
{ {
wxCHECK_RET( Ok(), wxT("invalid window dc") ); wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoDrawBitmap - invalid DC") );
wxCHECK_RET( bmp.Ok(), wxT("invalid bitmap") ); wxCHECK_RET( bmp.Ok(), wxT("wxDC(cg)::DoDrawBitmap - invalid bitmap") );
wxCoord xx = XLOG2DEVMAC(x); wxCoord xx = XLOG2DEVMAC(x);
wxCoord yy = YLOG2DEVMAC(y); wxCoord yy = YLOG2DEVMAC(y);
@@ -846,8 +852,8 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask
void wxDC::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y ) void wxDC::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y )
{ {
wxCHECK_RET(Ok(), wxT("Invalid dc wxDC::DoDrawIcon")); wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoDrawIcon - invalid DC") );
wxCHECK_RET(icon.Ok(), wxT("Invalid icon wxDC::DoDrawIcon")); wxCHECK_RET( icon.Ok(), wxT("wxDC(cg)::DoDrawIcon - invalid icon") );
wxCoord xx = XLOG2DEVMAC(x); wxCoord xx = XLOG2DEVMAC(x);
wxCoord yy = YLOG2DEVMAC(y); wxCoord yy = YLOG2DEVMAC(y);
@@ -868,7 +874,7 @@ void wxDC::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y )
void wxDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height ) void wxDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord height )
{ {
wxCHECK_RET(Ok(), wxT("wxDC::DoSetClippingRegion Invalid DC")); wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoSetClippingRegion - invalid DC") );
wxCoord xx, yy, ww, hh; wxCoord xx, yy, ww, hh;
xx = XLOG2DEVMAC(x); xx = XLOG2DEVMAC(x);
@@ -893,19 +899,21 @@ void wxDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord hei
else else
{ {
m_clipping = true; m_clipping = true;
m_clipX1 = xx; m_clipX1 = xx;
m_clipY1 = yy; m_clipY1 = yy;
m_clipX2 = xx + ww; m_clipX2 = xx + ww;
m_clipY2 = yy + hh; m_clipY2 = yy + hh;
} }
// TODO as soon as we don't reset the context for each operation anymore // TODO: as soon as we don't reset the context for each operation anymore
// we have to update the context as well // we have to update the context as well
} }
void wxDC::DoSetClippingRegionAsRegion( const wxRegion &region ) void wxDC::DoSetClippingRegionAsRegion( const wxRegion &region )
{ {
wxCHECK_RET( Ok(), wxT("invalid window dc") ) ; wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoSetClippingRegionAsRegion - invalid DC") );
if (region.Empty()) if (region.Empty())
{ {
DestroyClippingRegion(); DestroyClippingRegion();
@@ -945,6 +953,7 @@ void wxDC::DoSetClippingRegionAsRegion( const wxRegion &region )
else else
{ {
m_clipping = true; m_clipping = true;
m_clipX1 = xx; m_clipX1 = xx;
m_clipY1 = yy; m_clipY1 = yy;
m_clipX2 = xx + ww; m_clipX2 = xx + ww;
@@ -956,11 +965,14 @@ void wxDC::DoSetClippingRegionAsRegion( const wxRegion &region )
void wxDC::DestroyClippingRegion() void wxDC::DestroyClippingRegion()
{ {
// CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ; // CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ;
CGContextRef cgContext = ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ; CGContextRef cgContext = ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ;
CGContextRestoreGState( cgContext ); CGContextRestoreGState( cgContext );
CGContextSaveGState( cgContext ); CGContextSaveGState( cgContext );
m_graphicContext->SetPen( m_pen ) ; m_graphicContext->SetPen( m_pen ) ;
m_graphicContext->SetBrush( m_brush ) ; m_graphicContext->SetBrush( m_brush ) ;
m_clipping = false; m_clipping = false;
} }
@@ -977,7 +989,7 @@ void wxDC::DoGetSizeMM( int* width, int* height ) const
void wxDC::SetTextForeground( const wxColour &col ) void wxDC::SetTextForeground( const wxColour &col )
{ {
wxCHECK_RET(Ok(), wxT("Invalid DC")); wxCHECK_RET( Ok(), wxT("wxDC(cg)::SetTextForeground - invalid DC") );
if ( col != m_textForegroundColour ) if ( col != m_textForegroundColour )
{ {
@@ -988,7 +1000,7 @@ void wxDC::SetTextForeground( const wxColour &col )
void wxDC::SetTextBackground( const wxColour &col ) void wxDC::SetTextBackground( const wxColour &col )
{ {
wxCHECK_RET(Ok(), wxT("Invalid DC")); wxCHECK_RET( Ok(), wxT("wxDC(cg)::SetTextBackground - invalid DC") );
m_textBackgroundColour = col; m_textBackgroundColour = col;
} }
@@ -1191,8 +1203,7 @@ bool wxDC::DoFloodFill(wxCoord x, wxCoord y,
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") ); wxCHECK_MSG( Ok(), false, wxT("wxDC(cg)::DoGetPixel - invalid DC") );
wxCHECK_MSG( Ok(), false, wxT("wxDC::DoGetPixel Invalid DC") );
wxMacPortSaver helper((CGrafPtr)m_macPort) ; wxMacPortSaver helper((CGrafPtr)m_macPort) ;
RGBColor colour; RGBColor colour;
@@ -1210,7 +1221,7 @@ bool wxDC::DoGetPixel( wxCoord x, wxCoord y, wxColour *col ) const
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")); wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoDrawLine - invalid DC") );
if ( m_logicalFunction != wxCOPY ) if ( m_logicalFunction != wxCOPY )
return ; return ;
@@ -1233,13 +1244,13 @@ void wxDC::DoDrawLine( wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2 )
void wxDC::DoCrossHair( wxCoord x, wxCoord y ) void wxDC::DoCrossHair( wxCoord x, wxCoord y )
{ {
wxCHECK_RET( Ok(), wxT("wxDC::DoCrossHair Invalid window dc") ); wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoCrossHair - invalid DC") );
if ( m_logicalFunction != wxCOPY ) if ( m_logicalFunction != wxCOPY )
return ; return ;
int w = 0; int w = 0, h = 0;
int h = 0;
GetSize( &w, &h ); GetSize( &w, &h );
wxCoord xx = XLOG2DEVMAC(x); wxCoord xx = XLOG2DEVMAC(x);
wxCoord yy = YLOG2DEVMAC(y); wxCoord yy = YLOG2DEVMAC(y);
@@ -1262,7 +1273,7 @@ void wxDC::DoDrawArc( wxCoord x1, wxCoord y1,
wxCoord x2, wxCoord y2, wxCoord x2, wxCoord y2,
wxCoord xc, wxCoord yc ) wxCoord xc, wxCoord yc )
{ {
wxCHECK_RET(Ok(), wxT("wxDC::DoDrawArc Invalid DC")); wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoDrawArc - invalid DC") );
if ( m_logicalFunction != wxCOPY ) if ( m_logicalFunction != wxCOPY )
return ; return ;
@@ -1316,7 +1327,7 @@ void wxDC::DoDrawArc( wxCoord x1, wxCoord y1,
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 ) double sa, double ea )
{ {
wxCHECK_RET(Ok(), wxT("wxDC::DoDrawEllepticArc Invalid DC")); wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoDrawEllipticArc - invalid DC") );
if ( m_logicalFunction != wxCOPY ) if ( m_logicalFunction != wxCOPY )
return ; return ;
@@ -1357,7 +1368,7 @@ void wxDC::DoDrawEllipticArc( wxCoord x, wxCoord y, wxCoord w, wxCoord h,
void wxDC::DoDrawPoint( wxCoord x, wxCoord y ) void wxDC::DoDrawPoint( wxCoord x, wxCoord y )
{ {
wxCHECK_RET(Ok(), wxT("Invalid DC")); wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoDrawPoint - invalid DC") );
DoDrawLine( x , y , x + 1 , y + 1 ) ; DoDrawLine( x , y , x + 1 , y + 1 ) ;
} }
@@ -1365,7 +1376,7 @@ void wxDC::DoDrawPoint( wxCoord x, wxCoord y )
void wxDC::DoDrawLines(int n, wxPoint points[], void wxDC::DoDrawLines(int n, wxPoint points[],
wxCoord xoffset, wxCoord yoffset) wxCoord xoffset, wxCoord yoffset)
{ {
wxCHECK_RET(Ok(), wxT("Invalid DC")); wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoDrawLines - invalid DC") );
if ( m_logicalFunction != wxCOPY ) if ( m_logicalFunction != wxCOPY )
return ; return ;
@@ -1390,7 +1401,7 @@ void wxDC::DoDrawLines(int n, wxPoint points[],
#if wxUSE_SPLINES #if wxUSE_SPLINES
void wxDC::DoDrawSpline(wxList *points) void wxDC::DoDrawSpline(wxList *points)
{ {
wxCHECK_RET(Ok(), wxT("Invalid DC")); wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoDrawSpline - invalid DC") );
if ( m_logicalFunction != wxCOPY ) if ( m_logicalFunction != wxCOPY )
return ; return ;
@@ -1450,7 +1461,7 @@ void wxDC::DoDrawPolygon( int n, wxPoint points[],
wxCoord xoffset, wxCoord yoffset, wxCoord xoffset, wxCoord yoffset,
int fillStyle ) int fillStyle )
{ {
wxCHECK_RET(Ok(), wxT("Invalid DC")); wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoDrawPolygon - invalid DC") );
if ( n <= 0 || (m_brush.GetStyle() == wxTRANSPARENT && m_pen.GetStyle() == wxTRANSPARENT ) ) if ( n <= 0 || (m_brush.GetStyle() == wxTRANSPARENT && m_pen.GetStyle() == wxTRANSPARENT ) )
return ; return ;
@@ -1482,7 +1493,7 @@ void wxDC::DoDrawPolygon( int n, wxPoint points[],
void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height)
{ {
wxCHECK_RET(Ok(), wxT("Invalid DC")); wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoDrawRectangle - invalid DC") );
if ( m_logicalFunction != wxCOPY ) if ( m_logicalFunction != wxCOPY )
return ; return ;
@@ -1518,7 +1529,7 @@ void wxDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y,
wxCoord width, wxCoord height, wxCoord width, wxCoord height,
double radius) double radius)
{ {
wxCHECK_RET(Ok(), wxT("Invalid DC")); wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoDrawRoundedRectangle - invalid DC") );
if ( m_logicalFunction != wxCOPY ) if ( m_logicalFunction != wxCOPY )
return ; return ;
@@ -1554,7 +1565,7 @@ 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")); wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoDrawEllipse - invalid DC") );
if ( m_logicalFunction != wxCOPY ) if ( m_logicalFunction != wxCOPY )
return ; return ;
@@ -1598,8 +1609,8 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
wxDC *source, wxCoord xsrc, wxCoord ysrc, int logical_func , bool useMask, 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( Ok(), false, wxT("wxDC(cg)::DoBlit - invalid DC") );
wxCHECK_MSG(source->Ok(), false, wxT("wxDC::DoBlit Illegal source DC")); wxCHECK_MSG( source->Ok(), false, wxT("wxDC(cg)::DoBlit - invalid source DC") );
if ( logical_func == wxNO_OP ) if ( logical_func == wxNO_OP )
return true ; return true ;
@@ -1624,6 +1635,7 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
if ( memdc && logical_func == wxCOPY ) if ( memdc && logical_func == wxCOPY )
{ {
wxBitmap blit = memdc->GetSelectedObject() ; wxBitmap blit = memdc->GetSelectedObject() ;
wxASSERT_MSG( blit.Ok() , wxT("Invalid bitmap for blitting") ) ; wxASSERT_MSG( blit.Ok() , wxT("Invalid bitmap for blitting") ) ;
wxCoord bmpwidth = blit.GetWidth(); wxCoord bmpwidth = blit.GetWidth();
@@ -1678,8 +1690,8 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
void wxDC::DoDrawRotatedText(const wxString& str, wxCoord x, wxCoord y, void wxDC::DoDrawRotatedText(const wxString& str, wxCoord x, wxCoord y,
double angle) double angle)
{ {
wxCHECK_RET( Ok(), wxT("wxDC::DoDrawRotatedText Invalid window dc") ); wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoDrawRotatedText - invalid DC") );
wxCHECK_RET( m_macATSUIStyle != NULL , wxT("No valid font set") ) ; wxCHECK_RET( m_macATSUIStyle != NULL, wxT("wxDC(cg)::DoDrawRotatedText - no valid font set") );
if ( str.Length() == 0 ) if ( str.Length() == 0 )
return ; return ;
@@ -1690,6 +1702,7 @@ void wxDC::DoDrawRotatedText(const wxString& str, wxCoord x, wxCoord y,
ATSUTextLayout atsuLayout ; ATSUTextLayout atsuLayout ;
UniCharCount chars = str.Length() ; UniCharCount chars = str.Length() ;
UniChar* ubuf = NULL ; UniChar* ubuf = NULL ;
#if SIZEOF_WCHAR_T == 4 #if SIZEOF_WCHAR_T == 4
wxMBConvUTF16 converter ; wxMBConvUTF16 converter ;
#if wxUSE_UNICODE #if wxUSE_UNICODE
@@ -1762,13 +1775,12 @@ void wxDC::DoDrawRotatedText(const wxString& str, wxCoord x, wxCoord y,
atsuTags, atsuSizes, atsuValues ) ; atsuTags, atsuSizes, atsuValues ) ;
} }
ATSUTextMeasurement textBefore ; ATSUTextMeasurement textBefore, textAfter ;
ATSUTextMeasurement textAfter ; ATSUTextMeasurement ascent, descent ;
ATSUTextMeasurement ascent ;
ATSUTextMeasurement descent ;
status = ::ATSUGetUnjustifiedBounds( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd, status = ::ATSUGetUnjustifiedBounds( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd,
&textBefore , &textAfter, &ascent , &descent ); &textBefore , &textAfter, &ascent , &descent );
wxASSERT_MSG( status == noErr , wxT("couldn't measure the rotated text") ); wxASSERT_MSG( status == noErr , wxT("couldn't measure the rotated text") );
Rect rect ; Rect rect ;
@@ -1805,7 +1817,9 @@ void wxDC::DoDrawRotatedText(const wxString& str, wxCoord x, wxCoord y,
CGContextScaleCTM(((wxMacCGContext*)(m_graphicContext))->GetNativeContext(), 1, -1); CGContextScaleCTM(((wxMacCGContext*)(m_graphicContext))->GetNativeContext(), 1, -1);
status = ::ATSUDrawText( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd, status = ::ATSUDrawText( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd,
IntToFixed(0) , IntToFixed(0) ); IntToFixed(0) , IntToFixed(0) );
wxASSERT_MSG( status == noErr , wxT("couldn't draw the rotated text") ); wxASSERT_MSG( status == noErr , wxT("couldn't draw the rotated text") );
CGContextRestoreGState( ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ) ; CGContextRestoreGState( ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ) ;
CalcBoundingBox(XDEV2LOG(rect.left), YDEV2LOG(rect.top) ); CalcBoundingBox(XDEV2LOG(rect.left), YDEV2LOG(rect.top) );
@@ -1820,14 +1834,14 @@ void wxDC::DoDrawRotatedText(const wxString& str, wxCoord x, wxCoord y,
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(cg)::DoDrawText - invalid DC") );
DoDrawRotatedText( strtext , x , y , 0.0 ) ; DoDrawRotatedText( strtext , x , y , 0.0 ) ;
} }
bool wxDC::CanGetTextExtent() const bool wxDC::CanGetTextExtent() const
{ {
wxCHECK_MSG(Ok(), false, wxT("Invalid DC")); wxCHECK_MSG( Ok(), false, wxT("wxDC(cg)::CanGetTextExtent - invalid DC") );
return true ; return true ;
} }
@@ -1836,12 +1850,12 @@ void wxDC::DoGetTextExtent( const wxString &str, wxCoord *width, wxCoord *heigh
wxCoord *descent, wxCoord *externalLeading , wxCoord *descent, wxCoord *externalLeading ,
wxFont *theFont ) const wxFont *theFont ) const
{ {
wxCHECK_RET(Ok(), wxT("Invalid DC")); wxCHECK_RET( Ok(), wxT("wxDC(cg)::DoGetTextExtent - invalid DC") );
wxFont formerFont = m_font ; wxFont formerFont = m_font ;
if ( theFont ) if ( theFont )
{ {
// work around the constness // work around the const-ness
*((wxFont*)(&m_font)) = *theFont ; *((wxFont*)(&m_font)) = *theFont ;
MacInstallFont() ; MacInstallFont() ;
} }
@@ -1849,12 +1863,13 @@ void wxDC::DoGetTextExtent( const wxString &str, wxCoord *width, wxCoord *heigh
if ( str.Length() == 0 ) if ( str.Length() == 0 )
return ; return ;
wxCHECK_RET( m_macATSUIStyle != NULL , wxT("No valid font set") ) ; wxCHECK_RET( m_macATSUIStyle != NULL, wxT("wxDC(cg)::DoGetTextExtent - no valid font set") ) ;
OSStatus status = noErr ; OSStatus status = noErr ;
ATSUTextLayout atsuLayout ; ATSUTextLayout atsuLayout ;
UniCharCount chars = str.Length() ; UniCharCount chars = str.Length() ;
UniChar* ubuf = NULL ; UniChar* ubuf = NULL ;
#if SIZEOF_WCHAR_T == 4 #if SIZEOF_WCHAR_T == 4
wxMBConvUTF16 converter ; wxMBConvUTF16 converter ;
#if wxUSE_UNICODE #if wxUSE_UNICODE
@@ -1883,10 +1898,8 @@ void wxDC::DoGetTextExtent( const wxString &str, wxCoord *width, wxCoord *heigh
wxASSERT_MSG( status == noErr , wxT("couldn't create the layout of the text") ); wxASSERT_MSG( status == noErr , wxT("couldn't create the layout of the text") );
ATSUTextMeasurement textBefore ; ATSUTextMeasurement textBefore, textAfter ;
ATSUTextMeasurement textAfter ; ATSUTextMeasurement textAscent, textDescent ;
ATSUTextMeasurement textAscent ;
ATSUTextMeasurement textDescent ;
status = ::ATSUGetUnjustifiedBounds( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd, status = ::ATSUGetUnjustifiedBounds( atsuLayout, kATSUFromTextBeginning, kATSUToTextEnd,
&textBefore , &textAfter, &textAscent , &textDescent ); &textBefore , &textAfter, &textAscent , &textDescent );
@@ -1901,9 +1914,11 @@ void wxDC::DoGetTextExtent( const wxString &str, wxCoord *width, wxCoord *heigh
*width = XDEV2LOGREL( FixedToInt(textAfter - textBefore) ) ; *width = XDEV2LOGREL( FixedToInt(textAfter - textBefore) ) ;
::ATSUDisposeTextLayout(atsuLayout); ::ATSUDisposeTextLayout(atsuLayout);
#if SIZEOF_WCHAR_T == 4 #if SIZEOF_WCHAR_T == 4
free( ubuf ) ; free( ubuf ) ;
#endif #endif
if ( theFont ) if ( theFont )
{ {
// work around the constness // work around the constness
@@ -1914,7 +1929,7 @@ void wxDC::DoGetTextExtent( const wxString &str, wxCoord *width, wxCoord *heigh
bool wxDC::DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const bool wxDC::DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) const
{ {
wxCHECK_MSG(Ok(), false, wxT("Invalid DC")); wxCHECK_MSG( Ok(), false, wxT("wxDC(cg)::DoGetPartialTextExtents - invalid DC") );
widths.Empty(); widths.Empty();
widths.Add(0, text.Length()); widths.Add(0, text.Length());
@@ -1925,6 +1940,7 @@ bool wxDC::DoGetPartialTextExtents(const wxString& text, wxArrayInt& widths) con
ATSUTextLayout atsuLayout ; ATSUTextLayout atsuLayout ;
UniCharCount chars = text.Length() ; UniCharCount chars = text.Length() ;
UniChar* ubuf = NULL ; UniChar* ubuf = NULL ;
#if SIZEOF_WCHAR_T == 4 #if SIZEOF_WCHAR_T == 4
wxMBConvUTF16 converter ; wxMBConvUTF16 converter ;
#if wxUSE_UNICODE #if wxUSE_UNICODE
@@ -1990,7 +2006,7 @@ wxCoord wxDC::GetCharHeight(void) const
void wxDC::Clear(void) void wxDC::Clear(void)
{ {
wxCHECK_RET(Ok(), wxT("Invalid DC")); wxCHECK_RET( Ok(), wxT("wxDC(cg)::Clear - invalid DC") );
if (m_backgroundBrush.Ok() && m_backgroundBrush.GetStyle() != wxTRANSPARENT) if (m_backgroundBrush.Ok() && m_backgroundBrush.GetStyle() != wxTRANSPARENT)
{ {
@@ -2065,7 +2081,7 @@ void wxDC::Clear(void)
void wxDC::MacInstallFont() const void wxDC::MacInstallFont() const
{ {
wxCHECK_RET(Ok(), wxT("Invalid DC")); wxCHECK_RET( Ok(), wxT("wxDC(cg)::MacInstallFont - invalid DC") );
if ( m_macATSUIStyle ) if ( m_macATSUIStyle )
{ {
@@ -2077,6 +2093,7 @@ void wxDC::MacInstallFont() const
{ {
OSStatus status = noErr ; OSStatus status = noErr ;
status = ATSUCreateAndCopyStyle( (ATSUStyle) m_font.MacGetATSUStyle() , (ATSUStyle*) &m_macATSUIStyle ) ; status = ATSUCreateAndCopyStyle( (ATSUStyle) m_font.MacGetATSUStyle() , (ATSUStyle*) &m_macATSUIStyle ) ;
wxASSERT_MSG( status == noErr, wxT("couldn't set create ATSU style") ) ; wxASSERT_MSG( status == noErr, wxT("couldn't set create ATSU style") ) ;
Fixed atsuSize = IntToFixed( int(m_scaleY * m_font.MacGetFontSize()) ) ; Fixed atsuSize = IntToFixed( int(m_scaleY * m_font.MacGetFontSize()) ) ;
@@ -2099,6 +2116,7 @@ void wxDC::MacInstallFont() const
&atsuSize , &atsuSize ,
&atsuColor , &atsuColor ,
} ; } ;
status = ::ATSUSetAttributes((ATSUStyle)m_macATSUIStyle, sizeof(atsuTags)/sizeof(ATSUAttributeTag) , status = ::ATSUSetAttributes((ATSUStyle)m_macATSUIStyle, sizeof(atsuTags)/sizeof(ATSUAttributeTag) ,
atsuTags, atsuSizes, atsuValues); atsuTags, atsuSizes, atsuValues);