Correct positioning of wxTextCtrl in wxPropertyGrid for wxMac
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56304 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -120,7 +120,7 @@
|
|||||||
#define wxPG_XBEFOREWIDGET 1
|
#define wxPG_XBEFOREWIDGET 1
|
||||||
|
|
||||||
// x position adjustment for wxTextCtrl (and like)
|
// x position adjustment for wxTextCtrl (and like)
|
||||||
#define wxPG_TEXTCTRLXADJUST 3
|
#define wxPG_TEXTCTRLXADJUST 0
|
||||||
|
|
||||||
// comment to use bitmap buttons
|
// comment to use bitmap buttons
|
||||||
#define wxPG_ICON_WIDTH 11
|
#define wxPG_ICON_WIDTH 11
|
||||||
|
|||||||
@@ -123,7 +123,7 @@
|
|||||||
#define wxPG_NAT_BUTTON_BORDER_X 0
|
#define wxPG_NAT_BUTTON_BORDER_X 0
|
||||||
#define wxPG_NAT_BUTTON_BORDER_Y 0
|
#define wxPG_NAT_BUTTON_BORDER_Y 0
|
||||||
|
|
||||||
#define wxPG_TEXTCTRLYADJUST 3
|
#define wxPG_TEXTCTRLYADJUST 0
|
||||||
|
|
||||||
#else
|
#else
|
||||||
// defaults
|
// defaults
|
||||||
@@ -1652,7 +1652,7 @@ wxWindow* wxPropertyGrid::GenerateEditorTextCtrl( const wxPoint& pos,
|
|||||||
|
|
||||||
// Need to reduce width of text control on Mac
|
// Need to reduce width of text control on Mac
|
||||||
#if defined(__WXMAC__)
|
#if defined(__WXMAC__)
|
||||||
s.x -= 8;
|
s.x -= 8;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Take button into acccount
|
// Take button into acccount
|
||||||
@@ -1680,7 +1680,7 @@ wxWindow* wxPropertyGrid::GenerateEditorTextCtrl( const wxPoint& pos,
|
|||||||
#endif
|
#endif
|
||||||
SetupTextCtrlValue(value);
|
SetupTextCtrlValue(value);
|
||||||
tc->Create(ctrlParent,id,value, p, s,tcFlags);
|
tc->Create(ctrlParent,id,value, p, s,tcFlags);
|
||||||
|
|
||||||
wxWindow* ed = tc;
|
wxWindow* ed = tc;
|
||||||
|
|
||||||
// Center the control vertically
|
// Center the control vertically
|
||||||
|
|||||||
Reference in New Issue
Block a user