Branch: refs/heads/master Author: Colomban Wendling ban@herbesfolles.org Committer: Colomban Wendling ban@herbesfolles.org Date: Fri, 10 Apr 2015 14:08:08 UTC Commit: 9eee68b71d322e7bbc74d48d4719e0713825d474 https://github.com/geany/geany/commit/9eee68b71d322e7bbc74d48d4719e0713825d4...
Log Message: ----------- Fix exporting Scintilla symbols
Modified Paths: -------------- scintilla/gtk/ScintillaGTK.cxx scintilla/scintilla_changes.patch src/sciwrappers.c
Modified: scintilla/gtk/ScintillaGTK.cxx 2 lines changed, 2 insertions(+), 0 deletions(-) =================================================================== @@ -3104,6 +3104,7 @@ sptr_t ScintillaGTK::DirectFunction( return reinterpret_cast<ScintillaGTK *>(ptr)->WndProc(iMessage, wParam, lParam); }
+GEANY_API_SYMBOL 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); @@ -3252,6 +3253,7 @@ static void scintilla_init(ScintillaObject *sci) { } }
+GEANY_API_SYMBOL GtkWidget* scintilla_new() { GtkWidget *widget = GTK_WIDGET(g_object_new(scintilla_get_type(), NULL)); gtk_widget_set_direction(widget, GTK_TEXT_DIR_LTR);
Modified: scintilla/scintilla_changes.patch 20 lines changed, 20 insertions(+), 0 deletions(-) =================================================================== @@ -1,5 +1,25 @@ 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 +--- scintilla/gtk/ScintillaGTK.cxx ++++ scintilla/gtk/ScintillaGTK.cxx +@@ -2959,6 +2959,7 @@ sptr_t ScintillaGTK::DirectFunction( + return reinterpret_cast<ScintillaGTK *>(ptr)->WndProc(iMessage, wParam, lParam); + } + ++GEANY_API_SYMBOL + 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) { + } + } + ++GEANY_API_SYMBOL + 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
Modified: src/sciwrappers.c 8 lines changed, 0 insertions(+), 8 deletions(-) =================================================================== @@ -45,14 +45,6 @@ #define SSM(s, m, w, l) scintilla_send_message(s, m, w, l)
-/* These functions need to be exported for the plugin API but to avoid - * modifying upstream sources, they are (re-)declared here with the - * needed export attribute. */ -GEANY_API_SYMBOL sptr_t scintilla_send_message(ScintillaObject *sci, - unsigned int iMessage, uptr_t wParam, sptr_t lParam); -GEANY_API_SYMBOL GtkWidget* scintilla_new(void); - - /* line numbers visibility */ void sci_set_line_numbers(ScintillaObject *sci, gboolean set) {
-------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).