Changeset 7a70e26

Timestamp:

Jun 1, 2010, 1:25:15 AM (14 years ago)

Author:

David Benjamin <davidben@mit.edu>

Branches:

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

Children:

7a6e6c7

Parents:

e00355d

Message:

Punt owl_window_children_foreach_onearg

Use GFunc casts everywhere. This horrid and depends on calling
convention, but glib relies on it EVERYWHERE. If our environment doesn't
support it, we'll have worse problems anyway.

Files:

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

window.c

@@ -233 +233 @@
 }
 
-void owl_window_children_foreach_onearg(owl_window *parent, void (*func)(owl_window*))
-{
-  owl_window_children_foreach(parent, (GFunc)func, NULL);
-}
-
 owl_window *owl_window_get_parent(owl_window *w)
 {
@@ -289 +284 @@
 {
   owl_window_show(w);
-  owl_window_children_foreach_onearg(w, owl_window_show);
+  owl_window_children_foreach(w, (GFunc)owl_window_show, 0);
 }
 
@@ -331 +326 @@
   owl_window_dirty(w);
   /* map the children */
-  owl_window_children_foreach_onearg(w, _owl_window_realize);
+  owl_window_children_foreach(w, (GFunc)_owl_window_realize, 0);
 }
 
@@ -339 +334 @@
     return;
   /* unmap all the children */
-  owl_window_children_foreach_onearg(w, _owl_window_unrealize);
+  owl_window_children_foreach(w, (GFunc)_owl_window_unrealize, 0);
   _owl_window_destroy_curses(w);
   /* subwins leave a mess in the parent; dirty it */
@@ -367 +362 @@
 void owl_window_dirty_children(owl_window *w)
 {
-  owl_window_children_foreach_onearg(w, owl_window_dirty);
+  owl_window_children_foreach(w, (GFunc)owl_window_dirty, 0);
 }
 
@@ -385 +380 @@
     return;
   _owl_window_redraw(w);
-  owl_window_children_foreach_onearg(w, _owl_window_redraw_subtree);
+  owl_window_children_foreach(w, (GFunc)_owl_window_redraw_subtree, 0);
 }
 
@@ -465 +460 @@
   }
   /* recalculate children sizes BEFORE remapping, so that everything can resize */
-  owl_window_children_foreach_onearg(w, owl_window_recompute_position);
+  owl_window_children_foreach(w, (GFunc)owl_window_recompute_position, 0);
   if (w->shown) {
     _owl_window_realize(w);

window.h

@@ -34 +34 @@
 
 void owl_window_children_foreach(owl_window *parent, GFunc func, gpointer user_data);
-void owl_window_children_foreach_onearg(owl_window *parent, void (*func)(owl_window*));
 owl_window *owl_window_get_parent(owl_window *w);