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

Fix vertical positioning of text field in the combo box editor associated with wxPG property under wxMSW.

Browse Source 
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
This commit is contained in:
Artur Wieczorek
2014-09-13 20:45:37 +00:00
parent 1447a23c83
commit 8474dc6489
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/propgrid/editors.cpp
View File

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