/////////////////////////////////////////////////////////////////////////////
-// Name: src/common/graphcmn.cpp
+// Name: src/common/dcgraph.cpp
// Purpose: graphics context methods common to all platforms
// Author: Stefan Csomor
// Modified by:
return (deg * M_PI) / 180.0;
}
-static bool TranslateRasterOp(wxRasterOperationMode function, wxCompositionMode *op)
+static wxCompositionMode TranslateRasterOp(wxRasterOperationMode function)
{
switch ( function )
{
- case wxCOPY: // (default) src
- *op = wxCOMPOSITION_SOURCE; //
- break;
+ case wxCOPY: // src
+ // since we are supporting alpha, _OVER is closer to the intention than _SOURCE
+ // since the latter would overwrite even when alpha is not set to opaque
+ return wxCOMPOSITION_OVER;
+
case wxOR: // src OR dst
- *op = wxCOMPOSITION_ADD;
- break;
+ return wxCOMPOSITION_ADD;
+
case wxNO_OP: // dst
- *op = wxCOMPOSITION_DEST; // ignore the source
- break;
+ return wxCOMPOSITION_DEST; // ignore the source
+
case wxCLEAR: // 0
- *op = wxCOMPOSITION_CLEAR;// clear dst
- break;
+ return wxCOMPOSITION_CLEAR;// clear dst
+
case wxXOR: // src XOR dst
- *op = wxCOMPOSITION_XOR;
- break;
+ return wxCOMPOSITION_XOR;
case wxAND: // src AND dst
case wxAND_INVERT: // (NOT src) AND dst
case wxOR_REVERSE: // src OR (NOT dst)
case wxSET: // 1
case wxSRC_INVERT: // NOT src
- default:
- return false;
+ break;
}
- return true;
+
+ return wxCOMPOSITION_INVALID;
}
//-----------------------------------------------------------------------------
}
#endif
+#if defined(__WXMSW__) && wxUSE_ENH_METAFILE
+wxGCDC::wxGCDC(const wxEnhMetaFileDC& dc)
+ : wxDC(new wxGCDCImpl(this, dc))
+{
+}
+#endif
+
wxGCDC::wxGCDC() :
wxDC( new wxGCDCImpl( this ) )
{
{
}
-wxGraphicsContext* wxGCDC::GetGraphicsContext()
+wxGraphicsContext* wxGCDC::GetGraphicsContext() const
{
if (!m_pimpl) return NULL;
wxGCDCImpl *gc_impl = (wxGCDCImpl*) m_pimpl;
}
#endif
+#if defined(__WXMSW__) && wxUSE_ENH_METAFILE
+wxGCDCImpl::wxGCDCImpl(wxDC *owner, const wxEnhMetaFileDC& dc)
+ : wxDCImpl(owner)
+{
+ Init();
+ SetGraphicsContext(wxGraphicsContext::Create(dc));
+}
+#endif
+
void wxGCDCImpl::Init()
{
m_ok = false;
{
m_graphicContext->ResetClip();
// currently the clip eg of a window extends to the area between the scrollbars
- // so we must explicitely make sure it only covers the area we want it to draw
+ // so we must explicitly make sure it only covers the area we want it to draw
int width, height ;
GetOwner()->GetSize( &width , &height ) ;
m_graphicContext->Clip( DeviceToLogicalX(0) , DeviceToLogicalY(0) , DeviceToLogicalXRel(width), DeviceToLogicalYRel(height) );
m_logicalFunction = function;
- wxCompositionMode mode;
- m_logicalFunctionSupported = TranslateRasterOp( function, &mode);
+ wxCompositionMode mode = TranslateRasterOp( function );
+ m_logicalFunctionSupported = mode != wxCOMPOSITION_INVALID;
if (m_logicalFunctionSupported)
m_logicalFunctionSupported = m_graphicContext->SetCompositionMode(mode);
- if (mode == wxCOMPOSITION_XOR)
+ if ( function == wxXOR )
m_graphicContext->SetAntialiasMode(wxANTIALIAS_NONE);
else
m_graphicContext->SetAntialiasMode(wxANTIALIAS_DEFAULT);
wxGraphicsPath path = m_graphicContext->CreatePath();
wxPointList::compatibility_iterator node = points->GetFirst();
- if (node == wxPointList::compatibility_iterator())
+ if ( !node )
// empty list
return;
path.MoveToPoint( x1 , y1 );
path.AddLineToPoint( cx1 , cy1 );
-#if !wxUSE_STL
+#if !wxUSE_STD_CONTAINERS
while ((node = node->GetNext()) != NULL)
#else
while ((node = node->GetNext()))
-#endif // !wxUSE_STL
+#endif // !wxUSE_STD_CONTAINERS
{
p = node->GetData();
if ( logical_func == wxNO_OP )
return true;
- wxCompositionMode mode;
- if ( !TranslateRasterOp(logical_func, &mode) )
+ wxCompositionMode mode = TranslateRasterOp(logical_func);
+ if ( mode == wxCOMPOSITION_INVALID )
{
wxFAIL_MSG( wxT("Blitting is not supported with this logical operation.") );
return false;
{
wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::DoDrawRotatedText - invalid DC") );
- if ( str.length() == 0 )
+ if ( str.empty() )
return;
if ( !m_logicalFunctionSupported )
return;
void wxGCDCImpl::DoDrawText(const wxString& str, wxCoord x, wxCoord y)
{
+ // For compatibility with other ports (notably wxGTK) and because it's
+ // genuinely useful, we allow passing multiline strings to DrawText().
+ // However there is no native OSX function to draw them directly so we
+ // instead reuse the generic DrawLabel() method to render them. Of course,
+ // DrawLabel() itself will call back to us but with single line strings
+ // only so there won't be any infinite recursion here.
+ if ( str.find('\n') != wxString::npos )
+ {
+ GetOwner()->DrawLabel(str, wxRect(x, y, 0, 0));
+ return;
+ }
+
wxCHECK_RET( IsOk(), wxT("wxGCDC(cg)::DoDrawText - invalid DC") );
- if ( str.length() == 0 )
+ if ( str.empty() )
return;
if ( !m_logicalFunctionSupported )
m_graphicContext->SetBrush( m_backgroundBrush );
wxPen p = *wxTRANSPARENT_PEN;
m_graphicContext->SetPen( p );
+ wxCompositionMode formerMode = m_graphicContext->GetCompositionMode();
+ m_graphicContext->SetCompositionMode(wxCOMPOSITION_SOURCE);
DoDrawRectangle( 0, 0, 32000 , 32000 );
+ m_graphicContext->SetCompositionMode(formerMode);
m_graphicContext->SetPen( m_pen );
m_graphicContext->SetBrush( m_brush );
}
wxDCImpl::DoDrawCheckMark(x,y,width,height);
}
+#ifdef __WXMSW__
+wxRect wxGCDCImpl::MSWApplyGDIPlusTransform(const wxRect& r) const
+{
+ wxGraphicsContext* const gc = GetGraphicsContext();
+ wxCHECK_MSG( gc, r, wxT("Invalid wxGCDC") );
+
+ double x = 0,
+ y = 0;
+ gc->GetTransform().TransformPoint(&x, &y);
+
+ wxRect rect(r);
+ rect.Offset(x, y);
+
+ return rect;
+}
+#endif // __WXMSW__
+
#endif // wxUSE_GRAPHICS_CONTEXT
projects / wxWidgets.git / blobdiff