[gtk+/extended-layout-jhs: 36/64] Make the type check part of the extended layout feature check macros.

[Johannes Schmid <jhs src gnome org>]

commit 26b967769102c059288bf7a7ae9e4a02fa1f9064
Author: Mathias Hasselmann <mathias hasselmann gmx de>
Date:   Mon Jul 23 17:19:43 2007 +0000

    Make the type check part of the extended layout feature check macros.
    
    2007-07-18  Mathias Hasselmann  <mathias hasselmann gmx de>
    
    	* gtk/gtkextendedlayout.h, gtk/gtkhbox.c, gtk/gtkvbox.c:
    	Make the type check part of the extended layout feature check macros.
    
    svn path=/branches/extended-layout/; revision=18528

 ChangeLog.gtk-extended-layout |    5 +++++
 gtk/gtkextendedlayout.h       |   20 ++++++++++----------
 gtk/gtkhbox.c                 |   13 ++++---------
 gtk/gtkvbox.c                 |    6 ++----
 4 files changed, 21 insertions(+), 23 deletions(-)
---
diff --git a/ChangeLog.gtk-extended-layout b/ChangeLog.gtk-extended-layout
index 1485f0c..07a5669 100644
--- a/ChangeLog.gtk-extended-layout
+++ b/ChangeLog.gtk-extended-layout
@@ -1,3 +1,8 @@
+2007-07-18  Mathias Hasselmann  <mathias hasselmann gmx de>
+
+	* gtk/gtkextendedlayout.h, gtk/gtkhbox.c, gtk/gtkvbox.c:
+	Make the type check part of the extended layout feature check macros.
+
 2007-07-16  Mathias Hasselmann  <mathias hasselmann gmx de>
 
 	* tests/testellipsise.c: Extend the test to support rotations.
diff --git a/gtk/gtkextendedlayout.h b/gtk/gtkextendedlayout.h
index 485d5de..82e84e7 100644
--- a/gtk/gtkextendedlayout.h
+++ b/gtk/gtkextendedlayout.h
@@ -31,20 +31,20 @@ G_BEGIN_DECLS
 #define GTK_EXTENDED_LAYOUT_GET_IFACE(obj)  (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GTK_TYPE_EXTENDED_LAYOUT, GtkExtendedLayoutIface))
 
 #define GTK_EXTENDED_LAYOUT_HAS_WIDTH_FOR_HEIGHT(obj) \
-  (gtk_extended_layout_get_features (GTK_EXTENDED_LAYOUT ((obj))) & \
-   GTK_EXTENDED_LAYOUT_WIDTH_FOR_HEIGHT)
+  (GTK_IS_EXTENDED_LAYOUT((obj)) && (GTK_EXTENDED_LAYOUT_WIDTH_FOR_HEIGHT & \
+   gtk_extended_layout_get_features ((GtkExtendedLayout*)(obj))))
 #define GTK_EXTENDED_LAYOUT_HAS_HEIGHT_FOR_WIDTH(obj) \
-  (gtk_extended_layout_get_features (GTK_EXTENDED_LAYOUT ((obj))) & \
-   GTK_EXTENDED_LAYOUT_HEIGHT_FOR_WIDTH)
+  (GTK_IS_EXTENDED_LAYOUT((obj)) && (GTK_EXTENDED_LAYOUT_HEIGHT_FOR_WIDTH & \
+   gtk_extended_layout_get_features ((GtkExtendedLayout*)(obj))))
 #define GTK_EXTENDED_LAYOUT_HAS_NATURAL_SIZE(obj) \
-  (gtk_extended_layout_get_features (GTK_EXTENDED_LAYOUT ((obj))) & \
-   GTK_EXTENDED_LAYOUT_NATURAL_SIZE)
+  (GTK_IS_EXTENDED_LAYOUT((obj)) && (GTK_EXTENDED_LAYOUT_NATURAL_SIZE & \
+   gtk_extended_layout_get_features ((GtkExtendedLayout*)(obj))))
 #define GTK_EXTENDED_LAYOUT_HAS_BASELINES(obj) \
-  (gtk_extended_layout_get_features (GTK_EXTENDED_LAYOUT ((obj))) & \
-   GTK_EXTENDED_LAYOUT_BASELINES)
+  (GTK_IS_EXTENDED_LAYOUT((obj)) && (GTK_EXTENDED_LAYOUT_BASELINES & \
+   gtk_extended_layout_get_features ((GtkExtendedLayout*)(obj))))
 #define GTK_EXTENDED_LAYOUT_HAS_PADDING(obj) \
-  (gtk_extended_layout_get_features (GTK_EXTENDED_LAYOUT ((obj))) & \
-   GTK_EXTENDED_LAYOUT_PADDING)
+  (GTK_IS_EXTENDED_LAYOUT((obj)) && (GTK_EXTENDED_LAYOUT_PADDING & \
+   gtk_extended_layout_get_features ((GtkExtendedLayout*)(obj))))
 
 typedef struct _GtkExtendedLayout           GtkExtendedLayout;
 typedef struct _GtkExtendedLayoutIface      GtkExtendedLayoutIface;
diff --git a/gtk/gtkhbox.c b/gtk/gtkhbox.c
index 1775cf9..9ff3055 100644
--- a/gtk/gtkhbox.c
+++ b/gtk/gtkhbox.c
@@ -191,8 +191,7 @@ gtk_hbox_size_request (GtkWidget      *widget,
 
               if (GTK_WIDGET_VISIBLE (child->widget))
                 {
-                  if (GTK_IS_EXTENDED_LAYOUT (child->widget) &&
-                      GTK_EXTENDED_LAYOUT_HAS_BASELINES (child->widget))
+                  if (GTK_EXTENDED_LAYOUT_HAS_BASELINES (child->widget))
                     {
                       GtkExtendedLayout *layout = GTK_EXTENDED_LAYOUT (child->widget);
 
@@ -323,8 +322,7 @@ gtk_hbox_size_allocate (GtkWidget     *widget,
               gtk_widget_size_request (child->widget, &child_requisition);
               minimum_requisitions[i] = child_requisition.width;
 
-              if (GTK_IS_EXTENDED_LAYOUT (child->widget) &&
-                  GTK_EXTENDED_LAYOUT_HAS_NATURAL_SIZE (child->widget))
+              if (GTK_EXTENDED_LAYOUT_HAS_NATURAL_SIZE (child->widget))
                 {
                   gtk_extended_layout_get_natural_size (
                     GTK_EXTENDED_LAYOUT (child->widget), 
@@ -457,8 +455,7 @@ gtk_hbox_size_allocate (GtkWidget     *widget,
 
               if (GTK_WIDGET_VISIBLE (child->widget))
                 {
-                  if (GTK_IS_EXTENDED_LAYOUT (child->widget) &&
-                      GTK_EXTENDED_LAYOUT_HAS_BASELINES (child->widget))
+                  if (GTK_EXTENDED_LAYOUT_HAS_BASELINES (child->widget))
                     {
                       GtkExtendedLayout *layout = GTK_EXTENDED_LAYOUT (child->widget);
                       gint baseline, dy;
@@ -545,8 +542,7 @@ gtk_hbox_extended_layout_get_natural_size (GtkExtendedLayout *layout,
 
       if (GTK_WIDGET_VISIBLE (child->widget))
 	{
-          if (GTK_IS_EXTENDED_LAYOUT (child->widget) &&
-              GTK_EXTENDED_LAYOUT_HAS_NATURAL_SIZE (child->widget))
+          if (GTK_EXTENDED_LAYOUT_HAS_NATURAL_SIZE (child->widget))
             gtk_extended_layout_get_natural_size (GTK_EXTENDED_LAYOUT (child->widget),
                                                   &child_requisition);
           else
@@ -584,7 +580,6 @@ gtk_hbox_extended_layout_get_baselines (GtkExtendedLayout  *layout,
       children = children->next;
 
       if (GTK_WIDGET_VISIBLE (child->widget) &&
-          GTK_IS_EXTENDED_LAYOUT (child->widget) &&
           GTK_EXTENDED_LAYOUT_HAS_BASELINES (child->widget))
         {
           child_baseline = gtk_extended_layout_get_single_baseline (
diff --git a/gtk/gtkvbox.c b/gtk/gtkvbox.c
index e84911e..12a6f2b 100644
--- a/gtk/gtkvbox.c
+++ b/gtk/gtkvbox.c
@@ -191,8 +191,7 @@ gtk_vbox_size_allocate (GtkWidget     *widget,
               gtk_widget_size_request (child->widget, &child_requisition);
               minimum_requisitions[i] = child_requisition.height;
 
-              if (GTK_IS_EXTENDED_LAYOUT (child->widget) &&
-                  GTK_EXTENDED_LAYOUT_HAS_NATURAL_SIZE (child->widget))
+              if (GTK_EXTENDED_LAYOUT_HAS_NATURAL_SIZE (child->widget))
                 {
                   gtk_extended_layout_get_natural_size (
                     GTK_EXTENDED_LAYOUT (child->widget), 
@@ -340,8 +339,7 @@ gtk_vbox_extended_layout_get_natural_size (GtkExtendedLayout *layout,
 
       if (GTK_WIDGET_VISIBLE (child->widget))
 	{
-          if (GTK_IS_EXTENDED_LAYOUT (child->widget) &&
-              GTK_EXTENDED_LAYOUT_HAS_NATURAL_SIZE (child->widget))
+          if (GTK_EXTENDED_LAYOUT_HAS_NATURAL_SIZE (child->widget))
             gtk_extended_layout_get_natural_size (GTK_EXTENDED_LAYOUT (child->widget),
                                                   &child_requisition);
           else