Rename the "child" member to "body" for less confusion.

diff --git a/aspectbin.c b/aspectbin.c
index c9fe6a5abff987182b321c5679818334fd1dfd6b..77fa5196ae3820a4e1e31fb1096ba0a04ddf85e2 100644 (file)
--- a/aspectbin.c
+++ b/aspectbin.c
@@ -8,18 +8,18 @@ static void aspect_bin_forall(GtkContainer *, gboolean, GtkCallback, gpointer);
 
 G_DEFINE_TYPE(AspectBin, aspect_bin, GTK_TYPE_BIN)
 
 
 G_DEFINE_TYPE(AspectBin, aspect_bin, GTK_TYPE_BIN)
 

-static void aspect_bin_init(AspectBin *ab)
+static void aspect_bin_init(AspectBin *abin)

 {
 {

-       ab->child     = NULL;
-       ab->ratio     = 1;
-       ab->constrain = FALSE;
-       ab->align     = 0;
+       abin->body      = NULL;
+       abin->ratio     = 1;
+       abin->constrain = FALSE;
+       abin->align     = 0;

 }
 
 }
 

-static void aspect_bin_class_init(AspectBinClass *abc)
+static void aspect_bin_class_init(AspectBinClass *class)

 {
 {

-       GtkWidgetClass    *widget_class    = GTK_WIDGET_CLASS(abc);
-       GtkContainerClass *container_class = GTK_CONTAINER_CLASS(abc);
+       GtkWidgetClass    *widget_class    = GTK_WIDGET_CLASS(class);
+       GtkContainerClass *container_class = GTK_CONTAINER_CLASS(class);

 
        widget_class->size_request  = aspect_bin_size_request;
        widget_class->size_allocate = aspect_bin_size_allocate;
 
        widget_class->size_request  = aspect_bin_size_request;
        widget_class->size_allocate = aspect_bin_size_allocate;


@@ -37,7 +37,7 @@ static void aspect_bin_remove(GtkContainer *container, GtkWidget *child)
 {
        AspectBin *abin = ASPECT_BIN(container);
 
 {
        AspectBin *abin = ASPECT_BIN(container);
 

-       if (abin->child == child) {
+       if (abin->body == child) {

                aspect_bin_set_body_widget(abin, NULL, 1);
        } else {
                GTK_CONTAINER_CLASS(aspect_bin_parent_class)->remove
                aspect_bin_set_body_widget(abin, NULL, 1);
        } else {
                GTK_CONTAINER_CLASS(aspect_bin_parent_class)->remove


@@ -56,8 +56,8 @@ static void aspect_bin_forall(GtkContainer *container,
        if (bin->child)
                callback(bin->child, callback_data);
        
        if (bin->child)
                callback(bin->child, callback_data);
        

-       if (abin->child)
-               callback(abin->child, callback_data);
+       if (abin->body)
+               callback(abin->body, callback_data);

 }
 
 static void
 }
 
 static void


@@ -71,9 +71,9 @@ aspect_bin_size_request(GtkWidget *widget, GtkRequisition *requisition)
                gtk_widget_size_request(bin->child, &creq);
        }
 
                gtk_widget_size_request(bin->child, &creq);
        }
 

-       if (abin->child && GTK_WIDGET_VISIBLE(abin->child)) {
+       if (abin->body && GTK_WIDGET_VISIBLE(abin->body)) {

                int wtmp, htmp;
                int wtmp, htmp;

-               gtk_widget_size_request(abin->child, &areq);
+               gtk_widget_size_request(abin->body, &areq);

                wtmp = areq.height * abin->ratio + 0.5;
                htmp = areq.width  / abin->ratio + 0.5;
 
                wtmp = areq.height * abin->ratio + 0.5;
                htmp = areq.width  / abin->ratio + 0.5;
 


@@ -97,7 +97,7 @@ aspect_bin_size_allocate(GtkWidget *widget, GtkAllocation *allocation)
        GtkAllocation csize = {0}, asize = {0};
        
        /* First find the best fit for the constrained child. */
        GtkAllocation csize = {0}, asize = {0};
        
        /* First find the best fit for the constrained child. */

-       if (abin->child && GTK_WIDGET_VISIBLE(abin->child)) {
+       if (abin->body && GTK_WIDGET_VISIBLE(abin->body)) {

                asize.height = allocation->height;
                asize.width  = asize.height * abin->ratio + 0.5;
 
                asize.height = allocation->height;
                asize.width  = asize.height * abin->ratio + 0.5;
 


@@ -130,33 +130,33 @@ aspect_bin_size_allocate(GtkWidget *widget, GtkAllocation *allocation)
 
        if (bin->child)
                gtk_widget_size_allocate(bin->child, &csize);
 
        if (bin->child)
                gtk_widget_size_allocate(bin->child, &csize);

-       if (abin->child)
-               gtk_widget_size_allocate(abin->child, &asize);
+       if (abin->body)
+               gtk_widget_size_allocate(abin->body, &asize);

 }
 
 void
 }
 
 void

-aspect_bin_set_body_widget(AspectBin *ab, GtkWidget *widget, gfloat ratio)
+aspect_bin_set_body_widget(AspectBin *abin, GtkWidget *widget, gfloat ratio)

 {
        gboolean need_resize = FALSE;
 
 {
        gboolean need_resize = FALSE;
 

-       g_return_if_fail(IS_ASPECT_BIN(ab));
+       g_return_if_fail(IS_ASPECT_BIN(abin));

        g_return_if_fail(widget == NULL || GTK_IS_WIDGET(widget));
        g_return_if_fail(widget == NULL || widget->parent == NULL);
 
        g_return_if_fail(widget == NULL || GTK_IS_WIDGET(widget));
        g_return_if_fail(widget == NULL || widget->parent == NULL);
 

-       if (ab->child == widget)
+       if (abin->body == widget)

                return;
        
                return;
        

-       if (ab->child) {
-               need_resize |= GTK_WIDGET_VISIBLE(ab->child);
-               gtk_widget_unparent(ab->child);
+       if (abin->body) {
+               need_resize |= GTK_WIDGET_VISIBLE(abin->body);
+               gtk_widget_unparent(abin->body);

        }
 
        }
 

-       ab->child = widget;
+       abin->body = widget;

        if (widget) {
        if (widget) {

-               gtk_widget_set_parent(widget, GTK_WIDGET(ab));
+               gtk_widget_set_parent(widget, GTK_WIDGET(abin));

                need_resize |= GTK_WIDGET_VISIBLE(widget);
        }
 
                need_resize |= GTK_WIDGET_VISIBLE(widget);
        }
 

-       if (GTK_WIDGET_VISIBLE(ab) && need_resize)
-               gtk_widget_queue_resize(GTK_WIDGET(ab));
+       if (GTK_WIDGET_VISIBLE(abin) && need_resize)
+               gtk_widget_queue_resize(GTK_WIDGET(abin));

 }
 }

diff --git a/aspectbin.h b/aspectbin.h
index e4148c623be04bfbf5085323d3e53afdb5d2677e..34bc9693eb31d4221fa1ab881b3194f74f9d13be 100644 (file)
--- a/aspectbin.h
+++ b/aspectbin.h
@@ -17,7 +17,7 @@ typedef struct AspectBinClass AspectBinClass;
 struct AspectBin {
        GtkBin bin;
 
 struct AspectBin {
        GtkBin bin;
 

-       GtkWidget *child;
+       GtkWidget *body;

        gfloat     ratio;
 
        gfloat     align;
        gfloat     ratio;
 
        gfloat     align;