From 7d771689365495efa622b0050a0914cd70aebd3d Mon Sep 17 00:00:00 2001
From: Artur Wieczorek <artwik@wp.pl>
Date: Tue, 7 Jul 2015 21:51:30 +0200
Subject: [PATCH] Refactor: Use dedicated methods to manipulate wxRect members.

---
 src/propgrid/editors.cpp  | 5 ++---
 src/propgrid/property.cpp | 3 +--
 src/propgrid/propgrid.cpp | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/propgrid/editors.cpp b/src/propgrid/editors.cpp
index 6dac6d5290..36293e2f09 100644
--- a/src/propgrid/editors.cpp
+++ b/src/propgrid/editors.cpp
@@ -861,7 +861,7 @@ void wxPropertyGrid::OnComboItemPaint( const wxPGComboBox* pCb,
         if ( useCustomPaintProcedure )
         {
             pt.x += wxCC_CUSTOM_IMAGE_MARGIN1;
-            wxRect r(pt.x,pt.y,cis.x,cis.y);
+            wxRect r(pt, cis);
 
             if ( flags & wxODCB_PAINTING_CONTROL )
             {
@@ -1883,8 +1883,7 @@ void wxPropertyGrid::FixPosForTextCtrl( wxWindow* ctrl,
     finalPos.x += textCtrlXAdjust;
     finalPos.width -= textCtrlXAdjust;
 
-    finalPos.x += offset.x;
-    finalPos.y += offset.y;
+    finalPos.Offset(offset);
 
     ctrl->SetSize(finalPos);
 }
diff --git a/src/propgrid/property.cpp b/src/propgrid/property.cpp
index 58e5eef0ce..166eb307ff 100644
--- a/src/propgrid/property.cpp
+++ b/src/propgrid/property.cpp
@@ -111,8 +111,7 @@ void wxPGCellRenderer::DrawEditorValue( wxDC& dc, const wxRect& rect,
     if ( editor )
     {
         wxRect rect2(rect);
-        rect2.x += xOffset;
-        rect2.y += yOffset;
+        rect2.Offset(xOffset, yOffset);
         rect2.height -= yOffset;
         editor->DrawValue( dc, rect2, property, text );
     }
diff --git a/src/propgrid/propgrid.cpp b/src/propgrid/propgrid.cpp
index 5ba5f9ab90..b85a041800 100644
--- a/src/propgrid/propgrid.cpp
+++ b/src/propgrid/propgrid.cpp
@@ -1929,7 +1929,7 @@ void wxPropertyGrid::DrawExpanderButton( wxDC& dc, const wxRect& rect,
 {
     // Prepare rectangle to be used
     wxRect r(rect);
-    r.x += m_gutterWidth; r.y += m_buttonSpacingY;
+    r.Offset(m_gutterWidth, m_buttonSpacingY);
     r.width = m_iconWidth; r.height = m_iconHeight;
 
 #if (wxPG_USE_RENDERER_NATIVE)