Merge remote branch 'origin/master' into import-gui

[pspp] / src / ui / gui / psppire-hbuttonbox.c

diff --git a/src/ui/gui/psppire-hbuttonbox.c b/src/ui/gui/psppire-hbuttonbox.c
index ae5f30945e538f7a86b1ce92c33a3765df49f45f..2d036a415630df7621df1afd9df9de4a0a14117c 100644 (file)
--- a/src/ui/gui/psppire-hbuttonbox.c
+++ b/src/ui/gui/psppire-hbuttonbox.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2007  Free Software Foundation
+   Copyright (C) 2007, 2010, 2011  Free Software Foundation
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -19,12 +19,9 @@
 
 #include <glib.h>
 #include <gtk/gtk.h>
-#include <gtk/gtksignal.h>
 #include "psppire-hbuttonbox.h"
 #include "psppire-dialog.h"
 
-#include <gtk/gtkbbox.h>
-
 #include <gettext.h>
 
 #define _(msgid) gettext (msgid)
@@ -40,7 +37,7 @@ static void gtk_hbutton_box_size_allocate (GtkWidget      *widget,
                                           GtkAllocation  *allocation);
 
 
-static GtkButtonBoxStyle default_layout_style = GTK_BUTTONBOX_EDGE;
+static const GtkButtonBoxStyle default_layout_style = GTK_BUTTONBOX_EDGE;
 
 GType
 psppire_hbutton_box_get_type (void)
@@ -246,7 +243,7 @@ gtk_hbutton_box_size_allocate (GtkWidget     *widget,
       child = children->data;
       children = children->next;
 
-      if (GTK_WIDGET_VISIBLE (child->widget))
+      if (gtk_widget_get_visible (child->widget))
        {
          child_allocation.width = child_width;
          child_allocation.height = child_height;