Make EphyEmbedEvent abstract, implemented by MozillaEmbedEvent. Port

2004-01-15  Christian Persch  <chpe@cvs.gnome.org>

	* embed/ephy-embed-event.c: (ephy_embed_event_get_type),
	(ephy_embed_event_base_init), (ephy_embed_event_get_event_type),
	(ephy_embed_event_get_context), (ephy_embed_event_get_modifier),
	(ephy_embed_event_get_coords), (ephy_embed_event_get_property),
	(ephy_embed_event_has_property), (ephy_embed_event_get_dom_event):
	* embed/ephy-embed-event.h:
	* embed/mozilla/EventContext.cpp:
	* embed/mozilla/EventContext.h:
	* embed/mozilla/Makefile.am:
	* embed/mozilla/mozilla-embed-event.cpp:
	* embed/mozilla/mozilla-embed-event.h:
	* embed/mozilla/mozilla-embed.cpp:
	* src/ephy-window.c: (popup_menu_at_coords):
	* src/popup-commands.c: (popup_cmd_copy_link_address):

	Make EphyEmbedEvent abstract, implemented by MozillaEmbedEvent.
	Port callers to the new api.
	Fix some callers in src/ which were using private fields of
	EphyEmbedEvent struct.

1 files changed, 5 insertions, 9 deletions

diff --git a/embed/mozilla/EventContext.cpp b/embed/mozilla/EventContext.cpp
index ea209a3c7..3bfa2d97d 100644
--- a/embed/mozilla/EventContext.cpp
+++ b/embed/mozilla/EventContext.cpp
@@ -188,7 +188,7 @@ nsresult EventContext::ResolveDocumentURL (nsIDocument *doc, const nsAString &re
 }
 
 nsresult EventContext::GetEventContext (nsIDOMEventTarget *EventTarget,
-					EphyEmbedEvent *info)
+					MozillaEmbedEvent *info)
 {
 	nsresult rv;
 
@@ -635,7 +635,7 @@ nsresult EventContext::GetCSSBackground (nsIDOMNode *node, nsAutoString& url)
 	return NS_OK;
 }
 
-nsresult EventContext::GetMouseEventInfo (nsIDOMMouseEvent *aMouseEvent, EphyEmbedEvent *info)
+nsresult EventContext::GetMouseEventInfo (nsIDOMMouseEvent *aMouseEvent, MozillaEmbedEvent *info)
 {
 	nsresult result;
 
@@ -718,7 +718,7 @@ nsresult EventContext::GetMouseEventInfo (nsIDOMMouseEvent *aMouseEvent, EphyEmb
 	return NS_OK;
 }
 
-nsresult EventContext::GetKeyEventInfo (nsIDOMKeyEvent *aKeyEvent, EphyEmbedEvent *info)
+nsresult EventContext::GetKeyEventInfo (nsIDOMKeyEvent *aKeyEvent, MozillaEmbedEvent *info)
 {
 	nsresult rv;
 
@@ -838,9 +838,7 @@ nsresult EventContext::SetIntProperty (const char *name, int value)
 	
 	g_value_set_int (val, value);
 
-	ephy_embed_event_set_property (mEmbedEvent, 
-			     	       name,
-			     	       val);
+	mozilla_embed_event_set_property (mEmbedEvent, name, val);
 
 	return NS_OK;
 }
@@ -853,9 +851,7 @@ nsresult EventContext::SetStringProperty (const char *name, const char *value)
 	
 	g_value_set_string (val, value);
 			 
-	ephy_embed_event_set_property (mEmbedEvent, 
-			     	       name,
-			     	       val);
+	mozilla_embed_event_set_property (mEmbedEvent, name, val);
 
 	return NS_OK;
 }