Changeset e00355d


Ignore:
Timestamp:
Jun 1, 2010, 12:29:53 AM (11 years ago)
Author:
David Benjamin <davidben@mit.edu>
Branches:
master, 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:
2 edited

Legend:

Unmodified
Added
Removed
  • window.c

    r053f751 re00355d  
    2727  void  *size_cbdata;
    2828  void (*size_cbdata_destroy)(void *);
    29 
    30   void (*destroy_cb)(owl_window *, void *);
    31   void  *destroy_cbdata;
    32   void (*destroy_cbdata_destroy)(void *);
    3329};
    3430
     
    7268  owl_window_set_redraw_cb (w, 0, 0, 0);
    7369  owl_window_set_size_cb (w, 0, 0, 0);
    74   owl_window_set_destroy_cb (w, 0, 0, 0);
    7570
    7671  /* Remove from hierarchy */
     
    192187
    193188  owl_window_recompute_position(w);
    194 }
    195 
    196 void owl_window_set_destroy_cb(owl_window *w, void (*cb)(owl_window*, void*), void *cbdata, void (*cbdata_destroy)(void*))
    197 {
    198   if (w->destroy_cbdata_destroy) {
    199     w->destroy_cbdata_destroy(w->destroy_cbdata);
    200     w->destroy_cbdata = 0;
    201     w->destroy_cbdata_destroy = 0;
    202   }
    203 
    204   w->destroy_cb = cb;
    205   w->destroy_cbdata = cbdata;
    206   w->destroy_cbdata_destroy = cbdata_destroy;
    207189}
    208190
  • window.h

    r053f751 re00355d  
    3232void owl_window_set_redraw_cb(owl_window *w, void (*cb)(owl_window*, WINDOW*, void*), void *cbdata, void (*cbdata_destroy)(void*));
    3333void owl_window_set_size_cb(owl_window *w, void (*cb)(owl_window*, void*), void *cbdata, void (*cbdata_destroy)(void*));
    34 void owl_window_set_destroy_cb(owl_window *w, void (*cb)(owl_window*, void*), void *cbdata, void (*cbdata_destroy)(void*));
    3534
    3635void owl_window_children_foreach(owl_window *parent, GFunc func, gpointer user_data);
Note: See TracChangeset for help on using the changeset viewer.