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

cleanup - reformatting, minor code tweaks

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@36592 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
David Surovell
2005-12-29 19:42:43 +00:00
parent a536a8bf3f
commit cefe588637
1 changed files with 38 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
src/mac/carbon/dcmemory.cpp
View File

@@ -20,27 +20,27 @@
IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxPaintDC) IMPLEMENT_DYNAMIC_CLASS(wxMemoryDC,wxPaintDC)
wxMemoryDC::wxMemoryDC(void) wxMemoryDC::wxMemoryDC()
: m_selected() : m_selected()
{ {
m_ok = TRUE; m_ok = true;
SetBackground(*wxWHITE_BRUSH); SetBackground(*wxWHITE_BRUSH);
SetBrush(*wxWHITE_BRUSH); SetBrush(*wxWHITE_BRUSH);
SetPen(*wxBLACK_PEN); SetPen(*wxBLACK_PEN);
SetFont(*wxNORMAL_FONT) ; SetFont(*wxNORMAL_FONT);
m_ok = FALSE; m_ok = false;
}; }
wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) ) wxMemoryDC::wxMemoryDC( wxDC *WXUNUSED(dc) )
: m_selected() : m_selected()
{ {
m_ok = TRUE; m_ok = true;
SetBackground(*wxWHITE_BRUSH); SetBackground(*wxWHITE_BRUSH);
SetBrush(*wxWHITE_BRUSH); SetBrush(*wxWHITE_BRUSH);
SetPen(*wxBLACK_PEN); SetPen(*wxBLACK_PEN);
SetFont(*wxNORMAL_FONT) ; SetFont(*wxNORMAL_FONT);
m_ok = FALSE; m_ok = false;
}; }
wxMemoryDC::~wxMemoryDC() wxMemoryDC::~wxMemoryDC()
{ {
@@ -53,10 +53,10 @@ wxMemoryDC::~wxMemoryDC()
m_graphicContext = NULL ; m_graphicContext = NULL ;
CGContextRelease( bmCtx ) ; CGContextRelease( bmCtx ) ;
#else #else
// TODO UnlockPixels( GetGWorldPixMap(MAC_WXHBITMAP(m_selected.GetHBITMAP())) ); // TODO: UnlockPixels( GetGWorldPixMap(MAC_WXHBITMAP(m_selected.GetHBITMAP())) );
#endif #endif
} }
}; }
void wxMemoryDC::SelectObject( const wxBitmap& bitmap ) void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
{ {
@@ -69,9 +69,10 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
m_graphicContext = NULL ; m_graphicContext = NULL ;
CGContextRelease( bmCtx ) ; CGContextRelease( bmCtx ) ;
#else #else
// TODO UnlockPixels( GetGWorldPixMap(MAC_WXHBITMAP(m_selected.GetHBITMAP())) ); // TODO: UnlockPixels( GetGWorldPixMap(MAC_WXHBITMAP(m_selected.GetHBITMAP())) );
#endif #endif
} }
m_selected = bitmap; m_selected = bitmap;
if (m_selected.Ok()) if (m_selected.Ok())
{ {
@@ -83,47 +84,42 @@ void wxMemoryDC::SelectObject( const wxBitmap& bitmap )
int bytesPerPixel = 4 ; int bytesPerPixel = 4 ;
int w = bitmap.GetWidth() ; int w = bitmap.GetWidth() ;
int h = bitmap.GetHeight() ; int h = bitmap.GetHeight() ;
// TODO: should this be kCGImageAlphaPremultiplied[First,Last] ?
CGImageAlphaInfo a = kCGImageAlphaNoneSkipFirst ; CGImageAlphaInfo a = kCGImageAlphaNoneSkipFirst ;
CGColorSpaceRef genericColorSpace = wxMacGetGenericRGBColorSpace(); CGColorSpaceRef genericColorSpace = wxMacGetGenericRGBColorSpace();
CGContextRef bmCtx = CGBitmapContextCreate(data , w, h, bitsPerComp , bytesPerPixel * w , genericColorSpace, a); CGContextRef bmCtx = CGBitmapContextCreate( data , w, h, bitsPerComp , bytesPerPixel * w , genericColorSpace, a );
wxASSERT_MSG( bmCtx , wxT("Unable to create bitmap context") ) ; wxASSERT_MSG( bmCtx , wxT("Unable to create bitmap context") ) ;
CGContextSetFillColorSpace(bmCtx, genericColorSpace); if ( bmCtx )
CGContextSetStrokeColorSpace(bmCtx, genericColorSpace);
if( bmCtx )
{ {
CGContextSetFillColorSpace( bmCtx, genericColorSpace );
CGContextSetStrokeColorSpace( bmCtx, genericColorSpace );
CGContextTranslateCTM( bmCtx , 0 , m_selected.GetHeight() ) ; CGContextTranslateCTM( bmCtx , 0 , m_selected.GetHeight() ) ;
CGContextScaleCTM( bmCtx , 1 , -1 ) ; CGContextScaleCTM( bmCtx , 1 , -1 ) ;
m_graphicContext = new wxMacCGContext( bmCtx ) ; m_graphicContext = new wxMacCGContext( bmCtx ) ;
m_graphicContext->SetPen( m_pen ) ; m_graphicContext->SetPen( m_pen ) ;
m_graphicContext->SetBrush( m_brush ) ; m_graphicContext->SetBrush( m_brush ) ;
} }
m_ok = (m_graphicContext != NULL) ; m_ok = (m_graphicContext != NULL) ;
#else #else
if ( ( m_macPort = m_selected.GetHBITMAP( &m_macMask ) ) != NULL ) m_macPort = m_selected.GetHBITMAP( &m_macMask ) ;
m_ok = (m_macPort != NULL) ;
if (m_ok)
{ {
LockPixels( GetGWorldPixMap( (CGrafPtr) m_macPort ) ) ; LockPixels( GetGWorldPixMap( (CGrafPtr) m_macPort ) ) ;
/*
wxMask * mask = bitmap.GetMask() ;
if ( mask )
{
m_macMask = mask->GetHBITMAP() ;
}
*/
SetRectRgn( (RgnHandle) m_macBoundaryClipRgn , 0 , 0 , m_selected.GetWidth() , m_selected.GetHeight() ) ; SetRectRgn( (RgnHandle) m_macBoundaryClipRgn , 0 , 0 , m_selected.GetWidth() , m_selected.GetHeight() ) ;
CopyRgn( (RgnHandle) m_macBoundaryClipRgn ,(RgnHandle) m_macCurrentClipRgn ) ; CopyRgn( (RgnHandle) m_macBoundaryClipRgn , (RgnHandle) m_macCurrentClipRgn ) ;
m_ok = TRUE ;
}
else
{
m_ok = FALSE;
} }
#endif #endif
} }
else else
{ {
m_ok = FALSE; m_ok = false;
} }
} }
@@ -131,14 +127,16 @@ void wxMemoryDC::DoGetSize( int *width, int *height ) const
{ {
if (m_selected.Ok()) if (m_selected.Ok())
{ {
if (width) (*width) = m_selected.GetWidth(); if (width)
if (height) (*height) = m_selected.GetHeight(); (*width) = m_selected.GetWidth();
if (height)
(*height) = m_selected.GetHeight();
} }
else else
{ {
if (width) (*width) = 0; if (width)
if (height) (*height) = 0; (*width) = 0;
if (height)
(*height) = 0;
} }
} }