wxTextEntry::SetMargins(), GetMargins() - implemented on wxMSW and wxGTK (GTK+ 2.10+); also added similar functions into wxComboCtrl, deprecated old indent-functions; wxPropertyGrid modified to use the new functionality
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@61834 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -42,35 +42,50 @@
|
||||
|
||||
#if defined(__WXUNIVERSAL__)
|
||||
|
||||
#define TEXTCTRLXADJUST 0 // position adjustment for wxTextCtrl, with zero indent
|
||||
// position adjustment for wxTextCtrl, to achieve zero left margin
|
||||
// meaningless if LEFT_MARGIN_CAN_BE_SET set to 1 in combocmn.cpp
|
||||
#define TEXTCTRLXADJUST 0
|
||||
|
||||
#define TEXTCTRLYADJUST 0
|
||||
#define TEXTXADJUST 0 // how much is read-only text's x adjusted
|
||||
#define DEFAULT_DROPBUTTON_WIDTH 19
|
||||
|
||||
#elif defined(__WXMSW__)
|
||||
|
||||
#define TEXTCTRLXADJUST 2 // position adjustment for wxTextCtrl, with zero indent
|
||||
// position adjustment for wxTextCtrl, to achieve zero left margin
|
||||
// meaningless if LEFT_MARGIN_CAN_BE_SET set to 1 in combocmn.cpp
|
||||
#define TEXTCTRLXADJUST 2
|
||||
|
||||
#define TEXTCTRLYADJUST 3
|
||||
#define TEXTXADJUST 0 // how much is read-only text's x adjusted
|
||||
#define DEFAULT_DROPBUTTON_WIDTH 17
|
||||
|
||||
#elif defined(__WXGTK__)
|
||||
|
||||
#define TEXTCTRLXADJUST -1 // position adjustment for wxTextCtrl, with zero indent
|
||||
// position adjustment for wxTextCtrl, to achieve zero left margin
|
||||
// meaningless if LEFT_MARGIN_CAN_BE_SET set to 1 in combocmn.cpp
|
||||
#define TEXTCTRLXADJUST -1
|
||||
|
||||
#define TEXTCTRLYADJUST 0
|
||||
#define TEXTXADJUST 1 // how much is read-only text's x adjusted
|
||||
#define DEFAULT_DROPBUTTON_WIDTH 23
|
||||
|
||||
#elif defined(__WXMAC__)
|
||||
|
||||
#define TEXTCTRLXADJUST 0 // position adjustment for wxTextCtrl, with zero indent
|
||||
// position adjustment for wxTextCtrl, to achieve zero left margin
|
||||
// meaningless if LEFT_MARGIN_CAN_BE_SET set to 1 in combocmn.cpp
|
||||
#define TEXTCTRLXADJUST 0
|
||||
|
||||
#define TEXTCTRLYADJUST 0
|
||||
#define TEXTXADJUST 0 // how much is read-only text's x adjusted
|
||||
#define DEFAULT_DROPBUTTON_WIDTH 22
|
||||
|
||||
#else
|
||||
|
||||
#define TEXTCTRLXADJUST 0 // position adjustment for wxTextCtrl, with zero indent
|
||||
// position adjustment for wxTextCtrl, to achieve zero left margin
|
||||
// meaningless if LEFT_MARGIN_CAN_BE_SET set to 1 in combocmn.cpp
|
||||
#define TEXTCTRLXADJUST 0
|
||||
|
||||
#define TEXTCTRLYADJUST 0
|
||||
#define TEXTXADJUST 0 // how much is read-only text's x adjusted
|
||||
#define DEFAULT_DROPBUTTON_WIDTH 19
|
||||
|
||||
Reference in New Issue
Block a user