diff options
| author |   mitchell <70453897+667e-11@users.noreply.github.com> | 2018-02-19 12:10:04 -0500 |
|---|---|---|
| committer | mitchell <70453897+667e-11@users.noreply.github.com> | 2018-02-19 12:10:04 -0500 |
| commit | d29a22ebc96120ec90605decf3db5557a99dc75a (patch) | |
| tree | ccd3c719af14ad5bedbeea9862e18f5cd9501bba /src/scintilla_backports | |
| parent | 968530a9c69a6d2c061c7a0d37f0442795a669e8 (diff) | |
| download | textadept-d29a22ebc96120ec90605decf3db5557a99dc75a.tar.gz textadept-d29a22ebc96120ec90605decf3db5557a99dc75a.zip | |
More backport fixes to compile on build server.
Requires Scinterm r168 (changeset 46e218082338).
Diffstat (limited to 'src/scintilla_backports')
| -rw-r--r-- | src/scintilla_backports/6310_7e28cdba6d61.patch | 12 | ||||
| -rw-r--r-- | src/scintilla_backports/6425_73343682cbda.patch | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/scintilla_backports/6310_7e28cdba6d61.patch b/src/scintilla_backports/6310_7e28cdba6d61.patch index 42b0eccb..12b33339 100644 --- a/src/scintilla_backports/6310_7e28cdba6d61.patch +++ b/src/scintilla_backports/6310_7e28cdba6d61.patch @@ -313,7 +313,7 @@ diff -r f2f32d58bcd8 -r 7e28cdba6d61 gtk/PlatGTK.cxx - if (ev->type == GDK_2BUTTON_PRESS && lb->doubleClickAction != NULL) { - lb->doubleClickAction(lb->doubleClickActionData); + if (ev->type == GDK_2BUTTON_PRESS && lb->delegate) { -+ ListBoxEvent event(ListBoxEvent::EventType::doubleClick); ++ ListBoxEvent event(ListBoxEvent::doubleClick); + lb->delegate->ListNotify(&event); return TRUE; } @@ -326,7 +326,7 @@ diff -r f2f32d58bcd8 -r 7e28cdba6d61 gtk/PlatGTK.cxx + try { + ListBoxX* lb = static_cast<ListBoxX*>(p); + if (ev->type != GDK_2BUTTON_PRESS && lb->delegate) { -+ ListBoxEvent event(ListBoxEvent::EventType::selectionChange); ++ ListBoxEvent event(ListBoxEvent::selectionChange); + lb->delegate->ListNotify(&event); + return TRUE; + } @@ -354,7 +354,7 @@ diff -r f2f32d58bcd8 -r 7e28cdba6d61 gtk/PlatGTK.cxx } + + if (delegate) { -+ ListBoxEvent event(ListBoxEvent::EventType::selectionChange); ++ ListBoxEvent event(ListBoxEvent::selectionChange); + delegate->ListNotify(&event); + } } @@ -381,7 +381,7 @@ diff -r f2f32d58bcd8 -r 7e28cdba6d61 include/Platform.h +// ScintillaBase implements IListBoxDelegate to receive ListBoxEvents from a ListBox + +struct ListBoxEvent { -+ enum class EventType { selectionChange, doubleClick } event; ++ enum EventType { selectionChange, doubleClick } event; + ListBoxEvent(EventType event_) : event(event_) { + } +}; @@ -533,10 +533,10 @@ diff -r f2f32d58bcd8 -r 7e28cdba6d61 src/ScintillaBase.cxx - sci->AutoCompleteCompleted(0, SC_AC_DOUBLECLICK); +void ScintillaBase::ListNotify(ListBoxEvent *plbe) { + switch (plbe->event) { -+ case ListBoxEvent::EventType::selectionChange: ++ case ListBoxEvent::selectionChange: + AutoCompleteSelection(); + break; -+ case ListBoxEvent::EventType::doubleClick: ++ case ListBoxEvent::doubleClick: + AutoCompleteCompleted(0, SC_AC_DOUBLECLICK); + break; + } diff --git a/src/scintilla_backports/6425_73343682cbda.patch b/src/scintilla_backports/6425_73343682cbda.patch index 36445a10..0126d946 100644 --- a/src/scintilla_backports/6425_73343682cbda.patch +++ b/src/scintilla_backports/6425_73343682cbda.patch @@ -114,7 +114,7 @@ diff -r 5246ca55cf24 -r 73343682cbda src/EditModel.cxx highlightGuideColumn = 0; primarySelection = true; imeInteraction = imeWindowed; -+ bidirectional = Bidirectional::bidiDisabled; ++ bidirectional = bidiDisabled; foldFlags = 0; foldDisplayTextStyle = SC_FOLDDISPLAYTEXT_HIDDEN; hotspot = Range(Sci::invalidPosition); @@ -125,7 +125,7 @@ diff -r 5246ca55cf24 -r 73343682cbda src/EditModel.h enum IMEInteraction { imeWindowed, imeInline } imeInteraction; -+ enum class Bidirectional { bidiDisabled, bidiL2R, bidiR2L } bidirectional; ++ enum Bidirectional { bidiDisabled, bidiL2R, bidiR2L } bidirectional; + int foldFlags; int foldDisplayTextStyle; |