X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/248802d0100093c48f67a60a6463d7765f14d5f0..12b5f4b4d2d8a07962da7ba3b78c8c1ec2634a67:/src/common/graphcmn.cpp diff --git a/src/common/graphcmn.cpp b/src/common/graphcmn.cpp index 4095bb95a9..f2396a06b1 100644 --- a/src/common/graphcmn.cpp +++ b/src/common/graphcmn.cpp @@ -3,7 +3,7 @@ // Purpose: graphics context methods common to all platforms // Author: Stefan Csomor // Modified by: -// Created: +// Created: // RCS-ID: $Id$ // Copyright: (c) Stefan Csomor // Licence: wxWindows licence @@ -18,7 +18,7 @@ #if wxUSE_GRAPHICS_CONTEXT -#include "wx/graphics.h" +#include "wx/private/graphics.h" #ifndef WX_PRECOMP #include "wx/icon.h" @@ -28,10 +28,6 @@ #include "wx/log.h" #endif -#if !defined(wxMAC_USE_CORE_GRAPHICS_BLEND_MODES) -#define wxMAC_USE_CORE_GRAPHICS_BLEND_MODES 0 -#endif - //----------------------------------------------------------------------------- // constants //----------------------------------------------------------------------------- @@ -63,42 +59,42 @@ wxGraphicsObjectRefData::wxGraphicsObjectRefData( const wxGraphicsObjectRefData* { m_renderer = data->m_renderer; } -wxGraphicsRenderer* wxGraphicsObjectRefData::GetRenderer() const -{ - return m_renderer ; +wxGraphicsRenderer* wxGraphicsObjectRefData::GetRenderer() const +{ + return m_renderer ; } -wxGraphicsObjectRefData* wxGraphicsObjectRefData::Clone() const +wxGraphicsObjectRefData* wxGraphicsObjectRefData::Clone() const { return new wxGraphicsObjectRefData(this); } -wxGraphicsObject::wxGraphicsObject() +wxGraphicsObject::wxGraphicsObject() { } -wxGraphicsObject::wxGraphicsObject( wxGraphicsRenderer* renderer ) +wxGraphicsObject::wxGraphicsObject( wxGraphicsRenderer* renderer ) { SetRefData( new wxGraphicsObjectRefData(renderer)); } -wxGraphicsObject::~wxGraphicsObject() +wxGraphicsObject::~wxGraphicsObject() { } -bool wxGraphicsObject::IsNull() const -{ - return m_refData == NULL; +bool wxGraphicsObject::IsNull() const +{ + return m_refData == NULL; } -wxGraphicsRenderer* wxGraphicsObject::GetRenderer() const -{ - return ( IsNull() ? NULL : GetGraphicsData()->GetRenderer() ); +wxGraphicsRenderer* wxGraphicsObject::GetRenderer() const +{ + return ( IsNull() ? NULL : GetGraphicsData()->GetRenderer() ); } -wxGraphicsObjectRefData* wxGraphicsObject::GetGraphicsData() const -{ - return (wxGraphicsObjectRefData*) m_refData; +wxGraphicsObjectRefData* wxGraphicsObject::GetGraphicsData() const +{ + return (wxGraphicsObjectRefData*) m_refData; } wxObjectRefData* wxGraphicsObject::CreateRefData() const @@ -120,10 +116,12 @@ wxObjectRefData* wxGraphicsObject::CloneRefData(const wxObjectRefData* data) con IMPLEMENT_DYNAMIC_CLASS(wxGraphicsPen, wxGraphicsObject) IMPLEMENT_DYNAMIC_CLASS(wxGraphicsBrush, wxGraphicsObject) IMPLEMENT_DYNAMIC_CLASS(wxGraphicsFont, wxGraphicsObject) +IMPLEMENT_DYNAMIC_CLASS(wxGraphicsBitmap, wxGraphicsObject) WXDLLIMPEXP_DATA_CORE(wxGraphicsPen) wxNullGraphicsPen; WXDLLIMPEXP_DATA_CORE(wxGraphicsBrush) wxNullGraphicsBrush; WXDLLIMPEXP_DATA_CORE(wxGraphicsFont) wxNullGraphicsFont; +WXDLLIMPEXP_DATA_CORE(wxGraphicsBitmap) wxNullGraphicsBitmap; //----------------------------------------------------------------------------- // matrix @@ -140,7 +138,7 @@ void wxGraphicsMatrix::Concat( const wxGraphicsMatrix *t ) } // sets the matrix to the respective values -void wxGraphicsMatrix::Set(wxDouble a, wxDouble b, wxDouble c, wxDouble d, +void wxGraphicsMatrix::Set(wxDouble a, wxDouble b, wxDouble c, wxDouble d, wxDouble tx, wxDouble ty) { AllocExclusive(); @@ -192,7 +190,7 @@ void wxGraphicsMatrix::Rotate( wxDouble angle ) { AllocExclusive(); GetMatrixData()->Rotate(angle); -} +} // // apply the transforms @@ -254,12 +252,12 @@ void wxGraphicsPath::AddArc( const wxPoint2DDouble& c, wxDouble r, wxDouble star wxRect2DDouble wxGraphicsPath::GetBox() const { - wxDouble x,y,w,h; - GetBox(&x,&y,&w,&h); - return wxRect2DDouble( x,y,w,h ); + wxDouble x,y,w,h; + GetBox(&x,&y,&w,&h); + return wxRect2DDouble( x,y,w,h ); } -bool wxGraphicsPath::Contains( const wxPoint2DDouble& c, int fillStyle ) const +bool wxGraphicsPath::Contains( const wxPoint2DDouble& c, wxPolygonFillMode fillStyle ) const { return Contains( c.m_x, c.m_y, fillStyle); } @@ -273,7 +271,7 @@ void wxGraphicsPath::MoveToPoint( wxDouble x, wxDouble y ) GetPathData()->MoveToPoint(x,y); } -// adds a straight line from the current point to (x,y) +// adds a straight line from the current point to (x,y) void wxGraphicsPath::AddLineToPoint( wxDouble x, wxDouble y ) { AllocExclusive(); @@ -315,7 +313,7 @@ void wxGraphicsPath::AddArc( wxDouble x, wxDouble y, wxDouble r, wxDouble startA } // -// These are convenience functions which - if not available natively will be assembled +// These are convenience functions which - if not available natively will be assembled // using the primitives from above // @@ -326,7 +324,7 @@ void wxGraphicsPath::AddQuadCurveToPoint( wxDouble cx, wxDouble cy, wxDouble x, GetPathData()->AddQuadCurveToPoint(cx,cy,x,y); } -// appends a rectangle as a new closed subpath +// appends a rectangle as a new closed subpath void wxGraphicsPath::AddRectangle( wxDouble x, wxDouble y, wxDouble w, wxDouble h ) { AllocExclusive(); @@ -341,7 +339,7 @@ void wxGraphicsPath::AddCircle( wxDouble x, wxDouble y, wxDouble r ) } // appends a an arc to two tangents connecting (current) to (x1,y1) and (x1,y1) to (x2,y2), also a straight line from (current) to (x1,y1) -void wxGraphicsPath::AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2, wxDouble y2, wxDouble r ) +void wxGraphicsPath::AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2, wxDouble y2, wxDouble r ) { GetPathData()->AddArcToPoint(x1,y1,x2,y2,r); } @@ -385,7 +383,7 @@ void wxGraphicsPath::GetBox(wxDouble *x, wxDouble *y, wxDouble *w, wxDouble *h) GetPathData()->GetBox(x,y,w,h); } -bool wxGraphicsPath::Contains( wxDouble x, wxDouble y, int fillStyle ) const +bool wxGraphicsPath::Contains( wxDouble x, wxDouble y, wxPolygonFillMode fillStyle ) const { return GetPathData()->Contains(x,y,fillStyle); } @@ -427,6 +425,9 @@ void wxGraphicsPathData::AddCircle( wxDouble x, wxDouble y, wxDouble r ) void wxGraphicsPathData::AddEllipse( wxDouble x, wxDouble y, wxDouble w, wxDouble h) { + if (w <= 0. || h <= 0.) + return; + wxDouble rw = w/2; wxDouble rh = h/2; wxDouble xc = x + rw; @@ -457,7 +458,7 @@ void wxGraphicsPathData::AddRoundedRectangle( wxDouble x, wxDouble y, wxDouble w // draws a an arc to two tangents connecting (current) to (x1,y1) and (x1,y1) to (x2,y2), also a straight line from (current) to (x1,y1) void wxGraphicsPathData::AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2, wxDouble y2, wxDouble r ) -{ +{ wxPoint2DDouble current; GetCurrentPoint(¤t.m_x,¤t.m_y); wxPoint2DDouble p1(x1,y1); @@ -500,17 +501,62 @@ void wxGraphicsPathData::AddArcToPoint( wxDouble x1, wxDouble y1 , wxDouble x2, IMPLEMENT_ABSTRACT_CLASS(wxGraphicsContext, wxObject) -wxGraphicsContext::wxGraphicsContext(wxGraphicsRenderer* renderer) : wxGraphicsObject(renderer) +wxGraphicsContext::wxGraphicsContext(wxGraphicsRenderer* renderer) : wxGraphicsObject(renderer) { m_logicalFunction = wxCOPY; } -wxGraphicsContext::~wxGraphicsContext() +wxGraphicsContext::~wxGraphicsContext() +{ +} + +bool wxGraphicsContext::StartDoc(const wxString& WXUNUSED(message)) +{ + return true; +} + +void wxGraphicsContext::EndDoc() { } +void wxGraphicsContext::StartPage(wxDouble WXUNUSED(width), + wxDouble WXUNUSED(height)) +{ +} + +void wxGraphicsContext::EndPage() +{ +} + +void wxGraphicsContext::Flush() +{ +} + +#if 0 +void wxGraphicsContext::SetAlpha( wxDouble WXUNUSED(alpha) ) +{ +} + +wxDouble wxGraphicsContext::GetAlpha() const +{ + return 1.0; +} +#endif + +void wxGraphicsContext::GetSize( wxDouble* width, wxDouble* height) +{ + *width = 10000.0; + *height = 10000.0; +} + +void wxGraphicsContext::GetDPI( wxDouble* dpiX, wxDouble* dpiY) +{ + *dpiX = 72.0; + *dpiY = 72.0; +} + // sets the pen -void wxGraphicsContext::SetPen( const wxGraphicsPen& pen ) +void wxGraphicsContext::SetPen( const wxGraphicsPen& pen ) { m_pen = pen; } @@ -522,9 +568,9 @@ void wxGraphicsContext::SetPen( const wxPen& pen ) else SetPen( CreatePen( pen ) ); } - + // sets the brush for filling -void wxGraphicsContext::SetBrush( const wxGraphicsBrush& brush ) +void wxGraphicsContext::SetBrush( const wxGraphicsBrush& brush ) { m_brush = brush; } @@ -538,12 +584,12 @@ void wxGraphicsContext::SetBrush( const wxBrush& brush ) } // sets the brush for filling -void wxGraphicsContext::SetFont( const wxGraphicsFont& font ) +void wxGraphicsContext::SetFont( const wxGraphicsFont& font ) { m_font = font; } -bool wxGraphicsContext::SetLogicalFunction( int function ) +bool wxGraphicsContext::SetLogicalFunction( wxRasterOperationMode function ) { if ( function == wxCOPY ) { @@ -561,13 +607,17 @@ void wxGraphicsContext::SetFont( const wxFont& font, const wxColour& colour ) SetFont( wxNullGraphicsFont ); } -void wxGraphicsContext::DrawPath( const wxGraphicsPath& path, int fillStyle ) +void wxGraphicsContext::DrawPath( const wxGraphicsPath& path, wxPolygonFillMode fillStyle ) { FillPath( path , fillStyle ); StrokePath( path ); } -void wxGraphicsContext::DrawText( const wxString &str, wxDouble x, wxDouble y, wxDouble angle ) +void +wxGraphicsContext::DoDrawRotatedText(const wxString &str, + wxDouble x, + wxDouble y, + wxDouble angle) { Translate(x,y); Rotate( -angle ); @@ -576,15 +626,22 @@ void wxGraphicsContext::DrawText( const wxString &str, wxDouble x, wxDouble y, w Translate(-x,-y); } -void wxGraphicsContext::DrawText( const wxString &str, wxDouble x, wxDouble y, const wxGraphicsBrush& backgroundBrush ) +void +wxGraphicsContext::DoDrawFilledText(const wxString &str, + wxDouble x, + wxDouble y, + const wxGraphicsBrush& backgroundBrush) { wxGraphicsBrush formerBrush = m_brush; + wxGraphicsPen formerPen = m_pen; wxDouble width; wxDouble height; wxDouble descent; wxDouble externalLeading; GetTextExtent( str , &width, &height, &descent, &externalLeading ); SetBrush( backgroundBrush ); + // to make sure our 'OffsetToPixelBoundaries' doesn't move the fill shape + SetPen( wxNullGraphicsPen ); wxGraphicsPath path = CreatePath(); path.AddRectangle( x , y, width, height ); @@ -592,11 +649,17 @@ void wxGraphicsContext::DrawText( const wxString &str, wxDouble x, wxDouble y, c DrawText( str, x ,y); SetBrush( formerBrush ); + SetPen( formerPen ); } -void wxGraphicsContext::DrawText( const wxString &str, wxDouble x, wxDouble y, wxDouble angle, const wxGraphicsBrush& backgroundBrush ) +void +wxGraphicsContext::DoDrawRotatedFilledText(const wxString &str, + wxDouble x, wxDouble y, + wxDouble angle, + const wxGraphicsBrush& backgroundBrush) { wxGraphicsBrush formerBrush = m_brush; + wxGraphicsPen formerPen = m_pen; wxDouble width; wxDouble height; @@ -604,6 +667,8 @@ void wxGraphicsContext::DrawText( const wxString &str, wxDouble x, wxDouble y, w wxDouble externalLeading; GetTextExtent( str , &width, &height, &descent, &externalLeading ); SetBrush( backgroundBrush ); + // to make sure our 'OffsetToPixelBoundaries' doesn't move the fill shape + SetPen( wxNullGraphicsPen ); wxGraphicsPath path = CreatePath(); path.MoveToPoint( x , y ); @@ -615,6 +680,7 @@ void wxGraphicsContext::DrawText( const wxString &str, wxDouble x, wxDouble y, w FillPath( path ); DrawText( str, x ,y, angle); SetBrush( formerBrush ); + SetPen( formerPen ); } void wxGraphicsContext::StrokeLine( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2) @@ -656,7 +722,7 @@ void wxGraphicsContext::StrokeLines( size_t n, const wxPoint2DDouble *points) StrokePath( path ); } -void wxGraphicsContext::DrawLines( size_t n, const wxPoint2DDouble *points, int fillStyle) +void wxGraphicsContext::DrawLines( size_t n, const wxPoint2DDouble *points, wxPolygonFillMode fillStyle) { wxASSERT(n > 1); wxGraphicsPath path = CreatePath(); @@ -679,7 +745,7 @@ void wxGraphicsContext::StrokeLines( size_t n, const wxPoint2DDouble *beginPoint } // create a 'native' matrix corresponding to these values -wxGraphicsMatrix wxGraphicsContext::CreateMatrix( wxDouble a, wxDouble b, wxDouble c, wxDouble d, +wxGraphicsMatrix wxGraphicsContext::CreateMatrix( wxDouble a, wxDouble b, wxDouble c, wxDouble d, wxDouble tx, wxDouble ty) const { return GetRenderer()->CreateMatrix(a,b,c,d,tx,ty); @@ -701,13 +767,13 @@ wxGraphicsBrush wxGraphicsContext::CreateBrush(const wxBrush& brush ) const } // sets the brush to a linear gradient, starting at (x1,y1) with color c1 to (x2,y2) with color c2 -wxGraphicsBrush wxGraphicsContext::CreateLinearGradientBrush( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2, +wxGraphicsBrush wxGraphicsContext::CreateLinearGradientBrush( wxDouble x1, wxDouble y1, wxDouble x2, wxDouble y2, const wxColour&c1, const wxColour&c2) const { return GetRenderer()->CreateLinearGradientBrush(x1,y1,x2,y2,c1,c2); } -// sets the brush to a radial gradient originating at (xo,yc) with color oColor and ends on a circle around (xc,yc) +// sets the brush to a radial gradient originating at (xo,yc) with color oColor and ends on a circle around (xc,yc) // with radius r and color cColor wxGraphicsBrush wxGraphicsContext::CreateRadialGradientBrush( wxDouble xo, wxDouble yo, wxDouble xc, wxDouble yc, wxDouble radius, const wxColour &oColor, const wxColour &cColor) const @@ -721,12 +787,36 @@ wxGraphicsFont wxGraphicsContext::CreateFont( const wxFont &font , const wxColou return GetRenderer()->CreateFont(font,col); } -wxGraphicsContext* wxGraphicsContext::Create( const wxWindowDC& dc) +wxGraphicsBitmap wxGraphicsContext::CreateBitmap( const wxBitmap& bmp ) const +{ +#ifndef __WXGTK20__ + return GetRenderer()->CreateBitmap(bmp); +#else + return wxNullGraphicsBitmap; +#endif +} + +wxGraphicsBitmap wxGraphicsContext::CreateSubBitmap( const wxGraphicsBitmap &bmp, wxDouble x, wxDouble y, wxDouble w, wxDouble h ) const +{ +#ifndef __WXGTK20__ + return GetRenderer()->CreateSubBitmap(bmp,x,y,w,h); +#else + return wxNullGraphicsBitmap; +#endif +} + +/* static */ wxGraphicsContext* wxGraphicsContext::Create( const wxWindowDC& dc) +{ + return wxGraphicsRenderer::GetDefaultRenderer()->CreateContext(dc); +} + +/* static */ wxGraphicsContext* wxGraphicsContext::Create( const wxMemoryDC& dc) { return wxGraphicsRenderer::GetDefaultRenderer()->CreateContext(dc); } -#ifdef __WXMSW__ -wxGraphicsContext* wxGraphicsContext::Create( const wxMemoryDC& dc) + +#if wxUSE_PRINTING_ARCHITECTURE +/* static */ wxGraphicsContext* wxGraphicsContext::Create( const wxPrinterDC& dc) { return wxGraphicsRenderer::GetDefaultRenderer()->CreateContext(dc); }