Commit 1ca852b6 authored by Jody Goldberg's avatar Jody Goldberg

Cleanup header inclusion to make things work even with gtk HEAD


	* Cleanup header inclusion to make things work even with gtk HEAD
parent e0683284
......@@ -12,13 +12,12 @@ Release Critical
http://bugzilla.gnome.org/show_bug.cgi?id=123342 [gda borkage]
http://bugzilla.gnome.org/show_bug.cgi?id=123325 [countif]
http://bugzilla.gnome.org/show_bug.cgi?id=122085 [vlookup]
http://bugzilla.gnome.org/show_bug.cgi?id=123270
- static float and string GODataScalar support
- xls import for chart text
- xls import for user supplied axis bounds
- Verify histogram tool. Feels fubar.
"_Fixed" and "_Forward" share F-key on STF's first page.
- "_Fixed" and "_Forward" share F-key on STF's first page.
-------------------------------------------------------------------------------
Pending Patches
......
......@@ -34,6 +34,7 @@ Jody:
* Fix import typo that broke xls import of local hyperlinks
* Draw marker and lines for legend elements that support them
* Memory error when adding a series to a bar/col/line/area plot
* Cleanup header inclusion to make things work even with gtk HEAD
John Gill:
* Heuristics to improve finger feel of autofilter range selection
......
......@@ -25,7 +25,9 @@
#include <gnumeric-gconf.h>
#include <gsf/gsf-impl-utils.h>
#include <gtk/gtk.h>
#include <gtk/gtkmain.h>
#include <gtk/gtkiconfactory.h>
#include <gtk/gtkselection.h>
enum {
APPLICATION_PROP_0,
......@@ -453,7 +455,10 @@ gboolean application_use_auto_complete (void) { return gnm_app_prefs->auto_com
gboolean application_live_scrolling (void) { return gnm_app_prefs->live_scrolling; }
int application_auto_expr_recalc_lag (void) { return gnm_app_prefs->recalc_lag; }
gboolean application_use_transition_keys (void) { return gnm_app_prefs->transition_keys; }
void application_set_transition_keys (gboolean state) { gnm_app_prefs->transition_keys = state; }
void application_set_transition_keys (gboolean state)
{
((GnmAppPrefs *)gnm_app_prefs)->transition_keys = state;
}
GConfClient *
application_get_gconf_client (void)
......
......@@ -38,6 +38,9 @@
#include <src/mathfunc.h>
#include <gtk/gtktable.h>
#include <gtk/gtkcheckbutton.h>
#include <gtk/gtknotebook.h>
#include <gtk/gtklabel.h>
#include <gtk/gtkmisc.h>
#include <glade/glade-xml.h>
struct _GogAxis {
......
......@@ -41,6 +41,18 @@
#include <libfoocanvas/foo-canvas-pixbuf.h>
#include <libfoocanvas/foo-canvas-rect-ellipse.h>
#include <gdk/gdkkeysyms.h>
#include <gtk/gtknotebook.h>
#include <gtk/gtklabel.h>
#include <gtk/gtktreeselection.h>
#include <gtk/gtktreeview.h>
#include <gtk/gtktreestore.h>
#include <gtk/gtkimage.h>
#include <gtk/gtkimagemenuitem.h>
#include <gtk/gtkframe.h>
#include <gtk/gtkvbox.h>
#include <gtk/gtkcellrenderertext.h>
#include <gtk/gtkcellrendererpixbuf.h>
#include <gtk/gtkstock.h>
#include <string.h>
typedef struct _GraphGuruState GraphGuruState;
......
......@@ -33,6 +33,9 @@
#include <src/gnumeric-i18n.h>
#include <gsf/gsf-impl-utils.h>
#include <gtk/gtknotebook.h>
#include <gtk/gtklabel.h>
#include <gtk/gtkbox.h>
struct _GogLabel {
GogStyledObject base;
......
......@@ -33,6 +33,7 @@
#include <gtk/gtktable.h>
#include <gtk/gtklabel.h>
#include <gtk/gtkhseparator.h>
#include <gtk/gtknotebook.h>
#include <string.h>
......
......@@ -29,6 +29,11 @@
#include <src/gui-util.h>
#include <glade/glade-xml.h>
#include <gtk/gtkspinbutton.h>
#include <gtk/gtklabel.h>
#include <gtk/gtkimage.h>
#include <gtk/gtkrange.h>
#include <gtk/gtkoptionmenu.h>
#include <gtk/gtknotebook.h>
#include <widgets/widget-color-combo.h>
#include <widgets/color-palette.h>
#include <widgets/widget-pixmap-combo.h>
......
......@@ -26,6 +26,7 @@
#include <glade/glade-xml.h>
#include <gtk/gtkspinbutton.h>
#include <gtk/gtktogglebutton.h>
GtkWidget *gog_pie_plot_pref (GogPiePlot *plot, CommandContext *cc);
......
......@@ -28,7 +28,6 @@
*/
#include <gnumeric-config.h>
#include <gtk/gtk.h>
#include <libfoocanvas/foo-canvas.h>
#include <gdk/gdkcolor.h>
#include <gnumeric-i18n.h>
......@@ -38,6 +37,7 @@
#include "color-palette.h"
#include <gui-util.h>
#include <style-color.h>
#include <gtk/gtklabel.h>
#include <string.h>
......
......@@ -30,9 +30,11 @@
#ifndef GNUMERIC_COLOR_PALETTE_H
#define GNUMERIC_COLOR_PALETTE_H
#include <gtk/gtk.h>
#include <libgnomeui/gnome-color-picker.h>
#include <widgets/color-group.h>
#include <gtk/gtkvbox.h>
#include <gtk/gtktooltips.h>
#include <gtk/gtktable.h>
G_BEGIN_DECLS
......
......@@ -25,13 +25,19 @@
*/
#include <gnumeric-config.h>
#include <gtk/gtk.h>
#include <gdk/gdkkeysyms.h>
#include "gtk-combo-box.h"
#include <gnm-marshalers.h>
#include <gsf/gsf-impl-utils.h>
#include <gtk/gtktogglebutton.h>
#include <gtk/gtktearoffmenuitem.h>
#include <gtk/gtkwindow.h>
#include <gtk/gtkmain.h>
#include <gtk/gtkarrow.h>
#include <gtk/gtkeventbox.h>
#include <gtk/gtkvbox.h>
#include <gtk/gtkframe.h>
#define PARENT_TYPE GTK_TYPE_HBOX
static GObjectClass *gtk_combo_box_parent_class;
static int gtk_combo_toggle_pressed (GtkToggleButton *tbutton,
......@@ -474,7 +480,9 @@ gtk_combo_box_init (GtkComboBox *combo_box)
G_CALLBACK (gtk_combo_box_key_press), combo_box);
}
GSF_CLASS(GtkComboBox,gtk_combo_box,gtk_combo_box_class_init,gtk_combo_box_init,PARENT_TYPE)
GSF_CLASS (GtkComboBox, gtk_combo_box,
gtk_combo_box_class_init, gtk_combo_box_init,
GTK_TYPE_HBOX)
/**
* gtk_combo_box_set_display:
......
......@@ -24,7 +24,7 @@
#ifndef _GTK_COMBO_BOX_H_
#define _GTK_COMBO_BOX_H_
#include <gtk/gtk.h>
#include <gtk/gtkhbox.h>
G_BEGIN_DECLS
......
......@@ -30,7 +30,6 @@
#include <gnumeric-config.h>
#include <gtk/gtk.h>
#include <libfoocanvas/foo-canvas.h>
#include <libfoocanvas/foo-canvas-pixbuf.h>
#include <libfoocanvas/foo-canvas-rect-ellipse.h>
......@@ -39,8 +38,7 @@
#include <gui-util.h>
#include <style-color.h>
#include "widget-color-combo.h"
#include <gnm-marshalers.h>
#include <gsf/gsf-impl-utils.h>
#include <gtk/gtkimage.h>
enum {
CHANGED,
......
......@@ -33,7 +33,6 @@
#ifndef GNUMERIC_WIDGET_COLOR_COMBO_H
#define GNUMERIC_WIDGET_COLOR_COMBO_H
#include <gtk/gtk.h>
#include <widgets/gtk-combo-box.h>
#include <libfoocanvas/foo-canvas.h>
#include <widgets/color-palette.h>
......
......@@ -22,12 +22,15 @@
*/
#include <gnumeric-config.h>
#include <gtk/gtk.h>
#include <gnumeric-i18n.h>
#include "gtk-combo-box.h"
#include "widget-pixmap-combo.h"
#include <gnm-marshalers.h>
#include <gsf/gsf-impl-utils.h>
#include <gtk/gtkwindow.h>
#include <gtk/gtktable.h>
#include <gtk/gtkbutton.h>
#include <gtk/gtkimage.h>
#define PIXMAP_PREVIEW_WIDTH 15
#define PIXMAP_PREVIEW_HEIGHT 15
......
......@@ -25,6 +25,7 @@
#define GNUMERIC_WIDGET_PIXMAP_COMBO_H
#include <widgets/gtk-combo-box.h>
#include <gtk/gtktooltips.h>
G_BEGIN_DECLS
......
......@@ -568,7 +568,7 @@ go_marker_selector (GOColor outline_color, GOColor fill_color)
{ NULL, NULL, GO_MARKER_HALF_BAR},
{ NULL, NULL, GO_MARKER_BUTTERFLY},
{ NULL, NULL, GO_MARKER_HOURGLASS},
{ NULL, NULL, NULL }
{ NULL, NULL, 0 }
};
guint i, length;
......
......@@ -33,7 +33,11 @@
#include "gui-util.h"
#include "workbook-control-gui.h"
#include "selection.h"
#include <gtk/gtk.h>
#include <gtk/gtktogglebutton.h>
#include <gtk/gtknotebook.h>
#include <gtk/gtkoptionmenu.h>
#include <gtk/gtktable.h>
const char *output_group[] = {
"newsheet-button",
......
......@@ -39,6 +39,8 @@
#include <workbook-edit.h>
#include <glade/glade.h>
#include <gtk/gtklabel.h>
#include <gtk/gtktogglebutton.h>
#include <widgets/gnumeric-expr-entry.h>
#include "filter.h"
......
......@@ -52,6 +52,9 @@
#include <glade/glade.h>
#include <string.h>
#include <gdk/gdkkeysyms.h>
#include <gtk/gtktable.h>
#include <gtk/gtktogglebutton.h>
#include <gtk/gtklabel.h>
/**********************************************/
/* Generic guru items */
......
......@@ -42,6 +42,10 @@
#include <glade/glade.h>
#include <gsf/gsf-impl-utils.h>
#include <gdk/gdkkeysyms.h>
#include <gtk/gtktreeselection.h>
#include <gtk/gtktreeview.h>
#include <gtk/gtkcellrenderertext.h>
#include <gtk/gtktogglebutton.h>
#include <string.h>
#include "help.h"
......
......@@ -35,6 +35,9 @@
#include <number-match.h>
#include <glade/glade.h>
#include <gtk/gtkoptionmenu.h>
#include <gtk/gtktogglebutton.h>
#include <gtk/gtkspinbutton.h>
#include <string.h>
typedef struct {
......
......@@ -47,6 +47,10 @@
#include <libfoocanvas/foo-canvas-rect-ellipse.h>
#include <glade/glade.h>
#include <gtk/gtkoptionmenu.h>
#include <gtk/gtkframe.h>
#include <gtk/gtkvscrollbar.h>
#include <gtk/gtkcheckmenuitem.h>
#include <gsf/gsf-impl-utils.h>
#include <string.h>
......
......@@ -32,6 +32,7 @@
#include <gui-util.h>
#include <glade/glade.h>
#include <gtk/gtktogglebutton.h>
typedef struct {
GladeXML *gui;
......
......@@ -30,7 +30,6 @@
#include <sheet-object-cell-comment.h>
#include <workbook-edit.h>
#include <ranges.h>
#include <gtk/gtk.h>
#include <commands.h>
#define COMMENT_DIALOG_KEY "cell-comment-dialog"
......
......@@ -62,6 +62,19 @@
#include <libart_lgpl/art_pixbuf.h>
#include <libart_lgpl/art_rgb_pixbuf_affine.h>
#include <glade/glade.h>
#include <gtk/gtklabel.h>
#include <gtk/gtknotebook.h>
#include <gtk/gtkcheckbutton.h>
#include <gtk/gtkspinbutton.h>
#include <gtk/gtktogglebutton.h>
#include <gtk/gtkframe.h>
#include <gtk/gtkimage.h>
#include <gtk/gtkoptionmenu.h>
#include <gtk/gtktextview.h>
#include <gtk/gtkstock.h>
#include <libgnomecanvas/gnome-canvas-util.h>
#include <libgnomecanvas/gnome-canvas-rect-ellipse.h>
#include <libgnomecanvas/gnome-canvas-pixbuf.h>
#include <pango/pangoft2.h>
#include <widgets/widget-color-combo.h>
......
......@@ -46,6 +46,13 @@
#include <value.h>
#include <glade/glade.h>
#include <gtk/gtktable.h>
#include <gtk/gtktogglebutton.h>
#include <gtk/gtkstock.h>
#include <gtk/gtktreeview.h>
#include <gtk/gtktreeselection.h>
#include <gtk/gtkcellrenderer.h>
#include <gtk/gtkcellrenderertext.h>
#include <gsf/gsf-impl-utils.h>
#include <stdio.h>
......
......@@ -32,6 +32,8 @@
#include <workbook-edit.h>
#include <glade/glade.h>
#include <gtk/gtkframe.h>
#include <gtk/gtktogglebutton.h>
#define COL_ROW_DIALOG_KEY "col-row-dialog"
......
......@@ -37,6 +37,9 @@
#include <workbook-cmd-format.h>
#include <glade/glade.h>
#include <gtk/gtkspinbutton.h>
#include <gtk/gtktogglebutton.h>
#include <gtk/gtklabel.h>
#define COL_WIDTH_DIALOG_KEY "col-width-dialog"
......
......@@ -39,6 +39,11 @@
#include <workbook-edit.h>
#include <dao-gui-utils.h>
#include <tools/dao.h>
#include <gtk/gtkoptionmenu.h>
#include <gtk/gtktogglebutton.h>
#include <gtk/gtkcheckbutton.h>
#include <gtk/gtktreeselection.h>
#include <gtk/gtkcellrendererpixbuf.h>
#include <string.h>
......
......@@ -43,6 +43,13 @@
#include <widgets/gnumeric-expr-entry.h>
#include <glade/glade.h>
#include <gtk/gtktreeselection.h>
#include <gtk/gtkliststore.h>
#include <gtk/gtkentry.h>
#include <gtk/gtktogglebutton.h>
#include <gtk/gtktable.h>
#include <gtk/gtklabel.h>
#include <gtk/gtkcellrenderertext.h>
#include <string.h>
#define DEFINE_NAMES_KEY "define-names-dialog"
......
......@@ -37,6 +37,7 @@
#include <command-context.h>
#include <glade/glade.h>
#include <gtk/gtkradiobutton.h>
#define DELETE_CELL_DIALOG_KEY "delete-cells-dialog"
......
......@@ -47,6 +47,8 @@
#include <dao-gui-utils.h>
#include <glade/glade.h>
#include <gtk/gtkradiobutton.h>
#include <gtk/gtktogglebutton.h>
#include "fill-series.h"
#define FILL_SERIES_KEY "fill-series-dialog"
......
......@@ -45,6 +45,10 @@
#include <widgets/gnumeric-cell-renderer-expr-entry.h>
#include <gdk/gdkkeysyms.h>
#include <gtk/gtktreestore.h>
#include <gtk/gtktreeview.h>
#include <gtk/gtktreeselection.h>
#include <gtk/gtktogglebutton.h>
#include <locale.h>
#include <string.h>
......
......@@ -39,6 +39,11 @@
#include <gsf/gsf-impl-utils.h>
#include <glade/glade.h>
#include <gtk/gtktreestore.h>
#include <gtk/gtktreeview.h>
#include <gtk/gtktreeselection.h>
#include <gtk/gtkcellrenderertext.h>
#include <gtk/gtkpaned.h>
#include <string.h>
#define FUNCTION_SELECT_KEY "function-selector-dialog"
......
......@@ -47,6 +47,8 @@
#include <mathfunc.h>
#include <widgets/gnumeric-expr-entry.h>
#include <selection.h>
#include <gtk/gtklabel.h>
#include <gtk/gtktable.h>
#include <math.h>
......
......@@ -39,6 +39,12 @@
#include <workbook-edit.h>
#include <libgnomeui/gnome-entry.h>
#include <gtk/gtktreestore.h>
#include <gtk/gtktreeview.h>
#include <gtk/gtktreeselection.h>
#include <gtk/gtktable.h>
#include <gtk/gtkscrolledwindow.h>
#include <gtk/gtkcellrenderertext.h>
#define GOTO_KEY "goto-dialog"
......
......@@ -37,6 +37,13 @@
#include <value.h>
#include <workbook-edit.h>
#include <gnumeric-i18n.h>
#include <gtk/gtkimage.h>
#include <gtk/gtklabel.h>
#include <gtk/gtksizegroup.h>
#include <gtk/gtklabel.h>
#include <gtk/gtkimagemenuitem.h>
#include <gtk/gtkoptionmenu.h>
#include <string.h>
typedef struct {
......
......@@ -37,6 +37,7 @@
#include <command-context.h>
#include <glade/glade.h>
#include <gtk/gtkradiobutton.h>
#define INSERT_CELL_DIALOG_KEY "insert-cells-dialog"
......
......@@ -42,6 +42,12 @@
#include <widgets/gnumeric-expr-entry.h>
#include <glade/glade.h>
#include <gtk/gtktreeview.h>
#include <gtk/gtkliststore.h>
#include <gtk/gtktreeselection.h>
#include <gtk/gtktable.h>
#include <gtk/gtklabel.h>
#include <gtk/gtkcellrenderertext.h>
#define MERGE_KEY "merge-dialog"
......
......@@ -30,6 +30,12 @@
#include <clipboard.h>
#include <dependent.h>
#include <cmd-edit.h>
#include <gtk/gtktogglebutton.h>
#include <gtk/gtkcheckbutton.h>
#include <gtk/gtkradiobutton.h>
#include <gtk/gtkstock.h>
#include <gtk/gtkframe.h>
#include <gtk/gtkvbox.h>
#define BUTTON_PASTE_LINK 0
......
......@@ -43,6 +43,14 @@
#include <application.h>
#include <glade/glade.h>
#include <gtk/gtknotebook.h>
#include <gtk/gtktreeview.h>
#include <gtk/gtktreestore.h>
#include <gtk/gtktreeselection.h>
#include <gtk/gtkcellrenderertoggle.h>
#include <gtk/gtkcellrenderertext.h>
#include <gtk/gtkliststore.h>
#include <gtk/gtkcheckbutton.h>
#include <gsf/gsf-impl-utils.h>
#include <string.h>
......
......@@ -43,7 +43,19 @@
#include <gui-util.h>
#include <glade/glade.h>
#include <gtk/gtk.h>
#include <gtk/gtktreeview.h>
#include <gtk/gtktreestore.h>
#include <gtk/gtktreeselection.h>
#include <gtk/gtkscrolledwindow.h>
#include <gtk/gtkcellrendererpixbuf.h>
#include <gtk/gtknotebook.h>
#include <gtk/gtkimage.h>
#include <gtk/gtklabel.h>
#include <gtk/gtktable.h>
#include <gtk/gtkstock.h>
#include <gtk/gtkcheckbutton.h>
#include <gtk/gtkspinbutton.h>
#include <gtk/gtktogglebutton.h>
#include <string.h>
enum {
......
......@@ -48,6 +48,11 @@
#include <libfoocanvas/foo-canvas-text.h>
#include <libfoocanvas/foo-canvas-rect-ellipse.h>
#include <glade/glade.h>
#include <gtk/gtkspinbutton.h>
#include <gtk/gtknotebook.h>
#include <gtk/gtktable.h>
#include <gtk/gtktogglebutton.h>
#include <gtk/gtkoptionmenu.h>
#include <stdio.h>
/* FIXME: do not hardcode pixel counts. */
......
......@@ -50,6 +50,8 @@
#include <gdk/gdkkeysyms.h>
#include <glade/glade.h>
#include <gtk/gtklabel.h>
#include <gtk/gtktable.h>
#include <string.h>
......
......@@ -37,6 +37,9 @@
#include <workbook-cmd-format.h>
#include <glade/glade.h>
#include <gtk/gtkspinbutton.h>
#include <gtk/gtktogglebutton.h>
#include <gtk/gtklabel.h>
#define ROW_HEIGHT_DIALOG_KEY "row-height-dialog"
......
......@@ -38,7 +38,10 @@
#include <value.h>
#include <dao.h>
#include "scenarios.h"
#include <glade/glade.h>
#include <gtk/gtktreeselection.h>
#include <gtk/gtkcellrenderertext.h>
#include <string.h>
typedef struct {
......
......@@ -33,6 +33,9 @@
#include <libgnomeui/gnome-entry.h>
#include <glade/glade.h>
#include <gtk/gtktogglebutton.h>
#include <gtk/gtktable.h>
#include <gtk/gtkstock.h>
#include <string.h>
#define SEARCH_REPLACE_KEY "search-replace-dialog"
......
......@@ -43,6 +43,12 @@
#include <widgets/gnumeric-lazy-list.h>
#include <libgnomeui/gnome-entry.h>
#include <glade/glade.h>
#include <gtk/gtknotebook.h>
#include <gtk/gtktreeview.h>
#include <gtk/gtktogglebutton.h>
#include <gtk/gtkscrolledwindow.h>
#include <gtk/gtkcellrenderertext.h>
#include <gtk/gtktable.h>
#include <string.h>
#define SEARCH_KEY "search-dialog"
......@@ -158,12 +164,12 @@ search_get_value (gint row, gint column, gpointer _dd, GValue *value)
g_value_set_string (value, cell_comment_text_get (item->comment));
return;
case SRL_value:
g_value_set_string_take_ownership
(value, value_get_as_string (cell->value));
g_value_set_string_take_ownership (value,
value_get_as_string (cell->value));
return;
case SRL_contents:
g_value_set_string_take_ownership
(value, cell_get_entered_text (cell));
g_value_set_string_take_ownership (value,
cell_get_entered_text (cell));
return;
#ifndef DEBUG_SWITCH_ENUM
default:
......
......@@ -44,6 +44,9 @@
#include <glade/glade.h>
#include <widgets/widget-color-combo.h>
#include <gtk/gtktreeview.h>
#include <gtk/gtktreeselection.h>
#include <gtk/gtkstock.h>
#include <string.h>
#include <stdio.h>
......
......@@ -41,6 +41,8 @@
#include <selection.h>
#include <glade/glade.h>
#include <gtk/gtklabel.h>
#include <gtk/gtktogglebutton.h>
#include <widgets/gnumeric-expr-entry.h>
#include "data-shuffling.h"
......
......@@ -39,6 +39,10 @@
#include "simulation.h"
#include <string.h>
#include <gtk/gtklabel.h>
#include <gtk/gtktreeview.h>
#include <gtk/gtkspinbutton.h>
#include <gtk/gtkcellrenderertext.h>
#define SIMULATION_KEY "simulation-dialog"
......
......@@ -45,6 +45,11 @@
#include <widgets/gnumeric-expr-entry.h>
#include <glade/glade.h>
#include <gtk/gtkoptionmenu.h>
#include <gtk/gtkclist.h>
#include <gtk/gtktogglebutton.h>
#include <gtk/gtkspinbutton.h>
#include <gtk/gtktable.h>
#include <string.h>
#include <scenarios.h>
......
......@@ -24,7 +24,6 @@
#include <gnumeric-config.h>
#include <gnumeric.h>
#include "dialog-stf-export-private.h"
#include "gtk/gtk.h"
/*
* Index of "Custom" in the separator optionmenu