Changeset e00355d

Timestamp:

Jun 1, 2010, 12:29:53 AM (15 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

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

Children:

7a70e26

Parents:

053f751

Message:

Drop the destroyed callback

We probably don't need it with the new ownership semantics. If we do,
gobject probably already has a mechanism.

Files:

• window.c (modified) (3 diffs)
• window.h (modified) (1 diff)

window.c

@@ -27 +27 @@
   void  *size_cbdata;
   void (*size_cbdata_destroy)(void *);
-
-  void (*destroy_cb)(owl_window *, void *);
-  void  *destroy_cbdata;
-  void (*destroy_cbdata_destroy)(void *);
 };
 
@@ -72 +68 @@
   owl_window_set_redraw_cb (w, 0, 0, 0);
   owl_window_set_size_cb (w, 0, 0, 0);
-  owl_window_set_destroy_cb (w, 0, 0, 0);
 
   /* Remove from hierarchy */
@@ -192 +187 @@
 
   owl_window_recompute_position(w);
-}
-
-void owl_window_set_destroy_cb(owl_window *w, void (*cb)(owl_window*, void*), void *cbdata, void (*cbdata_destroy)(void*))
-{
-  if (w->destroy_cbdata_destroy) {
-    w->destroy_cbdata_destroy(w->destroy_cbdata);
-    w->destroy_cbdata = 0;
-    w->destroy_cbdata_destroy = 0;
-  }
-
-  w->destroy_cb = cb;
-  w->destroy_cbdata = cbdata;
-  w->destroy_cbdata_destroy = cbdata_destroy;
 }
 

window.h

@@ -32 +32 @@
 void owl_window_set_redraw_cb(owl_window *w, void (*cb)(owl_window*, WINDOW*, void*), void *cbdata, void (*cbdata_destroy)(void*));
 void owl_window_set_size_cb(owl_window *w, void (*cb)(owl_window*, void*), void *cbdata, void (*cbdata_destroy)(void*));
-void owl_window_set_destroy_cb(owl_window *w, void (*cb)(owl_window*, void*), void *cbdata, void (*cbdata_destroy)(void*));
 
 void owl_window_children_foreach(owl_window *parent, GFunc func, gpointer user_data);