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

no_rtti fix was not having correct eval order

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@32431 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Stefan Csomor
2005-02-27 20:49:59 +00:00
parent e6bdaaad1d
commit b60f5ca56d
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -617,7 +617,7 @@ void wxDC::DoDrawBitmap( const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask
wxCoord ww = XLOG2DEVREL(w); wxCoord ww = XLOG2DEVREL(w);
wxCoord hh = YLOG2DEVREL(h); wxCoord hh = YLOG2DEVREL(h);
CGContextRef cg = (wxMacCGContext*)(m_graphicContext)->GetNativeContext() ; CGContextRef cg = ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ;
CGImageRef image = (CGImageRef)( bmp.CGImageCreate() ) ; CGImageRef image = (CGImageRef)( bmp.CGImageCreate() ) ;
HIRect r = CGRectMake( xx , yy , ww , hh ) ; HIRect r = CGRectMake( xx , yy , ww , hh ) ;
HIViewDrawCGImage( cg , &r , image ) ; HIViewDrawCGImage( cg , &r , image ) ;
@@ -636,7 +636,7 @@ void wxDC::DoDrawIcon( const wxIcon &icon, wxCoord x, wxCoord y )
wxCoord ww = XLOG2DEVREL(w); wxCoord ww = XLOG2DEVREL(w);
wxCoord hh = YLOG2DEVREL(h); wxCoord hh = YLOG2DEVREL(h);
CGContextRef cg = (wxMacCGContext*)(m_graphicContext)->GetNativeContext() ; CGContextRef cg = ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ;
CGRect r = CGRectMake( 00 , 00 , ww , hh ) ; CGRect r = CGRectMake( 00 , 00 , ww , hh ) ;
CGContextSaveGState(cg); CGContextSaveGState(cg);
CGContextTranslateCTM(cg, xx , yy + hh ); CGContextTranslateCTM(cg, xx , yy + hh );
@@ -655,7 +655,7 @@ void wxDC::DoSetClippingRegion( wxCoord x, wxCoord y, wxCoord width, wxCoord hei
ww = XLOG2DEVREL(width); ww = XLOG2DEVREL(width);
hh = YLOG2DEVREL(height); hh = YLOG2DEVREL(height);
CGContextRef cgContext = (wxMacCGContext*)(m_graphicContext)->GetNativeContext() ; CGContextRef cgContext = ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ;
CGRect clipRect = CGRectMake( xx ,yy , ww, hh ) ; CGRect clipRect = CGRectMake( xx ,yy , ww, hh ) ;
CGContextClipToRect( cgContext , clipRect ) ; CGContextClipToRect( cgContext , clipRect ) ;
@@ -732,7 +732,7 @@ 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 );
SetPen( m_pen ) ; SetPen( m_pen ) ;
@@ -1321,7 +1321,7 @@ bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height,
} }
if ( blit.Ok() ) if ( blit.Ok() )
{ {
CGContextRef cg = (wxMacCGContext*)(m_graphicContext)->GetNativeContext() ; CGContextRef cg = ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ;
CGImageRef image = (CGImageRef)( blit.CGImageCreate() ) ; CGImageRef image = (CGImageRef)( blit.CGImageCreate() ) ;
HIRect r = CGRectMake( xxdest , yydest , wwdest , hhdest ) ; HIRect r = CGRectMake( xxdest , yydest , wwdest , hhdest ) ;
HIViewDrawCGImage( cg , &r , image ) ; HIViewDrawCGImage( cg , &r , image ) ;
@@ -1410,7 +1410,7 @@ void wxDC::DoDrawRotatedText(const wxString& str, wxCoord x, wxCoord y,
atsuTags, atsuSizes, atsuValues ) ; atsuTags, atsuSizes, atsuValues ) ;
} }
{ {
CGContextRef cgContext = (wxMacCGContext*)(m_graphicContext)->GetNativeContext() ; CGContextRef cgContext = ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ;
ATSUAttributeTag atsuTags[] = ATSUAttributeTag atsuTags[] =
{ {
kATSUCGContextTag , kATSUCGContextTag ,
@@ -1465,13 +1465,13 @@ void wxDC::DoDrawRotatedText(const wxString& str, wxCoord x, wxCoord y,
IntToFixed(drawX) , IntToFixed(drawY) , &rect ); IntToFixed(drawX) , IntToFixed(drawY) , &rect );
wxASSERT_MSG( status == noErr , wxT("couldn't measure the rotated text") ); wxASSERT_MSG( status == noErr , wxT("couldn't measure the rotated text") );
CGContextSaveGState((wxMacCGContext*)(m_graphicContext)->GetNativeContext()); CGContextSaveGState(((wxMacCGContext*)(m_graphicContext))->GetNativeContext());
CGContextTranslateCTM((wxMacCGContext*)(m_graphicContext)->GetNativeContext(), drawX, drawY); CGContextTranslateCTM(((wxMacCGContext*)(m_graphicContext))->GetNativeContext(), drawX, drawY);
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) );
CalcBoundingBox(XDEV2LOG(rect.right), YDEV2LOG(rect.bottom) ); CalcBoundingBox(XDEV2LOG(rect.right), YDEV2LOG(rect.bottom) );
@@ -1656,7 +1656,7 @@ void wxDC::Clear(void)
if ( m_backgroundBrush.Ok() && m_backgroundBrush.GetStyle() != wxTRANSPARENT) if ( m_backgroundBrush.Ok() && m_backgroundBrush.GetStyle() != wxTRANSPARENT)
{ {
HIRect rect = CGRectMake( -10000 , -10000 , 20000 , 20000 ) ; HIRect rect = CGRectMake( -10000 , -10000 , 20000 , 20000 ) ;
CGContextRef cg = (wxMacCGContext*)(m_graphicContext)->GetNativeContext() ; CGContextRef cg = ((wxMacCGContext*)(m_graphicContext))->GetNativeContext() ;
switch( m_backgroundBrush.MacGetBrushKind() ) switch( m_backgroundBrush.MacGetBrushKind() )
{ {
case kwxMacBrushTheme : case kwxMacBrushTheme :