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

Don't use pointer for wxDC::m_clippingRegion in wxQt

Browse Source 
An object can be used directly instead.
This commit is contained in:
Jay Nabonne
2019-01-21 12:35:55 +00:00
committed by Vadim Zeitlin
parent a130a59111
commit 5b8b30d243
2 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/wx/qt/dc.h
View File

@@ -116,7 +116,7 @@ protected:
QPainter *m_qtPainter; QPainter *m_qtPainter;
QPixmap *m_qtPixmap; QPixmap *m_qtPixmap;
wxRegion *m_clippingRegion; wxRegion m_clippingRegion;
private: private:
enum wxQtRasterColourOp enum wxQtRasterColourOp
{ {

18
src/qt/dc.cpp
View File

@@ -48,7 +48,6 @@ wxIMPLEMENT_CLASS(wxQtDCImpl,wxDCImpl);
wxQtDCImpl::wxQtDCImpl( wxDC *owner ) wxQtDCImpl::wxQtDCImpl( wxDC *owner )
: wxDCImpl( owner ) : wxDCImpl( owner )
{ {
m_clippingRegion = new wxRegion;
m_qtPixmap = NULL; m_qtPixmap = NULL;
m_rasterColourOp = wxQtNONE; m_rasterColourOp = wxQtNONE;
m_qtPenColor = new QColor; m_qtPenColor = new QColor;
@@ -67,7 +66,6 @@ wxQtDCImpl::~wxQtDCImpl()
delete m_qtPainter; delete m_qtPainter;
} }
delete m_clippingRegion;
delete m_qtPenColor; delete m_qtPenColor;
delete m_qtBrushColor; delete m_qtBrushColor;
} }
@@ -87,7 +85,7 @@ void wxQtDCImpl::QtPreparePainter( )
if (m_clipping) if (m_clipping)
{ {
wxRegionIterator ri(*m_clippingRegion); wxRegionIterator ri(m_clippingRegion);
bool append = false; bool append = false;
while (ri.HaveRects()) while (ri.HaveRects())
{ {
@@ -438,11 +436,11 @@ void wxQtDCImpl::DoSetClippingRegion(wxCoord x, wxCoord y,
/* Note: Qt states that QPainter::clipRegion() may be slow, so we /* Note: Qt states that QPainter::clipRegion() may be slow, so we
* keep the region manually, which should be faster */ * keep the region manually, which should be faster */
if ( m_clipping ) if ( m_clipping )
m_clippingRegion->Union( wxRect( x, y, width, height ) ); m_clippingRegion.Union( wxRect( x, y, width, height ) );
else else
m_clippingRegion->Intersect( wxRect( x, y, width, height ) ); m_clippingRegion.Intersect( wxRect( x, y, width, height ) );
wxRect clipRect = m_clippingRegion->GetBox(); wxRect clipRect = m_clippingRegion.GetBox();
m_clipX1 = clipRect.GetLeft(); m_clipX1 = clipRect.GetLeft();
m_clipX2 = clipRect.GetRight() + 1; m_clipX2 = clipRect.GetRight() + 1;
@@ -476,11 +474,11 @@ void wxQtDCImpl::DoSetDeviceClippingRegion(const wxRegion& region)
/* Note: Qt states that QPainter::clipRegion() may be slow, so we /* Note: Qt states that QPainter::clipRegion() may be slow, so we
* keep the region manually, which should be faster */ * keep the region manually, which should be faster */
if ( m_clipping ) if ( m_clipping )
m_clippingRegion->Union( region ); m_clippingRegion.Union( region );
else else
m_clippingRegion->Intersect( region ); m_clippingRegion.Intersect( region );
wxRect clipRect = m_clippingRegion->GetBox(); wxRect clipRect = m_clippingRegion.GetBox();
m_clipX1 = clipRect.GetLeft(); m_clipX1 = clipRect.GetLeft();
m_clipX2 = clipRect.GetRight() + 1; m_clipX2 = clipRect.GetRight() + 1;
@@ -493,7 +491,7 @@ void wxQtDCImpl::DoSetDeviceClippingRegion(const wxRegion& region)
void wxQtDCImpl::DestroyClippingRegion() void wxQtDCImpl::DestroyClippingRegion()
{ {
wxDCImpl::DestroyClippingRegion(); wxDCImpl::DestroyClippingRegion();
m_clippingRegion->Clear(); m_clippingRegion.Clear();
if (m_qtPainter->isActive()) if (m_qtPainter->isActive())
m_qtPainter->setClipping( false ); m_qtPainter->setClipping( false );