[gtk+] Disable underallocation warnings in non-debug builds
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+] Disable underallocation warnings in non-debug builds
- Date: Tue, 30 Aug 2011 15:48:46 +0000 (UTC)
commit a233022934a6bc7c26e5759f04879a85e1ae2492
Author: Matthias Clasen <mclasen redhat com>
Date: Tue Aug 30 08:44:13 2011 -0400
Disable underallocation warnings in non-debug builds
It doesn't look like we have much traction of actually fixing
these, and there is very real cost to not being able to distcheck.
gtk/gtkwidget.c | 21 +++++++++++++--------
1 files changed, 13 insertions(+), 8 deletions(-)
---
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index 8f5d6ff..b95ce9a 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -4819,14 +4819,19 @@ gtk_widget_size_allocate (GtkWidget *widget,
gtk_widget_get_preferred_width_for_height (widget, real_allocation.height, &min_width, &natural_width);
}
- if ((min_width > real_allocation.width || min_height > real_allocation.height) &&
- !GTK_IS_SCROLLABLE (widget))
- g_warning ("gtk_widget_size_allocate(): attempt to underallocate %s%s %s %p. "
- "Allocation is %dx%d, but minimum required size is %dx%d.",
- priv->parent ? G_OBJECT_TYPE_NAME (priv->parent) : "", priv->parent ? "'s child" : "toplevel",
- G_OBJECT_TYPE_NAME (widget), widget,
- real_allocation.width, real_allocation.height,
- min_width, min_height);
+#ifdef G_ENABLE_DEBUG
+ if (gtk_get_debug_flags () & GTK_DEBUG_GEOMETRY)
+ {
+ if ((min_width > real_allocation.width || min_height > real_allocation.height) &&
+ !GTK_IS_SCROLLABLE (widget))
+ g_warning ("gtk_widget_size_allocate(): attempt to underallocate %s%s %s %p. "
+ "Allocation is %dx%d, but minimum required size is %dx%d.",
+ priv->parent ? G_OBJECT_TYPE_NAME (priv->parent) : "", priv->parent ? "'s child" : "toplevel",
+ G_OBJECT_TYPE_NAME (widget), widget,
+ real_allocation.width, real_allocation.height,
+ min_width, min_height);
+ }
+#endif
/* Now that we have the right natural height and width, go ahead and remove any margins from the
* allocated sizes and possibly limit them to the natural sizes */
GTK_WIDGET_GET_CLASS (widget)->adjust_size_allocation (widget,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]