diff options
| author | Neil <nyamatongwe@gmail.com> | 2016-05-17 21:58:45 +1000 |
|---|---|---|
| committer | Neil <nyamatongwe@gmail.com> | 2016-05-17 21:58:45 +1000 |
| commit | 9075832b2e345bb3ffe5d9b53ce3b899dc3a1efa (patch) | |
| tree | eea84fe9abb40c8fbacd4e722b2e8fb458288465 /gtk/ScintillaGTK.cxx | |
| parent | f39e2e75170e9b1953eb7eb6ed48326e6af0c24e (diff) | |
| download | scintilla-mirror-9075832b2e345bb3ffe5d9b53ce3b899dc3a1efa.tar.gz | |
Backed out changeset: 89cda794d0dd as fixed changeset will be sent by author.
Diffstat (limited to 'gtk/ScintillaGTK.cxx')
| -rw-r--r-- | gtk/ScintillaGTK.cxx | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx index 3caab96a4..9fc8e4cc4 100644 --- a/gtk/ScintillaGTK.cxx +++ b/gtk/ScintillaGTK.cxx @@ -72,6 +72,8 @@ #include "ExternalLexer.h" #endif +#include "scintilla-marshal.h" + #include "Converter.h" #if defined(__clang__) @@ -3160,6 +3162,9 @@ void ScintillaGTK::ClassInit(OBJECT_CLASS* object_class, GtkWidgetClass *widget_ container_class->forall = MainForAll; } +#define SIG_MARSHAL scintilla_marshal_NONE__INT_POINTER +#define MARSHAL_ARGUMENTS G_TYPE_INT, G_TYPE_POINTER + static void scintilla_class_init(ScintillaClass *klass) { try { OBJECT_CLASS *object_class = (OBJECT_CLASS*) klass; @@ -3174,9 +3179,9 @@ static void scintilla_class_init(ScintillaClass *klass) { G_STRUCT_OFFSET(ScintillaClass, command), NULL, //(GSignalAccumulator) NULL, //(gpointer) - NULL, + SIG_MARSHAL, G_TYPE_NONE, - 2, G_TYPE_INT, GTK_TYPE_WIDGET); + 2, MARSHAL_ARGUMENTS); scintilla_signals[NOTIFY_SIGNAL] = g_signal_new( SCINTILLA_NOTIFY, @@ -3185,9 +3190,9 @@ static void scintilla_class_init(ScintillaClass *klass) { G_STRUCT_OFFSET(ScintillaClass, notify), NULL, NULL, - NULL, + SIG_MARSHAL, G_TYPE_NONE, - 2, G_TYPE_INT, SCINTILLA_TYPE_NOTIFICATION); + 2, MARSHAL_ARGUMENTS); klass->command = NULL; klass->notify = NULL; @@ -3228,10 +3233,3 @@ void scintilla_release_resources(void) { } catch (...) { } } - -/* Define a dummy boxed type because g-ir-scanner is unable to - * recognize gpointer-derived types. Note that SCNotificaiton - * is always allocated on stack so copying is not appropriate. */ -static void *copy_(void *src) { return src; } -static void free_(void *doc) { } -G_DEFINE_BOXED_TYPE(SCNotification, scnotification, copy_, free_) |