Fix names of newly introduced wxSTC constants

In 68888ca0a2 there were introduced new wxSTC constants representing Scintilla SCTD_* parameters. Unfortunately, their names don't conform to naming convention of other constants and therefore should be changed. For the sake of consistency, Scintilla SCTD_* names should be mapped to wxSTC_TD_* ones.

Closes #17807.
This commit is contained in:
New Pagodi
2017-02-23 23:02:19 +01:00
committed by Artur Wieczorek
parent c6e4507c07
commit 98720ee7a4
4 changed files with 8 additions and 5 deletions

View File

@@ -69,8 +69,8 @@ class WXDLLIMPEXP_FWD_CORE wxScrollBar;
#define wxSTC_WS_VISIBLEALWAYS 1 #define wxSTC_WS_VISIBLEALWAYS 1
#define wxSTC_WS_VISIBLEAFTERINDENT 2 #define wxSTC_WS_VISIBLEAFTERINDENT 2
#define wxSTC_WS_VISIBLEONLYININDENT 3 #define wxSTC_WS_VISIBLEONLYININDENT 3
#define wxSTC_SCTD_LONGARROW 0 #define wxSTC_TD_LONGARROW 0
#define wxSTC_SCTD_STRIKEOUT 1 #define wxSTC_TD_STRIKEOUT 1
#define wxSTC_EOL_CRLF 0 #define wxSTC_EOL_CRLF 0
#define wxSTC_EOL_CR 1 #define wxSTC_EOL_CR 1
#define wxSTC_EOL_LF 2 #define wxSTC_EOL_LF 2

View File

@@ -25,8 +25,8 @@
#define wxSTC_WS_VISIBLEALWAYS 1 #define wxSTC_WS_VISIBLEALWAYS 1
#define wxSTC_WS_VISIBLEAFTERINDENT 2 #define wxSTC_WS_VISIBLEAFTERINDENT 2
#define wxSTC_WS_VISIBLEONLYININDENT 3 #define wxSTC_WS_VISIBLEONLYININDENT 3
#define wxSTC_SCTD_LONGARROW 0 #define wxSTC_TD_LONGARROW 0
#define wxSTC_SCTD_STRIKEOUT 1 #define wxSTC_TD_STRIKEOUT 1
#define wxSTC_EOL_CRLF 0 #define wxSTC_EOL_CRLF 0
#define wxSTC_EOL_CR 1 #define wxSTC_EOL_CR 1
#define wxSTC_EOL_LF 2 #define wxSTC_EOL_LF 2

View File

@@ -40,6 +40,7 @@ valPrefixes = [('SCI_', ''),
('SCK_', 'KEY_'), ('SCK_', 'KEY_'),
('SCFIND_', 'FIND_'), ('SCFIND_', 'FIND_'),
('SCWS_', 'WS_'), ('SCWS_', 'WS_'),
('SCTD_', 'TD_'),
] ]
# Message function values that should have a CMD_ constant generated # Message function values that should have a CMD_ constant generated

View File

@@ -42,7 +42,9 @@ Foreground and Background. If there is a new method that could be
considered a "command function" (something that takes no parameters considered a "command function" (something that takes no parameters
and could conceivably be bound to a key event) then I make sure that and could conceivably be bound to a key event) then I make sure that
it's ID is in cmdValues or included in one of the existing ranges in it's ID is in cmdValues or included in one of the existing ranges in
that list. that list. Also, for any enums that begin with 'SCXX_' instead of
'SC_', add an entry to valPrefixes to make sure the new names for
constants are generated consistently.
7. Run gen_iface.py. 7. Run gen_iface.py.