[geany/geany] 85f16e: Merge pull request #874 from kugel-/sci-api-export

[Colomban Wendling]

Branch:      refs/heads/master
Author:      Colomban Wendling <ban at herbesfolles.org>
Committer:   Colomban Wendling <ban at herbesfolles.org>
Date:        Mon, 25 Jan 2016 22:09:17 UTC
Commit:      85f16ebf7878374a414262b026b3aeab2057b099
             https://github.com/geany/geany/commit/85f16ebf7878374a414262b026b3aeab2057b099

Log Message:
-----------
Merge pull request #874 from kugel-/sci-api-export

scintilla: add scintilla_object_* to the plugin api


Modified Paths:
--------------
    scintilla/gtk/ScintillaGTK.cxx
    scintilla/scintilla_changes.patch

Modified: scintilla/gtk/ScintillaGTK.cxx
3 lines changed, 3 insertions(+), 0 deletions(-)
===================================================================
@@ -3052,6 +3052,7 @@ sptr_t scintilla_send_message(ScintillaObject *sci, unsigned int iMessage, uptr_
 	return psci->WndProc(iMessage, wParam, lParam);
 }
 
+GEANY_API_SYMBOL
 sptr_t scintilla_object_send_message(ScintillaObject *sci, unsigned int iMessage, uptr_t wParam, sptr_t lParam) {
 	return scintilla_send_message(sci, iMessage, wParam, lParam);
 }
@@ -3093,6 +3094,7 @@ GType scintilla_get_type() {
 	return scintilla_type;
 }
 
+GEANY_API_SYMBOL
 GType scintilla_object_get_type() {
 	return scintilla_get_type();
 }
@@ -3210,6 +3212,7 @@ GtkWidget* scintilla_new() {
 	return widget;
 }
 
+GEANY_API_SYMBOL
 GtkWidget *scintilla_object_new() {
 	return scintilla_new();
 }


Modified: scintilla/scintilla_changes.patch
28 lines changed, 25 insertions(+), 3 deletions(-)
===================================================================
@@ -4,7 +4,7 @@ diff --git scintilla/gtk/ScintillaGTK.cxx scintilla/gtk/ScintillaGTK.cxx
 index 0871ca2..49dc278 100644
 --- scintilla/gtk/ScintillaGTK.cxx
 +++ scintilla/gtk/ScintillaGTK.cxx
-@@ -3046,6 +3046,7 @@ sptr_t ScintillaGTK::DirectFunction(
+@@ -3046,11 +3046,13 @@ sptr_t ScintillaGTK::DirectFunction(
  }
  
  /* legacy name for scintilla_object_send_message */
@@ -12,7 +12,13 @@ index 0871ca2..49dc278 100644
  sptr_t scintilla_send_message(ScintillaObject *sci, unsigned int iMessage, uptr_t wParam, sptr_t lParam) {
  	ScintillaGTK *psci = static_cast<ScintillaGTK *>(sci->pscin);
  	return psci->WndProc(iMessage, wParam, lParam);
-@@ -3062,6 +3062,7 @@ extern void Platform_Initialise();
+ }
+ 
++GEANY_API_SYMBOL
+ sptr_t scintilla_object_send_message(ScintillaObject *sci, unsigned int iMessage, uptr_t wParam, sptr_t lParam) {
+ 	return scintilla_send_message(sci, iMessage, wParam, lParam);
+ }
+@@ -3062,6 +3064,7 @@ extern void Platform_Initialise();
  extern void Platform_Finalise();
  
  /* legacy name for scintilla_object_get_type */
@@ -20,7 +26,15 @@ index 0871ca2..49dc278 100644
  GType scintilla_get_type() {
  	static GType scintilla_type = 0;
  	try {
-@@ -3200,6 +3200,7 @@ static void scintilla_init(ScintillaObject *sci) {
+@@ -3091,6 +3094,7 @@ GType scintilla_get_type() {
+ 	return scintilla_type;
+ }
+ 
++GEANY_API_SYMBOL
+ GType scintilla_object_get_type() {
+ 	return scintilla_get_type();
+ }
+@@ -3200,6 +3204,7 @@ static void scintilla_init(ScintillaObje
  }
  
  /* legacy name for scintilla_object_new */
@@ -28,6 +42,14 @@ index 0871ca2..49dc278 100644
  GtkWidget* scintilla_new() {
  	GtkWidget *widget = GTK_WIDGET(g_object_new(scintilla_get_type(), NULL));
  	gtk_widget_set_direction(widget, GTK_TEXT_DIR_LTR);
+@@ -3207,6 +3212,7 @@ GtkWidget* scintilla_new() {
+ 	return widget;
+ }
+ 
++GEANY_API_SYMBOL
+ GtkWidget *scintilla_object_new() {
+ 	return scintilla_new();
+ }
 diff --git scintilla/gtk/scintilla-marshal.c scintilla/gtk/scintilla-marshal.c
 index be57b7c..cee3e73 100644
 --- scintilla/gtk/scintilla-marshal.c



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).