43 Commits

Author SHA1 Message Date
Thomas Martitz
c6f1fadf0b plugin api: export scnotification_get_type
Updated scintilla_changes.patch accordingly
2016-06-22 16:18:35 +02:00
Colomban Wendling
64025cfcfc Update Scintilla to version 3.6.6 2016-05-26 19:21:38 +02:00
Colomban Wendling
cb8151b29b GTK: Avoid possible IdleWork() calls on destructed objects
The idle callback removal clause in the ScintillaGTK destructor got
broken in the last Scintilla update [1], leading to the callback not
being removed thus possibly running after the instance destruction.
Indeed, gdk_threads_add_idle() wraps g_idle_add() with a custom user
data, thus making the g_source_remove_by_user_data() call in the
destructor incorrect, as we give it our own user data, not GDK's
wrapper one.

Fix the callback removal not to use user data matching to avoid this.

Closes #1033.

[1] 4e5c321dda/

X-Scintilla-Bug-URL: https://sourceforge.net/p/scintilla/bugs/1827/
X-Scintilla-Commit-ID: d889200cd9de032e278745f48b9c3108ccfa5984
2016-05-12 15:02:15 +02:00
Neil Hodgson
bf3140004d Do not call deprecated functions on newer GTK+.
X-Scintilla-Bug-URL: https://sourceforge.net/p/scintilla/bugs/1825/
X-Scintilla-Commit-ID: 5e4f2e6c167ee30e2c2bfadd1b1579c3d8716c60
2016-05-02 15:19:26 +02:00
Colomban Wendling
28a99f8188 GTK: Properly ask wText what size it wants to please GTK 3.20
It's not really of any use as we do know any size would do as wText is
ours anyway, but GTK 3.20 doesn't like allocating without querying the
preferred size beforehand, so do it.

As wText has a size_request() of 100x100, this might change how we
allocate in case we used to underallocate it, but AFAIK we don't, and
it is the real minimum size expected.

X-Scintilla-Bug-URL: https://sourceforge.net/p/scintilla/bugs/1825/
X-Scintilla-Commit-ID: d06e3db3e26842cd136328df17eb6f864b3adc02
2016-05-02 15:19:26 +02:00
Colomban Wendling
1403d352b2 Update Scintilla to version 3.6.5 2016-04-29 01:12:20 +02:00
Colomban Wendling
24f91981c0 Update Scintilla to version 3.6.4 2016-03-13 15:50:36 +01:00
Thomas Martitz
a032ed506e scintilla: add scintilla_object_* to the plugin api
Analogous to their legacy counterparts. Also required for gir-bindings
generated via g-ir-scanner.
2016-01-19 17:05:30 +01:00
Colomban Wendling
99938dd821 Update Scintilla to version 3.6.3
Includes improvements for Lua 5.3 and Perl 5.22.
2016-01-18 04:22:26 +01:00
Colomban Wendling
8afbc7a0b6 Update Scintilla to version 3.6.2
Keep scrollbar disposal changes that were backported and are not part
of 3.6.2.
2015-11-16 19:07:59 +01:00
Jiří Techet
3d439b4cfc Backport Scintilla patch correctly disposing scrollbars
The unparent method should be called in dispose(), not in finalize().
This patch fixes that which removes some ugly warnings from OS X command
line.
2015-11-14 10:26:07 +01:00
Colomban Wendling
04ef30ea06 Update Scintilla to version 3.6.1 2015-09-20 18:39:15 +02:00
Colomban Wendling
9b98d55def Update Scintilla to 3.5.6 pre-release
Fixes broken auto-completion popup on Windows.
2015-05-24 18:44:37 +02:00
Colomban Wendling
10a04f71c3 Update Scintilla to version 3.5.5 2015-04-21 16:21:37 +02:00
Matthew Brush
87ee835ef2 Export scintilla_get_type() from libgeany
This is useful for plugins to be able to subclass the ScintillaObject
and use its full GObject features. The Overview plugin is one known
plugin that needs this.

Also update scintilla_changes.patch by running update-scintilla.sh
script with patch application commented-out and generating a reverse
diff using `git -R`, and manually remove `a/` and `b/` prefixes from
the resulting diff so it can be used with update-scintilla.sh script.
2015-04-11 13:35:11 -07:00
Colomban Wendling
9eee68b71d Fix exporting Scintilla symbols 2015-04-10 16:08:08 +02:00
Colomban Wendling
8ac86ce423 Update Scintilla to version 3.5.4 2015-03-08 14:30:34 +01:00
Jiří Techet
7fa8b3a695 Backport adaptive scrolling patch from scintilla 2015-03-04 12:40:45 +01:00
Colomban Wendling
3996ae9268 Update Scintilla to version 3.5.3
Closes [bugs:#1041].
2015-01-20 15:56:38 +01:00
Colomban Wendling
0a58f5012b Update Scintilla to version 3.5.2 2014-12-02 13:51:18 +01:00
Colomban Wendling
1e59b15c61 Update Scintilla to 3.5.1 pre-release 2014-09-26 00:23:29 +02:00
Colomban Wendling
328c22eaf6 Update Scintilla to version 3.5.0 2014-08-13 14:07:03 +02:00
Colomban Wendling
d77fe4c6b7 Update Scintilla to 3.5.0 pre-release 2014-08-10 02:17:32 +02:00
Colomban Wendling
98fa600a2f Update Scintilla to version 3.4.4 2014-07-04 03:06:17 +02:00
Colomban Wendling
df5edd0032 Scintilla: fix missing redraws on GTK < 3.9.2
Also, make the recent redraw fixes depend on the GTK version Scintilla
is running against, rather than built against.  This allows for the
same build to work with both GTK < 3.9.2 or >= 3.9.2.
2014-05-19 14:31:11 +02:00
Colomban Wendling
9bcdd64be9 Update Scintilla to 3.4.2 pre-release 2014-05-17 22:15:57 +02:00
Colomban Wendling
6c5a0dd717 Update Scintilla to version 3.4.1 2014-04-14 16:25:01 +02:00
Colomban Wendling
635b7c24a6 Update Scintilla to version 3.3.6 2013-10-16 15:36:57 +02:00
Colomban Wendling
b07d1a1ecc Update Scintilla to version 3.3.5 2013-09-18 15:15:05 +02:00
Colomban Wendling
f0f3a6cd99 Update Scintilla to version 3.3.4 2013-07-21 12:04:14 +02:00
Colomban Wendling
8498957cf1 Update Scintilla to version 3.3.3 2013-06-06 16:31:47 +02:00
Colomban Wendling
0dc9e4ec38 Import fix from upstream Scintilla to fix crash upon DnD with GTK3
This imports Scintilla commit e488315f2d30e1795f0899779bac948da41b4eef
from HG, "Bug: [#1481]. Incorrect event copying on GTK+ 3.x."
2013-05-25 17:48:49 +02:00
Colomban Wendling
6cff31488e Import fix from upstream Scintilla to fix crash on drag and drop
This imports Scintilla commit 06f36a3217229ec2c2a360e370ae1b07597ce7b6
from HG, "Fix crashes with SelectionText instances that did not have \0
terminators."
2013-05-25 17:45:07 +02:00
Colomban Wendling
f5588043b7 Update Scintilla to version 3.3.2 2013-05-22 03:23:57 +02:00
Colomban Wendling
e88c03d266 Update Scintilla to version 3.3.1 2013-04-27 18:29:44 +02:00
Colomban Wendling
4d16754267 Update Scintilla to version 3.2.3
Closes #2909124, #3094431 and #3233160.
2012-10-25 17:09:34 +02:00
Colomban Wendling
4dd0fe9175 Update Scintilla to version 3.2.0 2012-06-26 20:48:16 +02:00
Colomban Wendling
cbc5600a1a Update to Scintilla 2.29 2011-10-19 03:40:46 +02:00
Enrico Tröger
8e6ed9905c Reset cursors when Scintilla widget is realized (Backport from Scintilla HG, original patch by Matthew Brush).
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5693 ea778897-0a13-0410-b9d1-a72fbfd435f5
2011-04-04 18:06:09 +00:00
Enrico Tröger
938477a073 Fix X PRIMARY selection issue when Scintilla widget is unrealized/re-realized (Backport from Scintilla HG, original patch by Matthew Brush).
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5692 ea778897-0a13-0410-b9d1-a72fbfd435f5
2011-04-04 18:03:35 +00:00
Enrico Tröger
c0b726a298 Update Scintilla to version 2.25.
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@5682 ea778897-0a13-0410-b9d1-a72fbfd435f5
2011-04-03 16:16:52 +00:00
Nick Treleaven
f201500ed5 Backport Scintilla HG fix: Remove styling idle in destructor to
avoid crashing when idle called after ScintillaGTK instance
destroyed (fixes #3111058).



git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/branches/unstable@5460 ea778897-0a13-0410-b9d1-a72fbfd435f5
2010-12-03 13:28:13 +00:00
Enrico Tröger
2c7d37dde4 Update Scintilla to version 2.22.
Keep Scintilla's directory structure mostly and only remove unused lexers.

For now, this will break the build. The build systems have to be updated as well as scintilla_changes.patch.


git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/branches/unstable@5437 ea778897-0a13-0410-b9d1-a72fbfd435f5
2010-11-24 21:23:05 +00:00