Bug 658714 Part 4: Get function signatures correct to make things build on windows. r=smaug
authorJonas Sicking <jonas@sicking.cc>
Thu, 23 Jun 2011 19:17:59 -0700
changeset 71889 e849fa1da72bfa724be26a744f5c33a192a5a1e4
parent 71888 b4dcdfebb73e94e4ee982cd30102e6b17b2b1488
child 71890 830993c92036edd8ce92c85bf1a40207af55ebda
push idunknown
push userunknown
push dateunknown
reviewerssmaug
bugs658714
milestone7.0a1
Bug 658714 Part 4: Get function signatures correct to make things build on windows. r=smaug
dom/interfaces/events/nsIDOMEventTarget.idl
--- a/dom/interfaces/events/nsIDOMEventTarget.idl
+++ b/dom/interfaces/events/nsIDOMEventTarget.idl
@@ -162,58 +162,61 @@ interface nsIDOMEventTarget : nsISupport
                                                raises(DOMException);
 
   /**
    * Returns the nsPIDOMEventTarget object which should be used as the target
    * of DOMEvents.
    * Usually |this| is returned, but for example global object returns
    * the outer object.
    */
-   [notxpcom] nsIDOMEventTarget GetTargetForDOMEvent();
+   [notxpcom, nostdcall] nsIDOMEventTarget GetTargetForDOMEvent();
 
   /**
    * Returns the nsPIDOMEventTarget object which should be used as the target
    * of the event and when constructing event target chain.
    * Usually |this| is returned, but for example global object returns
    * the inner object.
    */
-   [notxpcom] nsIDOMEventTarget GetTargetForEventTargetChain();
+   [notxpcom, nostdcall] nsIDOMEventTarget GetTargetForEventTargetChain();
 
   /**
    * Called before the capture phase of the event flow.
    * This is used to create the event target chain and implementations
    * should set the necessary members of nsEventChainPreVisitor.
    * At least aVisitor.mCanHandle must be set,
    * usually also aVisitor.mParentTarget if mCanHandle is PR_TRUE.
    * First one tells that this object can handle the aVisitor.mEvent event and
    * the latter one is the possible parent object for the event target chain.
    * @see nsEventDispatcher.h for more documentation about aVisitor.
    *
    * @param aVisitor the visitor object which is used to create the
    *                 event target chain for event dispatching.
    *
    * @note Only nsEventDispatcher should call this method.
    */
-  [noscript] void PreHandleEvent(in nsEventChainPreVisitorRef aVisitor);
+  [noscript, nostdcall]
+  void PreHandleEvent(in nsEventChainPreVisitorRef aVisitor);
 
   /**
    * If nsEventChainPreVisitor.mWantsWillHandleEvent is set PR_TRUE,
    * called just before possible event handlers on this object will be called.
    */
-  [noscript] void WillHandleEvent(in nsEventChainPostVisitorRef aVisitor);
+  [noscript, nostdcall]
+  void WillHandleEvent(in nsEventChainPostVisitorRef aVisitor);
 
   /**
    * Called after the bubble phase of the system event group.
    * The default handling of the event should happen here.
    * @param aVisitor the visitor object which is used during post handling.
    *
    * @see nsEventDispatcher.h for documentation about aVisitor.
    * @note Only nsEventDispatcher should call this method.
    */
-  [noscript] void PostHandleEvent(in nsEventChainPostVisitorRef aVisitor);
+  [noscript, nostdcall]
+  void PostHandleEvent(in nsEventChainPostVisitorRef aVisitor);
 
   /**
    * Dispatch an event.
    * @param aEvent the event that is being dispatched.
    * @param aDOMEvent the event that is being dispatched, use if you want to
    *                  dispatch nsIDOMEvent, not only nsEvent.
    * @param aPresContext the current presentation context, can be nsnull.
    * @param aEventStatus the status returned from the function, can be nsnull.
@@ -222,57 +225,62 @@ interface nsIDOMEventTarget : nsISupport
    *       event of the aDOMEvent.
    *
    * If aDOMEvent is not nsnull (in which case aEvent can be nsnull) it is used
    * for dispatching, otherwise aEvent is used.
    *
    * @deprecated This method is here just until all the callers outside Gecko
    *             have been converted to use nsIDOMEventTarget::dispatchEvent.
    */
-  [noscript] void DispatchDOMEvent(in nsEventPtr aEvent,
-                                   in nsIDOMEvent aDOMEvent,
-                                   in nsPresContextPtr aPresContext,
-                                   in nsEventStatusPtr aEventStatus);
+  [noscript, nostdcall]
+  void DispatchDOMEvent(in nsEventPtr aEvent,
+                        in nsIDOMEvent aDOMEvent,
+                        in nsPresContextPtr aPresContext,
+                        in nsEventStatusPtr aEventStatus);
 
   /**
    * Get the event listener manager, the guy you talk to to register for events
    * on this node.
    * @param aMayCreate If PR_FALSE, returns a listener manager only if
    *                   one already exists.
    */
-  [notxpcom] nsIEventListenerManager GetListenerManager(in boolean aMayCreate);
+  [notxpcom, nostdcall]
+  nsIEventListenerManager GetListenerManager(in boolean aMayCreate);
 
   /**
    * Add an event listener for nsIID.
    */
-  [noscript] void AddEventListenerByIID(in nsIDOMEventListener aListener,
-                                        in nsIIDRef aIID);
+  [noscript, nostdcall]
+  void AddEventListenerByIID(in nsIDOMEventListener aListener,
+                             in nsIIDRef aIID);
   /**
    * Remove event listener for nsIID.
    */
-  [noscript] void RemoveEventListenerByIID(in nsIDOMEventListener aListener,
-                                           in nsIIDRef aIID);
+  [noscript, nostdcall]
+  void RemoveEventListenerByIID(in nsIDOMEventListener aListener,
+                                in nsIIDRef aIID);
 
   /**
    * Get the system event group.
    */
-  [noscript] nsIDOMEventGroup GetSystemEventGroup();
+  [noscript, nostdcall] nsIDOMEventGroup GetSystemEventGroup();
 
   /**
    * Get the script context in which the event handlers should be run.
    * May return null.
    * @note Caller *must* check the value of aRv.
    */
-  [notxpcom] nsIScriptContext GetContextForEventHandlers(out nsresult aRv);
+  [notxpcom, nostdcall]
+  nsIScriptContext GetContextForEventHandlers(out nsresult aRv);
 
   /**
    * If the method above returns null, but a success code, this method
    * is called.
    */
-  [notxpcom] JSContextPtr GetJSContextForEventHandlers();
+  [notxpcom, nostdcall] JSContextPtr GetJSContextForEventHandlers();
 };
 
 %{C++
 
 typedef nsIDOMEventTarget nsPIDOMEventTarget;
 
 #define NS_IMPL_DOMTARGET_DEFAULTS(_class) \
 nsPIDOMEventTarget* _class::GetTargetForDOMEvent() { return this; } \