[gtk+/native-layout-incubator] Treat h and v boxes the same way



commit f285ed1348a5c9e046e6a035d6c4018abc1e317a
Author: Matthias Clasen <mclasen redhat com>
Date:   Sun Apr 25 17:12:15 2010 -0400

    Treat h and v boxes the same way
    
    ...we've got the money!

 gtk/gtkbox.c |    9 +--------
 1 files changed, 1 insertions(+), 8 deletions(-)
---
diff --git a/gtk/gtkbox.c b/gtk/gtkbox.c
index 76dd255..231a306 100644
--- a/gtk/gtkbox.c
+++ b/gtk/gtkbox.c
@@ -1168,14 +1168,7 @@ gtk_box_get_width_for_height (GtkExtendedLayout *layout,
   GtkBoxPrivate *private = GTK_BOX_GET_PRIVATE (layout);
 
   if (private->orientation == GTK_ORIENTATION_VERTICAL)
-    {
-#if __I_HAD_A_MILLION_DOLLARS__
-      gtk_box_compute_size_for_opposing_orientation (box, height, minimum_width, natural_width); 
-#else
-      /* Return the defaults instead of calculating in the opposing orientation */  
-      gtk_extended_layout_get_desired_width (layout, minimum_width, natural_width);
-#endif
-    }
+    gtk_box_compute_size_for_opposing_orientation (box, height, minimum_width, natural_width); 
   else
     gtk_box_compute_size_for_orientation (box, height, minimum_width, natural_width);
 }



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]