diff options
| author | John Mark Bell <jmb@netsurf-browser.org> | 2011-12-21 22:18:10 +0000 |
|---|---|---|
| committer | John Mark Bell <jmb@netsurf-browser.org> | 2011-12-21 22:18:10 +0000 |
| commit | 83f3338663c4969eebefd8c2c43bd3fc43587fdd (patch) | |
| tree | e48ba69628c5ba793533094e308c1fce9acb21aa /src/events/event.h | |
| parent | 4ade8ad1c7b23e6eeeee6681acbdb43fb10cab43 (diff) | |
| download | libdom-83f3338663c4969eebefd8c2c43bd3fc43587fdd.tar.gz libdom-83f3338663c4969eebefd8c2c43bd3fc43587fdd.tar.bz2 | |
Merge branches/jmb/dom-alloc-purge back to trunk
svn path=/trunk/libdom/; revision=13316
Diffstat (limited to 'src/events/event.h')
| -rw-r--r-- | src/events/event.h | 29 |
1 files changed, 12 insertions, 17 deletions
diff --git a/src/events/event.h b/src/events/event.h index 4d094e9..fa3d6b9 100644 --- a/src/events/event.h +++ b/src/events/event.h @@ -10,24 +10,22 @@ #include <inttypes.h> +#include <dom/core/document.h> #include <dom/events/event_target.h> #include <dom/events/event.h> #include "utils/list.h" -struct lwc_string_s; -struct dom_document; - /* The private virtual table */ struct dom_event_private_vtable { void (*destroy)(dom_event *evt); }; /** - * The Event Ojbect + * The Event Object */ struct dom_event { - struct lwc_string_s *type; /**< The type of the event */ + dom_string *type; /**< The type of the event */ dom_event_target *target; /**< The event target */ dom_event_target *current; /**< The current event target */ dom_event_flow_phase phase; /**< The event phase */ @@ -36,11 +34,10 @@ struct dom_event { unsigned int timestamp; /**< The timestamp this event is created */ - struct lwc_string_s *namespace; - /**< The namespace of this event */ + dom_string *namespace; /**< The namespace of this event */ - struct dom_document *doc; - /**< The document which create this event */ + dom_document *doc; + /**< The document which created this event */ bool stop; /**< Whether stopPropagation is called */ bool stop_now; /**< Whether stopImmediatePropagation is called */ @@ -57,25 +54,23 @@ struct dom_event { }; /* Constructor */ -dom_exception _dom_event_create(struct dom_document *doc, - struct dom_event **evt); +dom_exception _dom_event_create(dom_document *doc, dom_event **evt); /* Destructor */ -void _dom_event_destroy(struct dom_document *doc, struct dom_event *evt); +void _dom_event_destroy(dom_event *evt); /* Initialise function */ -dom_exception _dom_event_initialise(struct dom_document *doc, - struct dom_event *evt); +dom_exception _dom_event_initialise(dom_document *doc, dom_event *evt); /* Finalise function */ -void _dom_event_finalise(struct dom_document *doc, struct dom_event *evt); +void _dom_event_finalise(dom_event *evt); -static inline void dom_event_destroy(struct dom_event *evt) +static inline void dom_event_destroy(dom_event *evt) { evt->vtable->destroy(evt); } -#define dom_event_destroy(e) dom_event_destroy((struct dom_event *) (e)) +#define dom_event_destroy(e) dom_event_destroy((dom_event *) (e)) #endif |