From d255bd6711955192f98bed8bf0b98872dab7fca6 Mon Sep 17 00:00:00 2001 From: mitchell <70453897+667e-11@users.noreply.github.com> Date: Fri, 7 Apr 2017 18:10:12 -0400 Subject: Effectively updated to Scintilla 3.7.4 with select backports to 3.7.3. Scintilla 3.7.4 requires a C++11 compiler, which I do not have. --- src/scintilla.patch | 49 ------------------------------------------------- 1 file changed, 49 deletions(-) (limited to 'src/scintilla.patch') diff --git a/src/scintilla.patch b/src/scintilla.patch index 1f75f400..ac950c56 100644 --- a/src/scintilla.patch +++ b/src/scintilla.patch @@ -191,52 +191,3 @@ diff -r bfdfb44eb777 src/Document.cxx +} + +#endif -diff -r e99b1a2bfbf8 src/Editor.cxx ---- a/src/Editor.cxx Thu Feb 16 08:37:09 2017 +1100 -+++ b/src/Editor.cxx Wed Feb 22 11:37:10 2017 -0500 -@@ -3111,6 +3111,9 @@ - } - - void Editor::CursorUpOrDown(int direction, Selection::selTypes selt) { -+ if ((selt == Selection::noSel) && sel.MoveExtends()) { -+ selt = Selection::selStream; -+ } - SelectionPosition caretToUse = sel.Range(sel.Main()).caret; - if (sel.IsRectangular()) { - if (selt == Selection::noSel) { -diff -r 8cb0c9214098 -r e2523f83af01 gtk/PlatGTK.cxx ---- a/gtk/PlatGTK.cxx Wed Jan 04 09:30:05 2017 +1100 -+++ b/gtk/PlatGTK.cxx Mon Jan 02 11:43:36 2017 +1100 -@@ -1401,7 +1401,7 @@ - #endif - } - --void ListBoxX::Create(Window &parent, int, Point, int, bool, int) { -+void ListBoxX::Create(Window &, int, Point, int, bool, int) { - if (widCached != 0) { - wid = widCached; - return; -@@ -1475,10 +1475,6 @@ - gtk_widget_show(widget); - g_signal_connect(G_OBJECT(widget), "button_press_event", - G_CALLBACK(ButtonPress), this); -- -- GtkWidget *top = gtk_widget_get_toplevel(static_cast(parent.GetID())); -- gtk_window_set_transient_for(GTK_WINDOW(static_cast(wid)), -- GTK_WINDOW(top)); - } - - void ListBoxX::SetFont(Font &scint_font) { -diff -r 8cb0c9214098 -r e2523f83af01 gtk/ScintillaGTK.cxx ---- a/gtk/ScintillaGTK.cxx Wed Jan 04 09:30:05 2017 +1100 -+++ b/gtk/ScintillaGTK.cxx Mon Jan 02 11:43:36 2017 +1100 -@@ -1301,9 +1301,6 @@ - G_CALLBACK(ScintillaGTK::PressCT), static_cast(this)); - gtk_widget_set_events(widcdrw, - GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK); -- GtkWidget *top = gtk_widget_get_toplevel(static_cast(wMain.GetID())); -- gtk_window_set_transient_for(GTK_WINDOW(static_cast(PWidget(ct.wCallTip))), -- GTK_WINDOW(top)); - } - gtk_widget_set_size_request(PWidget(ct.wDraw), rc.Width(), rc.Height()); - ct.wDraw.Show(); -- cgit v1.2.3