From 8474dc6489c0c9607a8a5fae8a032ec4591b3cb7 Mon Sep 17 00:00:00 2001
From: Artur Wieczorek <artwik@wp.pl>
Date: Sat, 13 Sep 2014 20:45:37 +0000
Subject: [PATCH] Fix vertical positioning of text field in the combo box
 editor associated with wxPG property under wxMSW.

Vertical position of text field in wxOwnerDrawnComboBox control (instantiated at property selection) doesn't need any special adjustment.

Closes #16556.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@77687 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
---
 src/propgrid/editors.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/propgrid/editors.cpp b/src/propgrid/editors.cpp
index 93e863d212..b92ad8d638 100644
--- a/src/propgrid/editors.cpp
+++ b/src/propgrid/editors.cpp
@@ -700,14 +700,14 @@ public:
     virtual void PositionTextCtrl( int textCtrlXAdjust,
                                    int WXUNUSED(textCtrlYAdjust) ) wxOVERRIDE
     {
-        wxPropertyGrid* pg = GetGrid();
     #ifdef wxPG_TEXTCTRLXADJUST
         textCtrlXAdjust = wxPG_TEXTCTRLXADJUST -
                           (wxPG_XBEFOREWIDGET+wxPG_CONTROL_MARGIN+1) - 1,
     #endif
         wxOwnerDrawnComboBox::PositionTextCtrl(
             textCtrlXAdjust,
-            pg->GetSpacingY() + 2
+            0 // Under MSW vertical position is already properly adjusted.
+              // Note: This parameter is not used by other ports.
         );
     }