From: Robert Roebling Date: Tue, 14 Oct 2008 12:32:01 +0000 (+0000) Subject: Correct positioning of wxTextCtrl in wxPropertyGrid for wxMac X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/012b4a0790f4ce2e668f44204d415ce379bdcd44 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 --- diff --git a/include/wx/propgrid/propgriddefs.h b/include/wx/propgrid/propgriddefs.h index cadb0ecd23..ca0c5340be 100644 --- a/include/wx/propgrid/propgriddefs.h +++ b/include/wx/propgrid/propgriddefs.h @@ -120,7 +120,7 @@ #define wxPG_XBEFOREWIDGET 1 // x position adjustment for wxTextCtrl (and like) - #define wxPG_TEXTCTRLXADJUST 3 + #define wxPG_TEXTCTRLXADJUST 0 // comment to use bitmap buttons #define wxPG_ICON_WIDTH 11 diff --git a/src/propgrid/editors.cpp b/src/propgrid/editors.cpp index 1fc06b5159..506aa71bc7 100644 --- a/src/propgrid/editors.cpp +++ b/src/propgrid/editors.cpp @@ -123,7 +123,7 @@ #define wxPG_NAT_BUTTON_BORDER_X 0 #define wxPG_NAT_BUTTON_BORDER_Y 0 - #define wxPG_TEXTCTRLYADJUST 3 + #define wxPG_TEXTCTRLYADJUST 0 #else // defaults @@ -1652,7 +1652,7 @@ wxWindow* wxPropertyGrid::GenerateEditorTextCtrl( const wxPoint& pos, // Need to reduce width of text control on Mac #if defined(__WXMAC__) - s.x -= 8; + s.x -= 8; #endif // Take button into acccount @@ -1680,7 +1680,7 @@ wxWindow* wxPropertyGrid::GenerateEditorTextCtrl( const wxPoint& pos, #endif SetupTextCtrlValue(value); tc->Create(ctrlParent,id,value, p, s,tcFlags); - + wxWindow* ed = tc; // Center the control vertically