From b20d6c6e18a153797c7cb21385f61dc2023e60f0 Mon Sep 17 00:00:00 2001 From: Blake Madden Date: Thu, 11 Mar 2021 05:39:48 -0500 Subject: [PATCH 1/4] Fix minor typos in STC docs. --- src/stc/scintilla/include/Scintilla.iface | 8 ++++---- src/stc/stc.interface.h.in | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/stc/scintilla/include/Scintilla.iface b/src/stc/scintilla/include/Scintilla.iface index 035d80235f..d5be8c58c0 100644 --- a/src/stc/scintilla/include/Scintilla.iface +++ b/src/stc/scintilla/include/Scintilla.iface @@ -263,7 +263,7 @@ val SC_IME_INLINE=1 # Is the IME displayed in a window or inline? get int GetIMEInteraction=2678(,) -# Choose to display the the IME in a winow or inline. +# Choose to display the IME in a winow or inline. set void SetIMEInteraction=2679(int imeInteraction,) enu MarkerSymbol=SC_MARK_ @@ -736,7 +736,7 @@ set void SetCaretLineBack=2098(colour back,) # Experimental feature, currently buggy. set void StyleSetChangeable=2099(int style, bool changeable) -# Display a auto-completion list. +# Display an auto-completion list. # The lengthEntered parameter indicates how many characters before # the caret should be used to provide context. fun void AutoCShow=2100(int lengthEntered, string itemList) @@ -2150,10 +2150,10 @@ set void SetIndicatorValue=2502(int value,) # Get the current indicator value get int GetIndicatorValue=2503(,) -# Turn a indicator on over a range. +# Turn an indicator on over a range. fun void IndicatorFillRange=2504(position start, int lengthFill) -# Turn a indicator off over a range. +# Turn an indicator off over a range. fun void IndicatorClearRange=2505(position start, int lengthClear) # Are any indicators present at pos? diff --git a/src/stc/stc.interface.h.in b/src/stc/stc.interface.h.in index 3ce91d11e4..ad64414f52 100644 --- a/src/stc/stc.interface.h.in +++ b/src/stc/stc.interface.h.in @@ -1076,7 +1076,7 @@ public: @c wxEVT_STC_INDICATOR_CLICK - - Generated when a indicator has been clicked. + - Generated when an indicator has been clicked. - Valid event functions: @link wxStyledTextEvent::GetModifiers GetModifiers@endlink, @@ -1087,7 +1087,7 @@ public: @c wxEVT_STC_INDICATOR_RELEASE - - Generated when a click over a indicator has been released. + - Generated when a click over an indicator has been released. - Valid event functions: @link wxStyledTextEvent::GetModifiers GetModifiers@endlink, From 42d11b7b5a8cd3f28f21c28ddbb85baace9c2acf Mon Sep 17 00:00:00 2001 From: Blake Madden Date: Thu, 11 Mar 2021 05:49:16 -0500 Subject: [PATCH 2/4] Remove extra article, hyphenate. --- src/stc/stc.interface.h.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/stc/stc.interface.h.in b/src/stc/stc.interface.h.in index ad64414f52..1b1eb5fe8a 100644 --- a/src/stc/stc.interface.h.in +++ b/src/stc/stc.interface.h.in @@ -1065,7 +1065,7 @@ public: @c wxEVT_STC_HOTSPOT_RELEASE_CLICK - - Generated when a click over a hotspot has been released. + - Generated when a click-over hotspot has been released. - Valid event functions: @link wxStyledTextEvent::GetModifiers GetModifiers@endlink, @@ -1087,7 +1087,7 @@ public: @c wxEVT_STC_INDICATOR_RELEASE - - Generated when a click over an indicator has been released. + - Generated when a click-over indicator has been released. - Valid event functions: @link wxStyledTextEvent::GetModifiers GetModifiers@endlink, From 1b701bf3405b14a92b77af674af4ac4722f8582a Mon Sep 17 00:00:00 2001 From: Blake Madden Date: Sat, 13 Mar 2021 07:30:10 -0500 Subject: [PATCH 3/4] Fix my incorrect wording. --- src/stc/stc.interface.h.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/stc/stc.interface.h.in b/src/stc/stc.interface.h.in index 1b1eb5fe8a..22266e76ea 100644 --- a/src/stc/stc.interface.h.in +++ b/src/stc/stc.interface.h.in @@ -1087,7 +1087,7 @@ public: @c wxEVT_STC_INDICATOR_RELEASE - - Generated when a click-over indicator has been released. + - Generated when a click over an indicator has been released. - Valid event functions: @link wxStyledTextEvent::GetModifiers GetModifiers@endlink, From 5a623d3a4e755dfd0a34736c235493c382a786b2 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 13 Mar 2021 13:21:47 +0100 Subject: [PATCH 4/4] Regenerate STC files after the typo fixes Rerun src/stc/gen_iface.py. --- include/wx/stc/stc.h | 8 ++++---- interface/wx/stc/stc.h | 8 ++++---- src/stc/stc.cpp | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/wx/stc/stc.h b/include/wx/stc/stc.h index 4887511ead..df2a3f23bc 100644 --- a/include/wx/stc/stc.h +++ b/include/wx/stc/stc.h @@ -3056,7 +3056,7 @@ public: // Is the IME displayed in a window or inline? int GetIMEInteraction() const; - // Choose to display the the IME in a winow or inline. + // Choose to display the IME in a winow or inline. void SetIMEInteraction(int imeInteraction); // Set the symbol used for a particular marker number, @@ -3377,7 +3377,7 @@ public: // Experimental feature, currently buggy. void StyleSetChangeable(int style, bool changeable); - // Display a auto-completion list. + // Display an auto-completion list. // The lengthEntered parameter indicates how many characters before // the caret should be used to provide context. void AutoCompShow(int lengthEntered, const wxString& itemList); @@ -4584,10 +4584,10 @@ public: // Get the current indicator value int GetIndicatorValue() const; - // Turn a indicator on over a range. + // Turn an indicator on over a range. void IndicatorFillRange(int start, int lengthFill); - // Turn a indicator off over a range. + // Turn an indicator off over a range. void IndicatorClearRange(int start, int lengthClear); // Are any indicators present at pos? diff --git a/interface/wx/stc/stc.h b/interface/wx/stc/stc.h index a84ea593d2..3ba0111d6f 100644 --- a/interface/wx/stc/stc.h +++ b/interface/wx/stc/stc.h @@ -5517,12 +5517,12 @@ public: int GetIndicatorValue() const; /** - Turn a indicator on over a range. + Turn an indicator on over a range. */ void IndicatorFillRange(int start, int lengthFill); /** - Turn a indicator off over a range. + Turn an indicator off over a range. */ void IndicatorClearRange(int start, int lengthClear); @@ -8124,7 +8124,7 @@ public: @c wxEVT_STC_HOTSPOT_RELEASE_CLICK - - Generated when a click over a hotspot has been released. + - Generated when a click-over hotspot has been released. - Valid event functions: @link wxStyledTextEvent::GetModifiers GetModifiers@endlink, @@ -8146,7 +8146,7 @@ public: @c wxEVT_STC_INDICATOR_RELEASE - - Generated when a click over a indicator has been released. + - Generated when a click over an indicator has been released. - Valid event functions: @link wxStyledTextEvent::GetModifiers GetModifiers@endlink, diff --git a/src/stc/stc.cpp b/src/stc/stc.cpp index ae370dabea..752a69c70a 100644 --- a/src/stc/stc.cpp +++ b/src/stc/stc.cpp @@ -582,7 +582,7 @@ int wxStyledTextCtrl::GetIMEInteraction() const return SendMsg(SCI_GETIMEINTERACTION, 0, 0); } -// Choose to display the the IME in a winow or inline. +// Choose to display the IME in a winow or inline. void wxStyledTextCtrl::SetIMEInteraction(int imeInteraction) { SendMsg(SCI_SETIMEINTERACTION, imeInteraction, 0); @@ -1320,7 +1320,7 @@ void wxStyledTextCtrl::StyleSetChangeable(int style, bool changeable) SendMsg(SCI_STYLESETCHANGEABLE, style, changeable); } -// Display a auto-completion list. +// Display an auto-completion list. // The lengthEntered parameter indicates how many characters before // the caret should be used to provide context. void wxStyledTextCtrl::AutoCompShow(int lengthEntered, const wxString& itemList) @@ -3734,13 +3734,13 @@ int wxStyledTextCtrl::GetIndicatorValue() const return SendMsg(SCI_GETINDICATORVALUE, 0, 0); } -// Turn a indicator on over a range. +// Turn an indicator on over a range. void wxStyledTextCtrl::IndicatorFillRange(int start, int lengthFill) { SendMsg(SCI_INDICATORFILLRANGE, start, lengthFill); } -// Turn a indicator off over a range. +// Turn an indicator off over a range. void wxStyledTextCtrl::IndicatorClearRange(int start, int lengthClear) { SendMsg(SCI_INDICATORCLEARRANGE, start, lengthClear);