[goffice] Merged from origin.

[Jean Bréfort <jbrefort src gnome org>]

commit 6de43efc46d30ccb4dc462289a2831cd84442b06
Author: Jean Brefort <jean brefort normalesup org>
Date:   Mon Oct 12 10:02:21 2009 +0200

    Merged from origin.

 ChangeLog                   |   71 ++++++++++++++++++++++
 NEWS                        |    1 +
 goffice/gtk/go-gtk-compat.h |  139 +++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 211 insertions(+), 0 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 5d5eba5..87fb7af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,74 @@
+2009-10-12  Jean Brefort  <jean brefort normalesup org>
+
+	* configure.in: prepare for GSEAL_ENABLE.
+	* goffice/canvas/goc-canvas.c (goc_canvas_invalidate): ditto.
+	* goffice/canvas/goc-item.c (goc_item_dispose),
+	(goc_item_invalidate): ditto.
+	* goffice/drawing/god-drawing-view.c (god_drawing_view_realize): ditto.
+	* goffice/graph/gog-child-button.c (gog_child_button_popup): ditto.
+	* goffice/graph/gog-error-bar.c (cb_width_changed),
+	(cb_line_width_changed): ditto.
+	* goffice/graph/gog-guru.c (cb_sample_pressed),
+	(cb_canvas_realized), (graph_guru_init_format_page),
+	(typesel_set_selection_color): ditto.
+	* goffice/gtk/Makefile.am: ditto.
+	* goffice/gtk/go-3d-rotation-sel.c (cb_rotate_canvas_realize),
+	(cb_rotate_canvas_button): ditto.
+	* goffice/gtk/go-action-combo-color.c (make_icon): ditto.
+	* goffice/gtk/go-action-combo-pixmaps.c (make_icon): ditto.
+	* goffice/gtk/go-action-combo-stack.c (go_combo_stack_init): ditto.
+	* goffice/gtk/go-color-palette.c (create_color_sel),
+	(handle_color_sel), (swatch_activated): ditto.
+	* goffice/gtk/go-color-selector.c (cb_color_dialog_response),
+	(cb_combo_custom_activate), (go_color_selector_drag_data_received): ditto.
+	* goffice/gtk/go-combo-box.c (go_combo_popup_reparent),
+	(do_focus_change), (go_combo_box_popup_hide_unconditional),
+	(cb_arrow_pressed), (go_combo_box_realize),
+	(go_combo_popup_tear_off), (go_combo_box_popup_hide),
+	(go_combo_box_get_pos), (go_combo_tearoff_bg_copy),
+	(go_combo_box_popup_display), (go_combo_box_button_press),
+	(cb_state_change), (go_combo_box_init),
+	(cb_tearable_button_release), (go_combo_box_construct): ditto.
+	* goffice/gtk/go-combo-text.c (cb_scroll_size_request): ditto.
+	* goffice/gtk/go-font-sel.c (cb_list_adjust), (select_row): ditto.
+	* goffice/gtk/go-format-sel.c (cb_decimals_changed),
+	(cb_separator_toggle), (fmt_dialog_enable_widgets),
+	(cb_format_currency_select): ditto.
+	* goffice/gtk/go-graph-widget.c (go_graph_widget_size_allocate),
+	(go_graph_widget_expose_event),
+	(go_graph_widget_button_press_event),
+	(go_graph_widget_motion_notify_event), (idle_handler),
+	(go_graph_widget_set_size_mode): ditto.
+	* goffice/gtk/go-gtk-compat.h: ditto.
+	* goffice/gtk/go-optionmenu.c (go_option_menu_update_contents),
+	(go_option_menu_position), (go_option_menu_set_menu),
+	(go_option_menu_set_history), (go_option_menu_init):
+	* goffice/gtk/go-palette.c (cb_swatch_expose),
+	(cb_menu_item_activate): ditto.
+	* goffice/gtk/go-rotation-sel.c (cb_rotate_canvas_realize),
+	(cb_rotate_canvas_button): ditto.
+	* goffice/gtk/go-selector.c (go_selector_popup),
+	(go_selector_drag_data_received), (go_selector_drag_data_get):
+	* goffice/gtk/go-selector.h: ditto.
+	* goffice/gtk/goffice-gtk.c (go_gtk_dialog_add_button),
+	(cb_activate_default), (go_gtk_widget_disable_focus),
+	(cb_parent_mapped), (go_gtk_window_set_transient),
+	(go_gtk_notice_dialog), (go_dialog_guess_alternative_button_order),
+	(go_menu_position_below): ditto.
+	* goffice/utils/go-style.c (cb_outline_size_changed),
+	(cb_line_size_changed), (cb_marker_size_changed):
+	* plugins/plot_barcol/gog-barcol-prefs.c (cb_gap_changed),
+	(cb_overlap_changed): ditto.
+	* plugins/plot_barcol/gog-minmax.c (cb_gap_changed):
+	* plugins/plot_distrib/gog-boxplot.c (cb_gap_changed),
+	(cb_ratio_changed): ditto.
+	* plugins/plot_pie/gog-pie-prefs.c (cb_element_separation_changed),
+	(cb_default_separation_changed), (cb_rotation_changed),
+	(cb_center_size_changed): ditto.
+	* plugins/plot_surface/gog-xyz-surface-prefs.c (cb_rows_changed),
+	(cb_columns_changed): ditto.
+	* plugins/plot_xy/gog-bubble-prefs.c (cb_scale_changed): ditto.
+
 2009-10-11  Jean Brefort  <jean brefort normalesup org>
 
 	* goffice/canvas/goc-group.c (goc_group_set_property): call
diff --git a/NEWS b/NEWS
index c9b1482..0a2f38d 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,7 @@ goffice 0.7.15:
 
 Jean:
 	* Fix bounds update of GocItem. [#598091]
+	* Prepare for GSEAL_ENABLE.
 
 --------------------------------------------------------------------------
 goffice 0.7.14:
diff --git a/goffice/gtk/go-gtk-compat.h b/goffice/gtk/go-gtk-compat.h
new file mode 100644
index 0000000..43f52db
--- /dev/null
+++ b/goffice/gtk/go-gtk-compat.h
@@ -0,0 +1,139 @@
+/* vim: set sw=8: -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ * go-gtk-compat.h :
+ *
+ * Copyright (C) 2008-2009 Jean Brefort (jean brefort normalesup org)
+ *
+ * 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 the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301
+ * USA
+ */
+
+#include <goffice/goffice-config.h>
+
+#ifndef HAVE_GTK_ADJUSTMENT_GET_PAGE_SIZE
+#       define gtk_adjustment_get_page_size(a) (a)->page_size
+#endif
+
+#ifndef HAVE_GTK_ADJUSTMENT_GET_UPPER
+#       define gtk_adjustment_get_upper(a) (a)->upper
+#endif
+
+#ifndef HAVE_GTK_COLOR_SELECTION_DIALOG_GET_COLOR_SELECTION
+#       define gtk_color_selection_dialog_get_color_selection(w) (w)->colorsel
+#endif
+
+#ifndef HAVE_GTK_DIALOG_GET_ACTION_AREA
+#       define gtk_dialog_get_action_area(x) (x)->action_area
+#endif
+
+#ifndef HAVE_GTK_LAYOUT_GET_BIN_WINDOW
+#       define gtk_layout_get_bin_window(x) (x)->bin_window
+#endif
+
+#ifndef HAVE_GTK_MENU_SHELL_GET_ACTIVE
+#       define gtk_menu_shell_get_active(w) (w)->active
+#endif
+
+#ifndef HAVE_GTK_SELECTION_DATA_GET_DATA
+#       define gtk_selection_data_get_data(d) (d)->data
+#endif
+
+#ifndef HAVE_GTK_SELECTION_DATA_GET_LENGTH
+#       define gtk_selection_data_get_length(d) (d)->length
+#endif
+
+#ifndef HAVE_GTK_SELECTION_DATA_GET_LENGTH
+#       define gtk_selection_data_get_target(d) (d)->target
+#endif
+
+#ifndef HAVE_GTK_TEAROFF_MENU_ITEM_GET_TORN_OFF
+#       define gtk_tearoff_menu_item_get_torn_off(w) (w)->torn_off
+#endif
+
+#ifndef HAVE_GTK_TEAROFF_MENU_ITEM_SET_TORN_OFF
+#       define gtk_tearoff_menu_item_set_torn_off(w,b) (w)->torn_off = b
+#endif
+
+#ifndef HAVE_GTK_WIDGET_GET_ALLOCATION
+#	define gtk_widget_get_allocation(w,a) *(a) = (w)->allocation
+#endif
+
+#ifndef HAVE_GTK_WIDGET_GET_HAS_WINDOW
+#	define gtk_widget_get_has_window(w) !GTK_WIDGET_NO_WINDOW (w)
+#endif
+
+#ifndef HAVE_GTK_WIDGET_GET_STATE
+#       define gtk_widget_get_state(w) GTK_WIDGET_STATE (w)
+#endif
+
+#ifndef HAVE_GTK_WIDGET_GET_STYLE
+#       define gtk_widget_get_style(w) (w)->style
+#endif
+
+#ifndef HAVE_GTK_WIDGET_GET_VISIBLE
+#       define gtk_widget_get_visible(w) GTK_WIDGET_VISIBLE (w)
+#endif
+
+#ifndef HAVE_GTK_WIDGET_GET_WINDOW
+#       define gtk_widget_get_window(w) (w)->window
+#endif
+
+#ifndef HAVE_GTK_WIDGET_HAVE_FOCUS
+#       define gtk_widget_have_focus(w) GTK_WIDGET_HAVE_FOCUS (w)
+#endif
+
+#ifndef HAVE_GTK_WIDGET_IS_MAPPED
+#       define gtk_widget_is_mapped(w) GTK_WIDGET_MAPPED (w)
+#endif
+
+#ifndef HAVE_GTK_WIDGET_IS_REALIZED
+#       define gtk_widget_is_realized(w) GTK_WIDGET_REALIZED (w)
+#endif
+
+#ifndef HAVE_GTK_WIDGET_GET_VISIBLE
+#       define gtk_widget_get_visible(w) GTK_WIDGET_VISIBLE (w)
+#endif
+
+#ifndef HAVE_GTK_WIDGET_IS_SENSITIVE
+#       define gtk_widget_is_sensitive(w) GTK_WIDGET_IS_SENSITIVE (w)
+#endif
+
+#ifndef HAVE_GTK_WIDGET_SET_CAN_DEFAULT
+#       define gtk_widget_set_can_default(w,t) \
+		if (t) GTK_WIDGET_SET_FLAGS ((w), GTK_CAN_DEFAULT); \
+		else GTK_WIDGET_UNSET_FLAGS ((w), GTK_CAN_DEFAULT)
+#endif
+
+#ifndef HAVE_GTK_WIDGET_SET_CAN_FOCUS
+#       define gtk_widget_set_can_focus(w,t) \
+		if (t) GTK_WIDGET_SET_FLAGS ((w), GTK_CAN_FOCUS); \
+		else GTK_WIDGET_UNSET_FLAGS ((w), GTK_CAN_FOCUS)
+#endif
+
+#ifndef HAVE_GTK_WIDGET_SET_HAS_FOCUS
+#       define gtk_widget_set_has_focus(w,t) \
+		if (t) GTK_WIDGET_SET_FLAGS ((w), GTK_HAS_FOCUS); \
+		else GTK_WIDGET_UNSET_FLAGS ((w), GTK_HAS_FOCUS)
+#endif
+
+#ifndef HAVE_GTK_WIDGET_SET_RECEIVES_DEFAULT
+#       define gtk_widget_set_receives_default (w,t) \
+		if (t) GTK_WIDGET_SET_FLAGS ((w), GTK_RECEIVES_DEFAULT); \
+		else GTK_WIDGET_UNSET_FLAGS ((w), GTK_RECEIVES_DEFAULT)
+#endif
+
+#ifndef HAVE_GTK_WINDOW_GET_DEFAULT_WIDGET
+#       define gtk_window_get_default_widget(w) (w)->default_widget
+#endif