Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move duplicated code to the shared function.

Browse Source 
Code to store initial Cairo transformation settings can be moved from wxCairoContext ctor bodies to the shared method wxCairoContext::Init.
This commit is contained in:
Artur Wieczorek
2016-04-17 18:17:35 +02:00
parent ca7670d2fc
commit fdc2189808
1 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/generic/graphicc.cpp
View File

@@ -1765,9 +1765,6 @@ wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, const wxPrinterDC&
m_width = sz.x; m_width = sz.x;
m_height = sz.y; m_height = sz.y;
// Store transformation settings of the underlying source context.
if ( m_context )
cairo_get_matrix(m_context, &m_internalTransform);
// Transfer transformation settings from source DC to Cairo context. // Transfer transformation settings from source DC to Cairo context.
ApplyTransformFromDC(dc); ApplyTransformFromDC(dc);
#endif #endif
@@ -1794,9 +1791,6 @@ wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, const wxWindowDC&
#ifdef __WXGTK3__ #ifdef __WXGTK3__
cairo_t* cr = static_cast<cairo_t*>(dc.GetImpl()->GetCairoContext()); cairo_t* cr = static_cast<cairo_t*>(dc.GetImpl()->GetCairoContext());
Init(cr ? cairo_reference(cr) : NULL); Init(cr ? cairo_reference(cr) : NULL);
// Store transformation settings of the underlying source context.
if ( m_context )
cairo_get_matrix(m_context, &m_internalTransform);
#elif defined __WXGTK20__ #elif defined __WXGTK20__
wxGTKDCImpl *impldc = (wxGTKDCImpl*) dc.GetImpl(); wxGTKDCImpl *impldc = (wxGTKDCImpl*) dc.GetImpl();
Init( gdk_cairo_create( impldc->GetGDKWindow() ) ); Init( gdk_cairo_create( impldc->GetGDKWindow() ) );
@@ -1958,9 +1952,6 @@ wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, const wxMemoryDC&
#ifdef __WXGTK3__ #ifdef __WXGTK3__
cairo_t* cr = static_cast<cairo_t*>(dc.GetImpl()->GetCairoContext()); cairo_t* cr = static_cast<cairo_t*>(dc.GetImpl()->GetCairoContext());
Init(cr ? cairo_reference(cr) : NULL); Init(cr ? cairo_reference(cr) : NULL);
// Store transformation settings of the underlying source context.
if ( m_context )
cairo_get_matrix(m_context, &m_internalTransform);
#elif defined __WXGTK20__ #elif defined __WXGTK20__
wxGTKDCImpl *impldc = (wxGTKDCImpl*) dc.GetImpl(); wxGTKDCImpl *impldc = (wxGTKDCImpl*) dc.GetImpl();
Init( gdk_cairo_create( impldc->GetGDKWindow() ) ); Init( gdk_cairo_create( impldc->GetGDKWindow() ) );
@@ -2092,9 +2083,6 @@ wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, cairo_t *context )
Init( cairo_reference(context) ); Init( cairo_reference(context) );
m_width = 0; m_width = 0;
m_height = 0; m_height = 0;
// Store transformation settings of the underlying source context.
if ( m_context )
cairo_get_matrix(m_context, &m_internalTransform);
} }
wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, wxWindow *window) wxCairoContext::wxCairoContext( wxGraphicsRenderer* renderer, wxWindow *window)
@@ -2186,12 +2174,19 @@ wxCairoContext::~wxCairoContext()
void wxCairoContext::Init(cairo_t *context) void wxCairoContext::Init(cairo_t *context)
{ {
m_context = context; m_context = context;
cairo_matrix_init_identity(&m_internalTransform);
if ( m_context ) if ( m_context )
{ {
// Store initial transformation settings
// of the underlying source context.
cairo_get_matrix(m_context, &m_internalTransform);
PushState(); PushState();
PushState(); PushState();
} }
else
{
cairo_matrix_init_identity(&m_internalTransform);
}
} }
void wxCairoContext::ApplyTransformFromDC(const wxDC& dc, ApplyTransformMode mode) void wxCairoContext::ApplyTransformFromDC(const wxDC& dc, ApplyTransformMode mode)