psppire-output-view: Use correct enumeration type in call.

[pspp] / src / ui / gui / psppire-output-view.c

diff --git a/src/ui/gui/psppire-output-view.c b/src/ui/gui/psppire-output-view.c
index 08daef95bf39cf6821c27f68b760a361fb2c4231..f30914135a6a1fff3e1e1ecf090fb20a6b9c6707 100644 (file)
--- a/src/ui/gui/psppire-output-view.c
+++ b/src/ui/gui/psppire-output-view.c
@@ -160,7 +160,7 @@ create_xr (struct psppire_output_view *view)
   cairo_destroy (cr);
 }
 
-/* Return the horizontal position to place a widget whose 
+/* Return the horizontal position to place a widget whose
    width is CHILD_WIDTH */
 static gint
 get_xpos (const struct psppire_output_view *view, gint child_width)
@@ -183,9 +183,10 @@ create_drawing_area (struct psppire_output_view *view,
     {
       GdkRGBA green = {0, 1, 0, 1};
       gtk_widget_override_background_color (GTK_WIDGET (view->output),
-                                           GTK_STATE_NORMAL, &green);
+                                           GTK_STATE_FLAG_NORMAL, &green);
       GdkRGBA red = {1, 0, 0, 1};
-      gtk_widget_override_background_color (drawing_area, GTK_STATE_NORMAL, &red);
+      gtk_widget_override_background_color (drawing_area,
+                                            GTK_STATE_FLAG_NORMAL, &red);
     }
 
   g_object_set_data_full (G_OBJECT (drawing_area),
@@ -250,11 +251,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;
@@ -629,18 +642,18 @@ on_realize (GtkWidget *overview, GObject *view)
 
   GAction *copy_action = g_action_map_lookup_action (G_ACTION_MAP (toplevel),
                                                     "copy");
-  
+
   GAction *select_all_action = g_action_map_lookup_action (G_ACTION_MAP (toplevel),
                                                           "select-all");
 
-  g_object_set (copy_action, "enabled", FALSE, NULL); 
+  g_object_set (copy_action, "enabled", FALSE, NULL);
 
   g_signal_connect_swapped (select_all_action, "activate",
                            G_CALLBACK (on_select_all), view);
 
   g_signal_connect_swapped (copy_action, "activate",
                             G_CALLBACK (on_copy), view);
-  
+
   g_signal_connect (sel, "changed", G_CALLBACK (on_selection_change),
                     copy_action);
 }
@@ -653,7 +666,7 @@ psppire_output_view_new (GtkLayout *output, GtkTreeView *overview)
   GtkCellRenderer *renderer;
 
   GtkTreeModel *model;
-  
+
   view = xmalloc (sizeof *view);
   view->xr = NULL;
   view->font_height = 0;
@@ -777,17 +790,17 @@ static cairo_t *
 get_cairo_context_from_print_context (GtkPrintContext *context)
 {
   cairo_t *cr = gtk_print_context_get_cairo_context (context);
-  
+
   /*
     For all platforms except windows, gtk_print_context_get_dpi_[xy] returns 72.
     Windows returns 600.
   */
   double xres = gtk_print_context_get_dpi_x (context);
   double yres = gtk_print_context_get_dpi_y (context);
-  
+
   /* This means that the cairo context now has its dimensions in Points */
   cairo_scale (cr, xres / 72.0, yres / 72.0);
-  
+
   return cr;
 }
 
@@ -906,7 +919,7 @@ psppire_output_view_print (struct psppire_output_view *view,
 
   GtkPrintOperation *print = gtk_print_operation_new ();
 
-  if (view->print_settings != NULL) 
+  if (view->print_settings != NULL)
     gtk_print_operation_set_print_settings (print, view->print_settings);
 
   g_signal_connect (print, "begin_print", G_CALLBACK (begin_print), view);