X-Git-Url: https://git.decadent.org.uk/gitweb/?p=ion3.git;a=blobdiff_plain;f=doc%2Fionnotes%2Fnode5.html;h=45b1c2964cb30faca198b2e78deb86f0465f0e8e;hp=d3aba2e7d96c6cc553064f83c0e67646e0071b54;hb=ae4260bb64817c11f9a7140324cd3e3ba113e297;hpb=803afbc1cd633f6c025bcd9537e9b7e9aedadd0d
diff --git a/doc/ionnotes/node5.html b/doc/ionnotes/node5.html
index d3aba2e..45b1c29 100644
--- a/doc/ionnotes/node5.html
+++ b/doc/ionnotes/node5.html
@@ -83,10 +83,9 @@ original version by: Nikos Drakos, CBLU, University of Leeds
To keep Ion's code as simple as possible yet safe, there are restrictions
when the WObj
-destroy_obj
+destroy_obj
function that calls watches, the deinit routine and frees memory may
-be called directly. In all other cases the
-defer_destroy
+be called directly. In all other cases the mainloop_defer_destroy
function should be used to defer the call of destroy_obj until
Ioncore returns to its main event loop.
@@ -103,8 +102,7 @@ following cases:
when the function created a frame to manage some other object but for
some reason failed to reparent the object to this frame.
-
In a deferred action handler set with
- defer_action.
+In a deferred action handler set with mainloop_defer_action.
Like deferred destroys, other deferred actions are called when
Ioncore has returned to the main loop.
@@ -116,7 +114,7 @@ following cases:
If there are no serious side effects from deferring destroying the
object or you're unsure whether it is safe to destroy the object
-immediately, use defer_destroy.
+immediately, use mainloop_defer_destroy.
@@ -145,7 +143,7 @@ parameters to functions.
| char* |
The string is the caller's responsibility and it
must free it when no longer needed. |
-The called function may modify the string but the ''owner'' of
+ | The called function may modify the string but the ``owner'' of
the string is case-dependant. |