From: John Darrington <john@darrington.wattle.id.au>
Date: Thu, 1 Sep 2016 06:32:04 +0000 (+0200)
Subject: psppire-output-view: Avoid GtkWarnings
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5b78db3678375ff03849dbc42d5db64eac0131ea;p=pspp

psppire-output-view: Avoid GtkWarnings
---

diff --git a/src/ui/gui/psppire-output-view.c b/src/ui/gui/psppire-output-view.c
index 08daef95bf..ce29472e87 100644
--- a/src/ui/gui/psppire-output-view.c
+++ b/src/ui/gui/psppire-output-view.c
@@ -250,11 +250,23 @@ rerender (struct psppire_output_view *view)
           gtk_layout_move (view->output, item->drawing_area, xpos, view->y);
         }
 
+      {
+	gint minw;
+	gint minh;
+	/* This code probably doesn't bring us anthing, but Gtk
+	   shows warnings if get_preferred_width/height is not
+	   called before the size_allocate below is called. */
+	gtk_widget_get_preferred_width (item->drawing_area, &minw, NULL);
+	gtk_widget_get_preferred_height (item->drawing_area, &minh, NULL);
+	if (th > minh) th = minh;
+	if (tw > minw) tw = minw;
+      }
       alloc.x = xpos;
       alloc.y = view->y;
       alloc.width = tw;
       alloc.height = th;
-      gtk_widget_size_allocate(item->drawing_area,&alloc);
+
+      gtk_widget_size_allocate (item->drawing_area, &alloc);
 
       if (view->max_width < tw)
         view->max_width = tw;