X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/449c567346a1b3937e532cd87aac007faad76b04..c6212a0cb7e6285f62198a9411d91bbe8dc06e60:/src/cocoa/dc.mm?ds=sidebyside diff --git a/src/cocoa/dc.mm b/src/cocoa/dc.mm index 44762feba2..db8e22406b 100644 --- a/src/cocoa/dc.mm +++ b/src/cocoa/dc.mm @@ -6,16 +6,21 @@ // Created: 2003/04/01 // RCS-ID: $Id$ // Copyright: (c) 2003 David Elliott -// Licence: wxWindows license +// Licence: wxWidgets licence ///////////////////////////////////////////////////////////////////////////// #include "wx/wxprec.h" + +#include "wx/cocoa/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" +#include "wx/cocoa/string.h" +#include "wx/cocoa/ObjcRef.h" #import #import @@ -24,22 +29,23 @@ #import #import #import -#import +#import #import -#include +#include "wx/listimpl.cpp" WX_DEFINE_LIST(wxCocoaDCStack); -IMPLEMENT_ABSTRACT_CLASS(wxDC, wxObject) -WX_NSTextStorage wxDC::sm_cocoaNSTextStorage = nil; -WX_NSLayoutManager wxDC::sm_cocoaNSLayoutManager = nil; -WX_NSTextContainer wxDC::sm_cocoaNSTextContainer = nil; -wxCocoaDCStack wxDC::sm_cocoaDCStack; +IMPLEMENT_ABSTRACT_CLASS(wxCocoaDCImpl, wxDCImpl) + +WX_NSTextStorage wxCocoaDCImpl::sm_cocoaNSTextStorage = nil; +WX_NSLayoutManager wxCocoaDCImpl::sm_cocoaNSLayoutManager = nil; +WX_NSTextContainer wxCocoaDCImpl::sm_cocoaNSTextContainer = nil; +wxCocoaDCStack wxCocoaDCImpl::sm_cocoaDCStack; inline void CocoaSetPenForNSBezierPath(wxPen &pen, NSBezierPath *bezpath) { [pen.GetNSColor() set]; - const float *pattern; + const CGFloat *pattern; [bezpath setLineDash:pattern count:pen.GetCocoaLineDash(&pattern) phase:0.0]; [bezpath setLineWidth:pen.GetWidth()]; switch(pen.GetJoin()) @@ -68,13 +74,18 @@ inline void CocoaSetPenForNSBezierPath(wxPen &pen, NSBezierPath *bezpath) } } -void wxDC::CocoaInitializeTextSystem() +void wxCocoaDCImpl::CocoaInitializeTextSystem() { - wxASSERT_MSG(!sm_cocoaNSTextStorage && !sm_cocoaNSLayoutManager && !sm_cocoaNSTextContainer,"Text system already initalized! BAD PROGRAMMER!"); + wxAutoNSAutoreleasePool pool; + + wxASSERT_MSG(!sm_cocoaNSTextStorage && !sm_cocoaNSLayoutManager && !sm_cocoaNSTextContainer,wxT("Text system already initalized! BAD PROGRAMMER!")); - sm_cocoaNSTextStorage = [[NSTextStorage alloc] init]; + // FIXME: Never released + sm_cocoaNSTextStorage = wxGCSafeRetain([[[NSTextStorage alloc] init] autorelease]); + + // FIXME: Never released + sm_cocoaNSLayoutManager = wxGCSafeRetain([[[NSLayoutManager alloc] init] autorelease]); - sm_cocoaNSLayoutManager = [[NSLayoutManager alloc] init]; [sm_cocoaNSTextStorage addLayoutManager:sm_cocoaNSLayoutManager]; // NSTextStorage retains NSLayoutManager, but so do we // [sm_cocoaNSLayoutManager release]; [sm_cocoaNSLayoutManager retain]; @@ -82,49 +93,50 @@ void wxDC::CocoaInitializeTextSystem() // NOTE: initWithContainerSize is the designated initializer, but the // Apple CircleView sample gets away with just calling init, which // is all we really need for our purposes. - sm_cocoaNSTextContainer = [[NSTextContainer alloc] init]; + // FIXME: Never released + sm_cocoaNSTextContainer = wxGCSafeRetain([[[NSTextContainer alloc] init] autorelease]); [sm_cocoaNSLayoutManager addTextContainer:sm_cocoaNSTextContainer]; // NSLayoutManager retains NSTextContainer, but so do we // [sm_cocoaNSTextContainer release]; [sm_cocoaNSTextContainer retain]; } -void wxDC::CocoaShutdownTextSystem() +void wxCocoaDCImpl::CocoaShutdownTextSystem() { [sm_cocoaNSTextContainer release]; sm_cocoaNSTextContainer = nil; [sm_cocoaNSLayoutManager release]; sm_cocoaNSLayoutManager = nil; [sm_cocoaNSTextStorage release]; sm_cocoaNSTextStorage = nil; } -void wxDC::CocoaUnwindStackAndLoseFocus() +void wxCocoaDCImpl::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(); + wxCocoaDCImpl *dc = node->GetData(); wxASSERT(dc); 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() +bool wxCocoaDCImpl::CocoaUnwindStackAndTakeFocus() { - wxCocoaDCStack::Node *node=sm_cocoaDCStack.GetFirst(); + wxCocoaDCStack::compatibility_iterator node=sm_cocoaDCStack.GetFirst(); for(;node;node = sm_cocoaDCStack.GetFirst()) { - wxDC *dc = node->GetData(); + wxCocoaDCImpl *dc = node->GetData(); wxASSERT(dc); // If we're on the stack, then it's unwound enough and we have focus if(dc==this) @@ -132,56 +144,81 @@ 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(); } -wxDC::wxDC(void) +wxCocoaDCImpl::wxCocoaDCImpl(wxDC *owner) +: wxDCImpl(owner) { - m_cocoaFlipped = false; - m_cocoaHeight = 0.0; + m_cocoaWxToBoundsTransform = nil; m_pen = *wxBLACK_PEN; } -wxDC::~wxDC(void) +wxCocoaDCImpl::~wxDC(void) { + [m_cocoaWxToBoundsTransform release]; } -bool wxDC::CocoaLockFocus() +bool wxCocoaDCImpl::CocoaLockFocus() { return false; } -bool wxDC::CocoaUnlockFocus() +bool wxCocoaDCImpl::CocoaUnlockFocus() { return false; } -void wxDC::CocoaApplyTransformations() +/*static*/ WX_NSAffineTransform wxCocoaDCImpl::CocoaGetWxToBoundsTransform(bool isFlipped, float height) { + NSAffineTransform *transform = nil; // This transform flips the graphics since wxDC uses top-left origin - if(!m_cocoaFlipped) + if(!isFlipped) { // The transform is auto released - NSAffineTransform *transform = [NSAffineTransform transform]; + transform = [NSAffineTransform transform]; /* x' = 1x + 0y + 0 y' = 0x + -1y + window's height */ NSAffineTransformStruct matrix = { 1, 0 , 0, -1 - , 0, m_cocoaHeight + , 0, height }; [transform setTransformStruct: matrix]; - // Apply the transform - [transform concat]; } - // TODO: Apply scaling transformation + return transform; +} + +void wxCocoaDCImpl::CocoaApplyTransformations() +{ + [m_cocoaWxToBoundsTransform concat]; + // TODO: Apply device/logical/user position/scaling transformations } -void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) +void wxCocoaDCImpl::CocoaUnapplyTransformations() { + // NOTE: You *must* call this with focus held. + // Undo all transforms so we're back in true Cocoa coords with + // no scaling or flipping. + NSAffineTransform *invertTransform; + invertTransform = [m_cocoaWxToBoundsTransform copy]; + [invertTransform invert]; + [invertTransform concat]; + [invertTransform release]; +} + +bool wxCocoaDCImpl::CocoaGetBounds(void *rectData) +{ + // We don't know what we are so we can't return anything. + return false; +} + +void wxCocoaDCImpl::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) +{ + wxAutoNSAutoreleasePool pool; if(!CocoaTakeFocus()) return; NSBezierPath *bezpath = [NSBezierPath bezierPathWithRect:NSMakeRect(x,y,width,height)]; CocoaSetPenForNSBezierPath(m_pen,bezpath); @@ -190,8 +227,9 @@ void wxDC::DoDrawRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height) [bezpath fill]; } -void wxDC::DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) +void wxCocoaDCImpl::DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) { + wxAutoNSAutoreleasePool pool; if(!CocoaTakeFocus()) return; NSBezierPath *bezpath = [NSBezierPath bezierPath]; [bezpath moveToPoint:NSMakePoint(x1,y1)]; @@ -201,13 +239,13 @@ void wxDC::DoDrawLine(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2) [bezpath stroke]; } -void wxDC::DoGetTextExtent(const wxString& text, wxCoord *x, wxCoord *y, wxCoord *descent, wxCoord *externalLeading, wxFont *theFont) const +void wxCocoaDCImpl::DoGetTextExtent(const wxString& text, wxCoord *x, wxCoord *y, wxCoord *descent, wxCoord *externalLeading, const wxFont *theFont) const { 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]; @@ -223,12 +261,13 @@ void wxDC::DoGetTextExtent(const wxString& text, wxCoord *x, wxCoord *y, wxCoord *externalLeading=0; } -void wxDC::DoDrawText(const wxString& text, wxCoord x, wxCoord y) +void wxCocoaDCImpl::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]; @@ -252,7 +291,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]; @@ -274,7 +313,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]; @@ -285,176 +324,144 @@ void wxDC::DoDrawText(const wxString& text, wxCoord x, wxCoord y) NSPoint layoutLocation = [sm_cocoaNSLayoutManager locationForGlyphAtIndex:0]; layoutLocation.x = 0.0; layoutLocation.y *= -1.0; + + // Save the location as is for underlining + NSPoint underlineLocation = layoutLocation; + + // Offset the location by the baseline for drawing the glyphs. layoutLocation.y += [[sm_cocoaNSLayoutManager typesetter] baselineOffsetInLayoutManager:sm_cocoaNSLayoutManager glyphIndex:0]; + if(m_backgroundMode==wxSOLID) [sm_cocoaNSLayoutManager drawBackgroundForGlyphRange:glyphRange atPoint:NSZeroPoint]; [sm_cocoaNSLayoutManager drawGlyphsForGlyphRange:glyphRange atPoint:layoutLocation]; - [context restoreGraphicsState]; -} - -// wxDCBase functions -int wxDCBase::DeviceToLogicalX(int x) const -{ - return x; -} + int underlineStyle = GetFont().GetUnderlined() ? NSUnderlineStyleSingle : NSUnderlineStyleNone; + NSRange lineGlyphRange; + NSRect lineRect = [sm_cocoaNSLayoutManager lineFragmentRectForGlyphAtIndex:0 effectiveRange:&lineGlyphRange]; -int wxDCBase::DeviceToLogicalY(int y) const -{ - return y; -} - -int wxDCBase::DeviceToLogicalXRel(int x) const -{ - return x; -} - -int wxDCBase::DeviceToLogicalYRel(int y) const -{ - return y; -} + [sm_cocoaNSLayoutManager underlineGlyphRange:glyphRange underlineType:underlineStyle + lineFragmentRect:lineRect lineFragmentGlyphRange:lineGlyphRange + containerOrigin:underlineLocation]; -int wxDCBase::LogicalToDeviceX(int x) const -{ - return x; -} - -int wxDCBase::LogicalToDeviceY(int y) const -{ - return y; -} - -int wxDCBase::LogicalToDeviceXRel(int x) const -{ - return x; -} - -int wxDCBase::LogicalToDeviceYRel(int y) const -{ - return y; + [context restoreGraphicsState]; } /////////////////////////////////////////////////////////////////////////// // cut here, the rest is stubs /////////////////////////////////////////////////////////////////////////// -//----------------------------------------------------------------------------- -// constants -//----------------------------------------------------------------------------- - -#define mm2inches 0.0393700787402 -#define inches2mm 25.4 -#define mm2twips 56.6929133859 -#define twips2mm 0.0176388888889 -#define mm2pt 2.83464566929 -#define pt2mm 0.352777777778 - //----------------------------------------------------------------------------- // wxDC //----------------------------------------------------------------------------- -void wxDC::DoDrawIcon( const wxIcon &WXUNUSED(icon), int WXUNUSED(x), int WXUNUSED(y) ) +void wxCocoaDCImpl::DoDrawIcon( const wxIcon &WXUNUSED(icon), int WXUNUSED(x), int WXUNUSED(y) ) { }; -void wxDC::DoDrawPoint( int x, int y ) -{ +void wxCocoaDCImpl::DoDrawPoint( int x, int y ) +{ }; -void wxDC::DoDrawPolygon( int, wxPoint *, int, int, int) +void wxCocoaDCImpl::DoDrawPolygon( int, wxPoint *, int, int, wxPolygonFillMode) { }; -void wxDC::DoDrawLines( int, wxPoint *, int, int ) +void wxCocoaDCImpl::DoDrawLines( int, wxPoint *, int, int ) { } -int wxDC::GetDepth() const +int wxCocoaDCImpl::GetDepth() const { return 0; } -wxSize wxDC::GetPPI() const +wxSize wxCocoaDCImpl::GetPPI() const { return wxSize(0,0); } -bool wxDC::CanGetTextExtent() const +bool wxCocoaDCImpl::CanGetTextExtent() const { return false; } -wxCoord wxDC::GetCharHeight() const +wxCoord wxCocoaDCImpl::GetCharHeight() const { return 0; } -wxCoord wxDC::GetCharWidth() const +wxCoord wxCocoaDCImpl::GetCharWidth() const { return 0; } -bool wxDC::CanDrawBitmap() const +bool wxCocoaDCImpl::CanDrawBitmap() const { return true; } -bool wxDC::DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const +bool wxCocoaDCImpl::DoGetPixel(wxCoord x, wxCoord y, wxColour *col) const { return false; } -void wxDC::DoDrawArc(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, wxCoord xc, wxCoord yc) +void wxCocoaDCImpl::DoDrawArc(wxCoord x1, wxCoord y1, wxCoord x2, wxCoord y2, wxCoord xc, wxCoord yc) +{ +} + +void wxCocoaDCImpl::SetFont(const wxFont& font) { + m_font = font; } - -void wxDC::SetPen(const wxPen& pen) + +void wxCocoaDCImpl::SetPen(const wxPen& pen) { m_pen = pen; } -void wxDC::SetBrush(const wxBrush& brush) +void wxCocoaDCImpl::SetBrush(const wxBrush& brush) { m_brush = brush; } -void wxDC::DoSetClippingRegionAsRegion(const wxRegion& region) +void wxCocoaDCImpl::DoSetClippingRegionAsRegion(const wxRegion& region) { } -void wxDC::DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height) +void wxCocoaDCImpl::DoSetClippingRegion(wxCoord x, wxCoord y, wxCoord width, wxCoord height) { } -void wxDC::DestroyClippingRegion() +void wxCocoaDCImpl::DestroyClippingRegion() { } -void wxDC::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius) +void wxCocoaDCImpl::DoDrawRoundedRectangle(wxCoord x, wxCoord y, wxCoord width, wxCoord height, double radius) { } -void wxDC::DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, double angle) +void wxCocoaDCImpl::DoDrawRotatedText(const wxString& text, wxCoord x, wxCoord y, double angle) { } -void wxDC::DoDrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h, double sa, double ea) +void wxCocoaDCImpl::DoDrawEllipticArc(wxCoord x, wxCoord y, wxCoord w, wxCoord h, double sa, double ea) { } -void wxDC::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height) +void wxCocoaDCImpl::DoDrawEllipse(wxCoord x, wxCoord y, wxCoord width, wxCoord height) { } -void wxDC::DoDrawBitmap(const wxBitmap &bmp, wxCoord x, wxCoord y, bool useMask) +void wxCocoaDCImpl::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]; @@ -481,89 +488,105 @@ 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]; [context restoreGraphicsState]; } -bool wxDC::DoFloodFill(wxCoord x, wxCoord y, const wxColour& col, int style) +bool wxCocoaDCImpl::DoFloodFill(wxCoord x, wxCoord y, const wxColour& col, wxFloodFillStyle style) { return false; } -void wxDC::DoCrossHair(wxCoord x, wxCoord y) +void wxCocoaDCImpl::DoCrossHair(wxCoord x, wxCoord y) { } -bool wxDC::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, wxDC *source, wxCoord xsrc, wxCoord ysrc, int rop, bool useMask , wxCoord xsrcMask, wxCoord ysrcMask) +bool wxCocoaDCImpl::DoBlit(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, wxDC *source, wxCoord xsrc, wxCoord ysrc, wxRasterOperationMode rop, bool useMask , wxCoord xsrcMask, wxCoord ysrcMask) { if(!CocoaTakeFocus()) return false; if(!source) return false; - return source->CocoaDoBlitOnFocusedDC(xdest,ydest,width,height, + wxCocoaDCImpl *sourceImpl = static_cast(source->GetImpl()); + return sourceImpl->CocoaDoBlitOnFocusedDC(xdest,ydest,width,height, xsrc, ysrc, rop, useMask, xsrcMask, ysrcMask); } -bool wxDC::CocoaDoBlitOnFocusedDC(wxCoord xdest, wxCoord ydest, +bool wxCocoaDCImpl::CocoaDoBlitOnFocusedDC(wxCoord xdest, wxCoord ydest, wxCoord width, wxCoord height, wxCoord xsrc, wxCoord ysrc, int logicalFunc, bool useMask, wxCoord xsrcMask, wxCoord ysrcMask) { return false; } -void wxDC::DoGetSize( int* width, int* height ) const +void wxCocoaDCImpl::DoGetSize( int* width, int* height ) const { *width = m_maxX-m_minX; *height = m_maxY-m_minY; }; -void wxDC::DoGetSizeMM( int* width, int* height ) const +void wxCocoaDCImpl::DoGetSizeMM( int* width, int* height ) const { int w = 0; int h = 0; - GetSize( &w, &h ); + DoGetSize( &w, &h ); }; -void wxDC::SetTextForeground( const wxColour &col ) +void wxCocoaDCImpl::SetTextForeground( const wxColour &col ) { - if (!Ok()) return; +// if (!Ok()) return; m_textForegroundColour = col; }; -void wxDC::SetTextBackground( const wxColour &col ) +void wxCocoaDCImpl::SetTextBackground( const wxColour &col ) { - if (!Ok()) return; +// if (!Ok()) return; m_textBackgroundColour = col; }; -void wxDC::Clear() +void wxCocoaDCImpl::Clear() { + if(!CocoaTakeFocus()) return; + + NSRect boundsRect; + if(!CocoaGetBounds(&boundsRect)) return; + + NSGraphicsContext *context = [NSGraphicsContext currentContext]; + [context saveGraphicsState]; + + // Undo all transforms so when we draw our bounds rect we + // really overwrite our bounds rect. + CocoaUnapplyTransformations(); + + [m_backgroundBrush.GetNSColor() set]; + [NSBezierPath fillRect:boundsRect]; + + [context restoreGraphicsState]; } -void wxDC::SetBackground(const wxBrush& brush) +void wxCocoaDCImpl::SetBackground(const wxBrush& brush) { m_backgroundBrush = brush; } -void wxDC::SetPalette(const wxPalette&) +void wxCocoaDCImpl::SetPalette(const wxPalette&) { } -void wxDC::SetLogicalFunction(int) +void wxCocoaDCImpl::SetLogicalFunction(wxRasterOperationMode) { } -void wxDC::SetMapMode( int mode ) +void wxCocoaDCImpl::SetMapMode( wxMappingMode mode ) { - switch (mode) + switch (mode) { case wxMM_TWIPS: break; @@ -583,7 +606,7 @@ void wxDC::SetMapMode( int mode ) }; }; -void wxDC::SetUserScale( double x, double y ) +void wxCocoaDCImpl::SetUserScale( double x, double y ) { // allow negative ? -> no m_userScaleX = x; @@ -591,7 +614,7 @@ void wxDC::SetUserScale( double x, double y ) ComputeScaleAndOrigin(); }; -void wxDC::SetLogicalScale( double x, double y ) +void wxCocoaDCImpl::SetLogicalScale( double x, double y ) { // allow negative ? m_logicalScaleX = x; @@ -599,26 +622,26 @@ void wxDC::SetLogicalScale( double x, double y ) ComputeScaleAndOrigin(); }; -void wxDC::SetLogicalOrigin( wxCoord x, wxCoord y ) +void wxCocoaDCImpl::SetLogicalOrigin( wxCoord x, wxCoord y ) { m_logicalOriginX = x * m_signX; // is this still correct ? m_logicalOriginY = y * m_signY; ComputeScaleAndOrigin(); }; -void wxDC::SetDeviceOrigin( wxCoord x, wxCoord y ) +void wxCocoaDCImpl::SetDeviceOrigin( wxCoord x, wxCoord y ) { ComputeScaleAndOrigin(); }; -void wxDC::SetAxisOrientation( bool xLeftRight, bool yBottomUp ) +void wxCocoaDCImpl::SetAxisOrientation( bool xLeftRight, bool yBottomUp ) { m_signX = (xLeftRight ? 1 : -1); m_signY = (yBottomUp ? -1 : 1); ComputeScaleAndOrigin(); }; -void wxDC::ComputeScaleAndOrigin(void) +void wxCocoaDCImpl::ComputeScaleAndOrigin(void) { // CMB: copy scale to see if it changes double origScaleX = m_scaleX; @@ -627,15 +650,16 @@ 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) { +#if 0 // this is a bit artificial, but we need to force wxDC to think // the pen has changed - wxPen* pen = & GetPen(); + const wxPen* pen = & GetPen(); wxPen tempPen; m_pen = tempPen; SetPen(* pen); +#endif } }; -