Changeset 4a41f16 for functions.c

Timestamp:

Sep 18, 2010, 5:07:40 PM (14 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

master, release-1.10, release-1.7, release-1.8, release-1.9

Children:

118c919

Parents:

1b8c3f8

git-author:

David Benjamin <davidben@mit.edu> (09/18/10 16:57:13)

git-committer:

David Benjamin <davidben@mit.edu> (09/18/10 17:07:40)

Message:

Pass deactivate_cb as argument to owl_editcontext_new

File:

• functions.c (modified) (4 diffs)

functions.c

@@ -287 +287 @@
   owl_editwin_set_cbdata(e, data, cleanup);
   owl_editwin_set_callback(e, callback);
-  ctx = owl_editcontext_new(OWL_CTX_EDITMULTI, e, "editmulti");
-  ctx->deactivate_cb = owl_global_deactivate_editcontext;
-  ctx->cbdata = &g;
+  ctx = owl_editcontext_new(OWL_CTX_EDITMULTI, e, "editmulti",
+                            owl_global_deactivate_editcontext, &g);
   owl_global_push_context_obj(&g, ctx);
 
@@ -1894 +1893 @@
   owl_editwin_insert_string(tw, line);
 
-  ctx = owl_editcontext_new(OWL_CTX_EDITLINE, tw, "editline");
-  ctx->deactivate_cb = owl_global_deactivate_editcontext;
-  ctx->cbdata = &g;
+  ctx = owl_editcontext_new(OWL_CTX_EDITLINE, tw, "editline",
+                            owl_global_deactivate_editcontext, &g);
   owl_global_push_context_obj(&g, ctx);
   owl_editwin_set_callback(tw, owl_callback_command);
@@ -1910 +1908 @@
   owl_editwin_set_locktext(tw, line);
 
-  ctx = owl_editcontext_new(OWL_CTX_EDITRESPONSE, tw, "editresponse");
-  ctx->deactivate_cb = owl_global_deactivate_editcontext;
-  ctx->cbdata = &g;
+  ctx = owl_editcontext_new(OWL_CTX_EDITRESPONSE, tw, "editresponse",
+                            owl_global_deactivate_editcontext, &g);
   owl_global_push_context_obj(&g, ctx);
   return tw;
@@ -1928 +1925 @@
   owl_editwin_set_locktext(tw, line);
 
-  ctx = owl_editcontext_new(OWL_CTX_EDITRESPONSE, tw, "editresponse");
-  ctx->deactivate_cb = owl_global_deactivate_editcontext;
-  ctx->cbdata = &g;
+  ctx = owl_editcontext_new(OWL_CTX_EDITRESPONSE, tw, "editresponse",
+                            owl_global_deactivate_editcontext, &g);
   owl_global_push_context_obj(&g, ctx);
   return tw;