X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/4f9cd1cb7f5ec341d322a4d16d933560699bde1f..8e5ec129614e2473fd240f2a6e94ee56e3a9039b:/src/cocoa/dc.mm?ds=sidebyside diff --git a/src/cocoa/dc.mm b/src/cocoa/dc.mm index b6ee3bf591..7541eaf8c3 100644 --- a/src/cocoa/dc.mm +++ b/src/cocoa/dc.mm @@ -6,13 +6,16 @@ // Created: 2003/04/01 // RCS-ID: $Id$ // Copyright: (c) 2003 David Elliott -// Licence: wxWidgets licence +// Licence: wxWidgets licence ///////////////////////////////////////////////////////////////////////////// #include "wx/wxprec.h" + +#include "wx/dc.h" + #ifndef WX_PRECOMP #include "wx/log.h" - #include "wx/dc.h" + #include "wx/math.h" //math constants #endif //WX_PRECOMP #include "wx/cocoa/autorelease.h" @@ -28,7 +31,6 @@ #import #import -#include "wx/math.h" //math constants #include "wx/listimpl.cpp" WX_DEFINE_LIST(wxCocoaDCStack); @@ -374,8 +376,8 @@ void wxDC::DoDrawIcon( const wxIcon &WXUNUSED(icon), int WXUNUSED(x), int WXUNUS { }; -void wxDC::DoDrawPoint( int x, int y ) -{ +void wxDC::DoDrawPoint( int x, int y ) +{ }; void wxDC::DoDrawPolygon( int, wxPoint *, int, int, int) @@ -424,7 +426,7 @@ bool wxDC::DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const void wxDC::DoDrawArc(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, wxCoord xc, wxCoord yc) { } - + void wxDC::SetPen(const wxPen& pen) { m_pen = pen; @@ -505,7 +507,7 @@ void wxDC::DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask) fromRect: NSMakeRect(0.0,0.0,bmp.GetWidth(),bmp.GetHeight()) operation: NSCompositeSourceOver fraction: 1.0]; - + [nsimage release]; [context restoreGraphicsState]; } @@ -596,7 +598,7 @@ void wxDC::SetLogicalFunction(int) void wxDC::SetMapMode( int mode ) { - switch (mode) + switch (mode) { case wxMM_TWIPS: break; @@ -660,7 +662,7 @@ void wxDC::ComputeScaleAndOrigin(void) m_scaleX = m_logicalScaleX * m_userScaleX; m_scaleY = m_logicalScaleY * m_userScaleY; - // 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 @@ -671,4 +673,3 @@ void wxDC::ComputeScaleAndOrigin(void) SetPen(* pen); } }; -