diff options
Diffstat (limited to 'gtk/ScintillaGTK.cxx')
| -rw-r--r-- | gtk/ScintillaGTK.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gtk/ScintillaGTK.cxx b/gtk/ScintillaGTK.cxx index a75586140..22ecf347b 100644 --- a/gtk/ScintillaGTK.cxx +++ b/gtk/ScintillaGTK.cxx @@ -45,6 +45,9 @@ #include "gtk/gtksignal.h" #include "gtk/gtkmarshal.h" +#if GTK_MAJOR_VERSION >= 2 +#include "scintilla-marshal.h" +#endif #ifdef SCI_LEXER #include <glib.h> @@ -2307,11 +2310,10 @@ void ScintillaGTK::ClassInit(GtkObjectClass* object_class, GtkWidgetClass *widge #if GTK_MAJOR_VERSION < 2 #define GTK_CLASS_TYPE(c) (c->type) #define SIG_MARSHAL gtk_marshal_NONE__INT_POINTER -#define MARSHAL_ARGUMENTS GTK_TYPE_INT, GTK_TYPE_POINTER #else -#define SIG_MARSHAL gtk_marshal_NONE__INT_INT -#define MARSHAL_ARGUMENTS GTK_TYPE_INT, GTK_TYPE_INT +#define SIG_MARSHAL scintilla_marshal_NONE__INT_POINTER #endif +#define MARSHAL_ARGUMENTS GTK_TYPE_INT, GTK_TYPE_POINTER static void scintilla_class_init(ScintillaClass *klass) { GtkObjectClass *object_class = (GtkObjectClass*) klass; |