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 /include | |
| parent | f39e2e75170e9b1953eb7eb6ed48326e6af0c24e (diff) | |
| download | scintilla-mirror-9075832b2e345bb3ffe5d9b53ce3b899dc3a1efa.tar.gz | |
Backed out changeset: 89cda794d0dd as fixed changeset will be sent by author.
Diffstat (limited to 'include')
| -rw-r--r-- | include/Scintilla.h | 9 | ||||
| -rw-r--r-- | include/ScintillaWidget.h | 8 |
2 files changed, 3 insertions, 14 deletions
diff --git a/include/Scintilla.h b/include/Scintilla.h index 99bc6e7b1..c985cea77 100644 --- a/include/Scintilla.h +++ b/include/Scintilla.h @@ -1121,13 +1121,6 @@ struct Sci_RangeToFormat { #define RangeToFormat Sci_RangeToFormat -#ifndef __cplusplus -/* For the GTK+ platform, g-ir-scanner needs to have these typedefs. This - * is not required in C++ code and actually seems to break ScintillaEditPy */ -typedef struct Sci_NotifyHeader Sci_NotifyHeader; -typedef struct SCNotification SCNotification; -#endif - struct Sci_NotifyHeader { /* Compatible with Windows NMHDR. * hwndFrom is really an environment specific window handle or pointer @@ -1140,7 +1133,7 @@ struct Sci_NotifyHeader { #define NotifyHeader Sci_NotifyHeader struct SCNotification { - Sci_NotifyHeader nmhdr; + struct Sci_NotifyHeader nmhdr; Sci_Position position; /* SCN_STYLENEEDED, SCN_DOUBLECLICK, SCN_MODIFIED, SCN_MARGINCLICK, */ /* SCN_NEEDSHOWN, SCN_DWELLSTART, SCN_DWELLEND, SCN_CALLTIPCLICK, */ diff --git a/include/ScintillaWidget.h b/include/ScintillaWidget.h index 1721f65d9..f4ae18208 100644 --- a/include/ScintillaWidget.h +++ b/include/ScintillaWidget.h @@ -38,18 +38,14 @@ struct _ScintillaObject { struct _ScintillaClass { GtkContainerClass parent_class; - void (* command) (ScintillaObject *sci, int cmd, GtkWidget *window); - void (* notify) (ScintillaObject *sci, int id, SCNotification *scn); + void (* command) (ScintillaObject *ttt); + void (* notify) (ScintillaObject *ttt); }; GType scintilla_object_get_type (void); GtkWidget* scintilla_object_new (void); gintptr scintilla_object_send_message (ScintillaObject *sci, unsigned int iMessage, guintptr wParam, gintptr lParam); - -GType scnotification_get_type (void); -#define SCINTILLA_TYPE_NOTIFICATION (scnotification_get_type()) - #ifndef G_IR_SCANNING /* The legacy names confuse the g-ir-scanner program */ typedef struct _ScintillaClass ScintillaClass; |