X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/276a125640f6b921a475284bdba4391c19b25aac..6c7eee75ce725a465fa8660f7215a77fb5653dce:/src/cocoa/dc.mm diff --git a/src/cocoa/dc.mm b/src/cocoa/dc.mm index 8ba136926e..f5fcb1c007 100644 --- a/src/cocoa/dc.mm +++ b/src/cocoa/dc.mm @@ -9,10 +9,14 @@ // Licence: wxWindows license ///////////////////////////////////////////////////////////////////////////// -#include "wx/dc.h" -#include "wx/log.h" +#include "wx/wxprec.h" +#ifndef WX_PRECOMP + #include "wx/log.h" + #include "wx/dc.h" +#endif //WX_PRECOMP #include "wx/cocoa/autorelease.h" +#include "wx/cocoa/string.h" #import #import @@ -21,7 +25,7 @@ #import #import #import -#import +#import #import #include @@ -33,9 +37,41 @@ WX_NSLayoutManager wxDC::sm_cocoaNSLayoutManager = nil; WX_NSTextContainer wxDC::sm_cocoaNSTextContainer = nil; wxCocoaDCStack wxDC::sm_cocoaDCStack; +inline void CocoaSetPenForNSBezierPath(wxPen &pen, NSBezierPath *bezpath) +{ + [pen.GetNSColor() set]; + const float *pattern; + [bezpath setLineDash:pattern count:pen.GetCocoaLineDash(&pattern) phase:0.0]; + [bezpath setLineWidth:pen.GetWidth()]; + switch(pen.GetJoin()) + { + case wxJOIN_BEVEL: + [bezpath setLineJoinStyle:NSBevelLineJoinStyle]; + break; + case wxJOIN_ROUND: + [bezpath setLineJoinStyle:NSRoundLineJoinStyle]; + break; + case wxJOIN_MITER: + [bezpath setLineJoinStyle:NSMiterLineJoinStyle]; + break; + } + switch(pen.GetCap()) + { + case wxCAP_ROUND: + [bezpath setLineCapStyle:NSRoundLineCapStyle]; + break; + case wxCAP_PROJECTING: + [bezpath setLineCapStyle:NSSquareLineCapStyle]; + break; + case wxCAP_BUTT: + [bezpath setLineCapStyle:NSButtLineCapStyle]; + break; + } +} + void wxDC::CocoaInitializeTextSystem() { - wxASSERT_MSG(!sm_cocoaNSTextStorage && !sm_cocoaNSLayoutManager && !sm_cocoaNSTextContainer,"Text system already initalized! BAD PROGRAMMER!"); + wxASSERT_MSG(!sm_cocoaNSTextStorage && !sm_cocoaNSLayoutManager && !sm_cocoaNSTextContainer,wxT("Text system already initalized! BAD PROGRAMMER!")); sm_cocoaNSTextStorage = [[NSTextStorage alloc] init]; @@ -62,10 +98,10 @@ void wxDC::CocoaShutdownTextSystem() void wxDC::CocoaUnwindStackAndLoseFocus() { - wxCocoaDCStack::Node *ourNode=sm_cocoaDCStack.Find(this); + wxCocoaDCStack::compatibility_iterator ourNode=sm_cocoaDCStack.Find(this); if(ourNode) { - wxCocoaDCStack::Node *node=sm_cocoaDCStack.GetFirst(); + wxCocoaDCStack::compatibility_iterator node=sm_cocoaDCStack.GetFirst(); for(;node!=ourNode; node=sm_cocoaDCStack.GetFirst()) { wxDC *dc = node->GetData(); @@ -73,20 +109,20 @@ void wxDC::CocoaUnwindStackAndLoseFocus() wxASSERT(dc!=this); if(!dc->CocoaUnlockFocus()) { - wxFAIL_MSG("Unable to unlock focus on higher-level DC!"); + wxFAIL_MSG(wxT("Unable to unlock focus on higher-level DC!")); } - sm_cocoaDCStack.DeleteNode(node); + sm_cocoaDCStack.Erase(node); } wxASSERT(node==ourNode); wxASSERT(ourNode->GetData() == this); ourNode->GetData()->CocoaUnlockFocus(); - sm_cocoaDCStack.DeleteNode(ourNode); + sm_cocoaDCStack.Erase(ourNode); } } bool wxDC::CocoaUnwindStackAndTakeFocus() { - wxCocoaDCStack::Node *node=sm_cocoaDCStack.GetFirst(); + wxCocoaDCStack::compatibility_iterator node=sm_cocoaDCStack.GetFirst(); for(;node;node = sm_cocoaDCStack.GetFirst()) { wxDC *dc = node->GetData(); @@ -97,7 +133,7 @@ bool wxDC::CocoaUnwindStackAndTakeFocus() // If unable to unlockFocus (e.g. wxPaintDC) stop here if(!dc->CocoaUnlockFocus()) break; - sm_cocoaDCStack.DeleteNode(node); + sm_cocoaDCStack.Erase(node); } return CocoaLockFocus(); } @@ -106,6 +142,7 @@ wxDC::wxDC(void) { m_cocoaFlipped = false; m_cocoaHeight = 0.0; + m_pen = *wxBLACK_PEN; } wxDC::~wxDC(void) @@ -146,9 +183,10 @@ void wxDC::CocoaApplyTransformations() void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) { + wxAutoNSAutoreleasePool pool; if(!CocoaTakeFocus()) return; NSBezierPath *bezpath = [NSBezierPath bezierPathWithRect:NSMakeRect(x,y,width,height)]; - [m_textForegroundColour.GetNSColor() set]; + CocoaSetPenForNSBezierPath(m_pen,bezpath); [bezpath stroke]; [m_brush.GetNSColor() set]; [bezpath fill]; @@ -156,12 +194,13 @@ void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) void wxDC::DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) { + wxAutoNSAutoreleasePool pool; if(!CocoaTakeFocus()) return; NSBezierPath *bezpath = [NSBezierPath bezierPath]; [bezpath moveToPoint:NSMakePoint(x1,y1)]; [bezpath lineToPoint:NSMakePoint(x2,y2)]; - [m_textForegroundColour.GetNSColor() set]; + CocoaSetPenForNSBezierPath(m_pen,bezpath); [bezpath stroke]; } @@ -169,9 +208,9 @@ void wxDC::DoGetTextExtent(const wxString& text, wxCoord *x, wxCoord *y, wxCoord { wxAutoNSAutoreleasePool pool; // FIXME: Cache this so it can be used for DoDrawText - wxASSERT_MSG(sm_cocoaNSTextStorage && sm_cocoaNSLayoutManager && sm_cocoaNSTextContainer, "Text system has not been initialized. BAD PROGRAMMER!"); + wxASSERT_MSG(sm_cocoaNSTextStorage && sm_cocoaNSLayoutManager && sm_cocoaNSTextContainer, wxT("Text system has not been initialized. BAD PROGRAMMER!")); NSAttributedString *attributedString = [[NSAttributedString alloc] - initWithString:[NSString stringWithCString:text.c_str()]]; + initWithString:wxNSStringWithWxString(text.c_str())]; [sm_cocoaNSTextStorage setAttributedString:attributedString]; [attributedString release]; @@ -189,10 +228,11 @@ void wxDC::DoGetTextExtent(const wxString& text, wxCoord *x, wxCoord *y, wxCoord void wxDC::DoDrawText(const wxString& text, wxCoord x, wxCoord y) { + wxAutoNSAutoreleasePool pool; if(!CocoaTakeFocus()) return; - wxASSERT_MSG(sm_cocoaNSTextStorage && sm_cocoaNSLayoutManager && sm_cocoaNSTextContainer, "Text system has not been initialized. BAD PROGRAMMER!"); + wxASSERT_MSG(sm_cocoaNSTextStorage && sm_cocoaNSLayoutManager && sm_cocoaNSTextContainer, wxT("Text system has not been initialized. BAD PROGRAMMER!")); NSAttributedString *attributedString = [[NSAttributedString alloc] - initWithString:[NSString stringWithCString:text.c_str()]]; + initWithString:wxNSStringWithWxString(text.c_str())]; [sm_cocoaNSTextStorage setAttributedString:attributedString]; [attributedString release]; @@ -216,7 +256,7 @@ void wxDC::DoDrawText(const wxString& text, wxCoord x, wxCoord y) // there is no length or we don't start at zero if(!glyphRange.length) return; - wxASSERT_MSG(glyphRange.location==0,"glyphRange must begin at zero"); + wxASSERT_MSG(glyphRange.location==0,wxT("glyphRange must begin at zero")); NSAffineTransform *transform = [NSAffineTransform transform]; [transform translateXBy:x yBy:y]; @@ -238,7 +278,7 @@ void wxDC::DoDrawText(const wxString& text, wxCoord x, wxCoord y) [flipTransform concat]; #if 0 // Draw+fill a rectangle so we can see where the shit is supposed to be. - wxLogDebug("(%f,%f) (%fx%f)",usedRect.origin.x,usedRect.origin.y,usedRect.size.width,usedRect.size.height); + wxLogTrace(wxTRACE_COCOA,wxT("(%f,%f) (%fx%f)"),usedRect.origin.x,usedRect.origin.y,usedRect.size.width,usedRect.size.height); NSBezierPath *bezpath = [NSBezierPath bezierPathWithRect:NSMakeRect(0,0,usedRect.size.width,usedRect.size.height)]; [[NSColor blackColor] set]; [bezpath stroke]; @@ -374,6 +414,7 @@ void wxDC::DoDrawArc(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, wxCoord xc, void wxDC::SetPen(const wxPen& pen) { + m_pen = pen; } void wxDC::SetBrush(const wxBrush& brush) @@ -411,13 +452,14 @@ void wxDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height) void wxDC::DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask) { + wxAutoNSAutoreleasePool pool; if(!CocoaTakeFocus()) return; if(!bmp.Ok()) return; #if 0 // Draw a rect so we can see where it's supposed to be - wxLogDebug("image at (%d,%d) size %dx%d",x,y,bmp.GetWidth(),bmp.GetHeight()); + wxLogTrace(wxTRACE_COCOA,wxT("image at (%d,%d) size %dx%d"),x,y,bmp.GetWidth(),bmp.GetHeight()); NSBezierPath *bezpath = [NSBezierPath bezierPathWithRect:NSMakeRect(x,y,bmp.GetWidth(),bmp.GetHeight())]; [[NSColor blackColor] set]; [bezpath stroke]; @@ -444,12 +486,11 @@ void wxDC::DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask) [transform concat]; [flipTransform concat]; - NSImage *nsimage = [[NSImage alloc] - initWithSize:NSMakeSize(bmp.GetWidth(), bmp.GetHeight())]; - [nsimage addRepresentation: const_cast(bmp).GetNSBitmapImageRep()]; + NSImage *nsimage = [bmp.GetNSImage(useMask) retain]; + [nsimage drawAtPoint: NSMakePoint(0,0) fromRect: NSMakeRect(0.0,0.0,bmp.GetWidth(),bmp.GetHeight()) - operation: NSCompositeCopy + operation: NSCompositeSourceOver fraction: 1.0]; [nsimage release];