HybridDog/geany
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix exporting Scintilla symbols

Browse Source
This commit is contained in:
Colomban Wendling 2014-10-28 15:38:12 +01:00
parent 9644fb0ae2
commit 9eee68b71d
3 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scintilla/gtk/ScintillaGTK.cxx
View File

@ -3104,6 +3104,7 @@ sptr_t ScintillaGTK::DirectFunction(
return reinterpret_cast<ScintillaGTK *>(ptr)->WndProc(iMessage, wParam, lParam); 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) { sptr_t scintilla_send_message(ScintillaObject *sci, unsigned int iMessage, uptr_t wParam, sptr_t lParam) {
ScintillaGTK *psci = reinterpret_cast<ScintillaGTK *>(sci->pscin); ScintillaGTK *psci = reinterpret_cast<ScintillaGTK *>(sci->pscin);
return psci->WndProc(iMessage, wParam, lParam); return psci->WndProc(iMessage, wParam, lParam);
@ -3252,6 +3253,7 @@ static void scintilla_init(ScintillaObject *sci) {
} }
} }
GEANY_API_SYMBOL
GtkWidget* scintilla_new() { GtkWidget* scintilla_new() {
GtkWidget *widget = GTK_WIDGET(g_object_new(scintilla_get_type(), NULL)); GtkWidget *widget = GTK_WIDGET(g_object_new(scintilla_get_type(), NULL));
gtk_widget_set_direction(widget, GTK_TEXT_DIR_LTR); gtk_widget_set_direction(widget, GTK_TEXT_DIR_LTR);

20
scintilla/scintilla_changes.patch
View File

@ -1,5 +1,25 @@
A patch to Scintilla 2.29 containing our changes to Scintilla A patch to Scintilla 2.29 containing our changes to Scintilla
(removing unused lexers and an updated marshallers file). (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 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_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 +++ scintilla/gtk/scintilla-marshal.c 2011-04-03 17:42:59.000000000 +0200

8
src/sciwrappers.c
View File

@ -45,14 +45,6 @@
#define SSM(s, m, w, l) scintilla_send_message(s, m, w, l) #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 */ /* line numbers visibility */
void sci_set_line_numbers(ScintillaObject *sci, gboolean set) void sci_set_line_numbers(ScintillaObject *sci, gboolean set)
{ {