filechooserbutton: For the open-dialog-cancel-* tests, add a real nomenclature and...

[~andy/gtk] / gtk / gtkaspectframe.c

diff --git a/gtk/gtkaspectframe.c b/gtk/gtkaspectframe.c
index 42b709a50fa379a10f923c33c55f9eba6533cfed..4b77af282a021f8f5911b3243d3de0a61f772bf5 100644 (file)
--- a/gtk/gtkaspectframe.c
+++ b/gtk/gtkaspectframe.c
@@ -17,9 +17,7 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
 /*
@@ -44,7 +42,11 @@
  */
 
 #include "config.h"
+
 #include "gtkaspectframe.h"
+
+#include "gtksizerequest.h"
+
 #include "gtkprivate.h"
 #include "gtkintl.h"
 
@@ -229,8 +231,8 @@ gtk_aspect_frame_get_property (GObject         *object,
  *  the #GtkAspectFrame. This ranges from 0.0 (left aligned)
  *  to 1.0 (right aligned)
  * @yalign: Vertical alignment of the child within the allocation of
- *  the #GtkAspectFrame. This ranges from 0.0 (left aligned)
- *  to 1.0 (right aligned)
+ *  the #GtkAspectFrame. This ranges from 0.0 (top aligned)
+ *  to 1.0 (bottom aligned)
  * @ratio: The desired aspect ratio.
  * @obey_child: If %TRUE, @ratio is ignored, and the aspect
  *  ratio is taken from the requistion of the child.
@@ -270,8 +272,8 @@ gtk_aspect_frame_new (const gchar *label,
  *  the #GtkAspectFrame. This ranges from 0.0 (left aligned)
  *  to 1.0 (right aligned)
  * @yalign: Vertical alignment of the child within the allocation of
- *  the #GtkAspectFrame. This ranges from 0.0 (left aligned)
- *  to 1.0 (right aligned)
+ *  the #GtkAspectFrame. This ranges from 0.0 (top aligned)
+ *  to 1.0 (bottom aligned)
  * @ratio: The desired aspect ratio.
  * @obey_child: If %TRUE, @ratio is ignored, and the aspect
  *  ratio is taken from the requistion of the child.
@@ -348,7 +350,7 @@ gtk_aspect_frame_compute_child_allocation (GtkFrame      *frame,
        {
          GtkRequisition child_requisition;
 
-         gtk_widget_get_child_requisition (child, &child_requisition);
+          gtk_widget_get_preferred_size (child, &child_requisition, NULL);
          if (child_requisition.height != 0)
            {
              ratio = ((gdouble) child_requisition.width /