Branch: refs/heads/master Author: Matthew Brush matt@geany.org Committer: Matthew Brush matt@geany.org Date: Sat, 11 Apr 2015 20:35:11 UTC Commit: 87ee835ef22c6a8658eb479b29981e7379fa5c83 https://github.com/geany/geany/commit/87ee835ef22c6a8658eb479b29981e7379fa5c...
Log Message: ----------- 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.
Modified Paths: -------------- scintilla/gtk/ScintillaGTK.cxx scintilla/scintilla_changes.patch src/plugindata.h
Modified: scintilla/gtk/ScintillaGTK.cxx 1 lines changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -3116,6 +3116,7 @@ static void scintilla_init(ScintillaObject *sci); extern void Platform_Initialise(); extern void Platform_Finalise();
+GEANY_API_SYMBOL GType scintilla_get_type() { static GType scintilla_type = 0; try {
Modified: scintilla/scintilla_changes.patch 33 lines changed, 21 insertions(+), 12 deletions(-) =================================================================== @@ -1,10 +1,10 @@ -A patch to Scintilla 2.29 containing our changes to Scintilla -(removing unused lexers and an updated marshallers file). -diff --git a/scintilla/gtk/ScintillaGTK.cxx b/scintilla/gtk/ScintillaGTK.cxx -index 18e3358..5c405bc 100644 +A patch to Scintilla 3.54 containing our changes to Scintilla +(removing unused lexers, exporting symbols, and an updated marshallers file). +diff --git scintilla/gtk/ScintillaGTK.cxx scintilla/gtk/ScintillaGTK.cxx +index 0871ca2..49dc278 100644 --- scintilla/gtk/ScintillaGTK.cxx +++ scintilla/gtk/ScintillaGTK.cxx -@@ -2959,6 +2959,7 @@ sptr_t ScintillaGTK::DirectFunction( +@@ -3104,6 +3104,7 @@ sptr_t ScintillaGTK::DirectFunction( return reinterpret_cast<ScintillaGTK *>(ptr)->WndProc(iMessage, wParam, lParam); }
@@ -12,7 +12,15 @@ index 18e3358..5c405bc 100644 sptr_t scintilla_send_message(ScintillaObject *sci, unsigned int iMessage, uptr_t wParam, sptr_t lParam) { ScintillaGTK *psci = reinterpret_cast<ScintillaGTK *>(sci->pscin); return psci->WndProc(iMessage, wParam, lParam); -@@ -3107,6 +3108,7 @@ static void scintilla_init(ScintillaObject *sci) { +@@ -3115,6 +3116,7 @@ static void scintilla_init(ScintillaObject *sci); + extern void Platform_Initialise(); + extern void Platform_Finalise(); + ++GEANY_API_SYMBOL + GType scintilla_get_type() { + static GType scintilla_type = 0; + try { +@@ -3252,6 +3254,7 @@ static void scintilla_init(ScintillaObject *sci) { } }
@@ -20,9 +28,10 @@ index 18e3358..5c405bc 100644 GtkWidget* scintilla_new() { GtkWidget *widget = GTK_WIDGET(g_object_new(scintilla_get_type(), NULL)); gtk_widget_set_direction(widget, GTK_TEXT_DIR_LTR); -diff -Naur scintilla_orig/gtk/scintilla-marshal.c scintilla/gtk/scintilla-marshal.c ---- scintilla_orig/gtk/scintilla-marshal.c 2010-10-27 23:15:45.000000000 +0200 -+++ scintilla/gtk/scintilla-marshal.c 2011-04-03 17:42:59.000000000 +0200 +diff --git scintilla/gtk/scintilla-marshal.c scintilla/gtk/scintilla-marshal.c +index be57b7c..cee3e73 100644 +--- scintilla/gtk/scintilla-marshal.c ++++ scintilla/gtk/scintilla-marshal.c @@ -35,8 +35,8 @@ #define g_marshal_value_peek_ulong(v) (v)->data[0].v_ulong #define g_marshal_value_peek_int64(v) (v)->data[0].v_int64 @@ -47,11 +56,11 @@ diff -Naur scintilla_orig/gtk/scintilla-marshal.c scintilla/gtk/scintilla-marsha gpointer marshal_data) { typedef void (*GMarshalFunc_VOID__INT_POINTER) (gpointer data1, -diff --git b/scintilla/src/Catalogue.cxx a/scintilla/src/Catalogue.cxx -index 41d5d54..70ce3bc 100644 +diff --git scintilla/src/Catalogue.cxx scintilla/src/Catalogue.cxx +index b02a010..400d423 100644 --- scintilla/src/Catalogue.cxx +++ scintilla/src/Catalogue.cxx -@@ -76,120 +76,49 @@ int Scintilla_LinkLexers() { +@@ -76,120 +76,50 @@ int Scintilla_LinkLexers() {
//++Autogenerated -- run scripts/LexGen.py to regenerate //**(\tLINK_LEXER(*);\n)
Modified: src/plugindata.h 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -58,7 +58,7 @@ G_BEGIN_DECLS * @warning You should not test for values below 200 as previously * @c GEANY_API_VERSION was defined as an enum value, not a macro. */ -#define GEANY_API_VERSION 223 +#define GEANY_API_VERSION 224
/* hack to have a different ABI when built with GTK3 because loading GTK2-linked plugins * with GTK3-linked Geany leads to crash */
-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).