diff options
Diffstat (limited to 'src/widgets')
39 files changed, 36 insertions, 79 deletions
diff --git a/src/widgets/button.h b/src/widgets/button.h index f14af94d1..26191f524 100644 --- a/src/widgets/button.h +++ b/src/widgets/button.h @@ -16,9 +16,7 @@ #define SP_BUTTON(o) (GTK_CHECK_CAST ((o), SP_TYPE_BUTTON, SPButton)) #define SP_IS_BUTTON(o) (GTK_CHECK_TYPE ((o), SP_TYPE_BUTTON)) -#include <gtk/gtkwidget.h> -#include <gtk/gtktogglebutton.h> -#include <gtk/gtktooltips.h> +#include <gtk/gtk.h> #include "helper/action.h" #include "icon-size.h" diff --git a/src/widgets/desktop-widget.h b/src/widgets/desktop-widget.h index 53d9dd1bc..c045d6e28 100644 --- a/src/widgets/desktop-widget.h +++ b/src/widgets/desktop-widget.h @@ -12,8 +12,7 @@ * ? -2004 */ -#include <gtk/gtktooltips.h> -#include <gtk/gtkwindow.h> +#include <gtk/gtk.h> #include "libnr/nr-point.h" #include "forward.h" diff --git a/src/widgets/eek-preview.h b/src/widgets/eek-preview.h index 49fe8e660..c15f25eb6 100644 --- a/src/widgets/eek-preview.h +++ b/src/widgets/eek-preview.h @@ -40,8 +40,8 @@ #ifndef SEEN_EEK_PREVIEW_H #define SEEN_EEK_PREVIEW_H -#include <gdk/gdkpixbuf.h> -#include <gtk/gtkdrawingarea.h> +#include <gdk/gdk.h> +#include <gtk/gtk.h> G_BEGIN_DECLS diff --git a/src/widgets/fill-style.cpp b/src/widgets/fill-style.cpp index b4272a3a4..c6e97666a 100644 --- a/src/widgets/fill-style.cpp +++ b/src/widgets/fill-style.cpp @@ -23,7 +23,7 @@ #include <glibmm/i18n.h> #include <gtkmm/box.h> -#include <gtk/gtkvbox.h> +#include <gtk/gtk.h> #include "desktop.h" #include "selection.h" diff --git a/src/widgets/font-selector.cpp b/src/widgets/font-selector.cpp index 6cc73e42f..efeaa980c 100644 --- a/src/widgets/font-selector.cpp +++ b/src/widgets/font-selector.cpp @@ -32,13 +32,6 @@ #include <2geom/transforms.h> #include <gtk/gtk.h> -#include <gtk/gtkframe.h> -#include <gtk/gtkscrolledwindow.h> -#include <gtk/gtkclist.h> -#include <gtk/gtkvbox.h> -#include <gtk/gtkcombo.h> -#include <gtk/gtkentry.h> -#include <gtk/gtkdrawingarea.h> #include "../display/nr-plain-stuff-gdk.h" #include <glibmm/i18n.h> diff --git a/src/widgets/font-selector.h b/src/widgets/font-selector.h index 6ab2a1a12..61e607ac7 100644 --- a/src/widgets/font-selector.h +++ b/src/widgets/font-selector.h @@ -28,7 +28,7 @@ struct SPFontPreview; #define SP_IS_FONT_PREVIEW(o) (GTK_CHECK_TYPE ((o), SP_TYPE_FONT_PREVIEW)) #include <libnrtype/nrtype-forward.h> -#include <gtk/gtkwidget.h> +#include <gtk/gtk.h> /* SPFontSelector */ diff --git a/src/widgets/gradient-image.h b/src/widgets/gradient-image.h index 7b3854a02..a998dcff3 100644 --- a/src/widgets/gradient-image.h +++ b/src/widgets/gradient-image.h @@ -13,7 +13,7 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include <gtk/gtkwidget.h> +#include <gtk/gtk.h> #include "../libnr/nr-matrix.h" class SPGradient; diff --git a/src/widgets/gradient-selector.cpp b/src/widgets/gradient-selector.cpp index 9b1664ac3..9a907e78b 100644 --- a/src/widgets/gradient-selector.cpp +++ b/src/widgets/gradient-selector.cpp @@ -16,11 +16,7 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif -#include <gtk/gtkhbox.h> -#include <gtk/gtklabel.h> -#include <gtk/gtkoptionmenu.h> -#include <gtk/gtkmenuitem.h> -#include <gtk/gtktooltips.h> +#include <gtk/gtk.h> #include "document.h" #include "../document-private.h" diff --git a/src/widgets/gradient-selector.h b/src/widgets/gradient-selector.h index 860804ec6..9abbc57af 100644 --- a/src/widgets/gradient-selector.h +++ b/src/widgets/gradient-selector.h @@ -16,7 +16,7 @@ */ #include <glib.h> -#include <gtk/gtkvbox.h> +#include <gtk/gtk.h> #include <vector> #include "sp-gradient.h" #include "sp-gradient-spread.h" diff --git a/src/widgets/gradient-toolbar.h b/src/widgets/gradient-toolbar.h index 41138724a..f1e258f6b 100644 --- a/src/widgets/gradient-toolbar.h +++ b/src/widgets/gradient-toolbar.h @@ -12,7 +12,7 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include <gtk/gtkwidget.h> +#include <gtk/gtk.h> struct SPDesktop; GtkWidget *sp_gradient_toolbox_new (SPDesktop *desktop); diff --git a/src/widgets/gradient-vector.h b/src/widgets/gradient-vector.h index 012d4e9a3..ac40aded0 100644 --- a/src/widgets/gradient-vector.h +++ b/src/widgets/gradient-vector.h @@ -20,7 +20,7 @@ #include <stddef.h> #include <sigc++/connection.h> -#include <gtk/gtkvbox.h> +#include <gtk/gtk.h> #include "../forward.h" #define SP_TYPE_GRADIENT_VECTOR_SELECTOR (sp_gradient_vector_selector_get_type ()) diff --git a/src/widgets/icon.h b/src/widgets/icon.h index a20fad73a..371f6ba87 100644 --- a/src/widgets/icon.h +++ b/src/widgets/icon.h @@ -22,7 +22,7 @@ #define SP_ICON(o) (GTK_CHECK_CAST ((o), SP_TYPE_ICON, SPIcon)) #define SP_IS_ICON(o) (GTK_CHECK_TYPE ((o), SP_TYPE_ICON)) -#include <gtk/gtkwidget.h> +#include <gtk/gtk.h> struct SPIconClass { GtkWidgetClass parent_class; diff --git a/src/widgets/paint-selector.cpp b/src/widgets/paint-selector.cpp index f0b55cf13..610930a46 100644 --- a/src/widgets/paint-selector.cpp +++ b/src/widgets/paint-selector.cpp @@ -23,14 +23,7 @@ #include <cstring> #include <string> -#include <gtk/gtkhbox.h> -#include <gtk/gtkradiobutton.h> -#include <gtk/gtkframe.h> -#include <gtk/gtklabel.h> -#include <gtk/gtkoptionmenu.h> -#include <gtk/gtktooltips.h> -#include <gtk/gtkmenuitem.h> -#include <gtk/gtkseparatormenuitem.h> +#include <gtk/gtk.h> #include "../sp-pattern.h" #include <glibmm/i18n.h> diff --git a/src/widgets/paint-selector.h b/src/widgets/paint-selector.h index f3aff5a68..eb3eb2008 100644 --- a/src/widgets/paint-selector.h +++ b/src/widgets/paint-selector.h @@ -27,7 +27,7 @@ class SPGradient; #define SP_IS_PAINT_SELECTOR(o) (GTK_CHECK_TYPE ((o), SP_TYPE_PAINT_SELECTOR)) #define SP_IS_PAINT_SELECTOR_CLASS(k) (GTK_CHECK_CLASS_TYPE ((k), SP_TYPE_PAINT_SELECTOR)) -#include <gtk/gtkvbox.h> +#include <gtk/gtk.h> #include "../forward.h" #include <color.h> diff --git a/src/widgets/ruler.h b/src/widgets/ruler.h index 7a3509325..fed3caaf0 100644 --- a/src/widgets/ruler.h +++ b/src/widgets/ruler.h @@ -13,7 +13,7 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include <gtk/gtkruler.h> +#include <gtk/gtk.h> #include "sp-metric.h" #include <iostream> #include <glib.h> diff --git a/src/widgets/select-toolbar.cpp b/src/widgets/select-toolbar.cpp index e08b4ac61..108fae1ef 100644 --- a/src/widgets/select-toolbar.cpp +++ b/src/widgets/select-toolbar.cpp @@ -17,7 +17,6 @@ #endif #include <gtk/gtk.h> -#include <gtk/gtkaction.h> #include "widgets/button.h" #include "widgets/spw-utilities.h" diff --git a/src/widgets/select-toolbar.h b/src/widgets/select-toolbar.h index dbab1975a..a4c42880f 100644 --- a/src/widgets/select-toolbar.h +++ b/src/widgets/select-toolbar.h @@ -14,8 +14,7 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include <gtk/gtkactiongroup.h> -#include <gtk/gtkstyle.h> +#include <gtk/gtk.h> struct SPDesktop; void sp_select_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GObject* holder); diff --git a/src/widgets/shrink-wrap-button.cpp b/src/widgets/shrink-wrap-button.cpp index d73f972d9..e0c9e3cd1 100644 --- a/src/widgets/shrink-wrap-button.cpp +++ b/src/widgets/shrink-wrap-button.cpp @@ -10,7 +10,7 @@ */ #include <gtkmm/button.h> -#include <gtk/gtkbin.h> +#include <gtk/gtk.h> namespace Inkscape { namespace Widgets { diff --git a/src/widgets/sp-attribute-widget.cpp b/src/widgets/sp-attribute-widget.cpp index a64a03f4e..66ccb27f2 100644 --- a/src/widgets/sp-attribute-widget.cpp +++ b/src/widgets/sp-attribute-widget.cpp @@ -9,8 +9,7 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include <gtk/gtktable.h> -#include <gtk/gtklabel.h> +#include <gtk/gtk.h> #include "xml/repr.h" #include "macros.h" #include "document.h" diff --git a/src/widgets/sp-attribute-widget.h b/src/widgets/sp-attribute-widget.h index 617c5b012..647ebd6d8 100644 --- a/src/widgets/sp-attribute-widget.h +++ b/src/widgets/sp-attribute-widget.h @@ -42,8 +42,7 @@ struct SPAttributeWidgetClass; struct SPAttributeTable; struct SPAttributeTableClass; -#include <gtk/gtkentry.h> -#include <gtk/gtkvbox.h> +#include <gtk/gtk.h> #include <forward.h> diff --git a/src/widgets/sp-color-gtkselector.h b/src/widgets/sp-color-gtkselector.h index b9b2b0862..a85d94a5b 100644 --- a/src/widgets/sp-color-gtkselector.h +++ b/src/widgets/sp-color-gtkselector.h @@ -1,7 +1,7 @@ #ifndef SEEN_SP_COLOR_GTKSELECTOR_H #define SEEN_SP_COLOR_GTKSELECTOR_H -#include <gtk/gtkcolorsel.h> +#include <gtk/gtk.h> #include "../color.h" #include "sp-color-selector.h" diff --git a/src/widgets/sp-color-icc-selector.cpp b/src/widgets/sp-color-icc-selector.cpp index 12467041c..72134c48f 100644 --- a/src/widgets/sp-color-icc-selector.cpp +++ b/src/widgets/sp-color-icc-selector.cpp @@ -2,12 +2,7 @@ # include "config.h" #endif #include <math.h> -#include <gtk/gtkbutton.h> #include <gtk/gtk.h> -#include <gtk/gtksignal.h> -#include <gtk/gtklabel.h> -#include <gtk/gtktable.h> -#include <gtk/gtkspinbutton.h> #include <glibmm/i18n.h> #include "../dialogs/dialog-events.h" #include "sp-color-icc-selector.h" @@ -25,7 +20,6 @@ #ifdef DEBUG_LCMS #include "preferences.h" -#include <gtk/gtkmessagedialog.h> #endif // DEBUG_LCMS #endif // ENABLE_LCMS diff --git a/src/widgets/sp-color-icc-selector.h b/src/widgets/sp-color-icc-selector.h index 9fd80c04a..f40d93189 100644 --- a/src/widgets/sp-color-icc-selector.h +++ b/src/widgets/sp-color-icc-selector.h @@ -2,8 +2,7 @@ #define SEEN_SP_COLOR_ICC_SELECTOR_H #include <glib/gtypes.h> -#include <gtk/gtktooltips.h> -#include <gtk/gtkvbox.h> +#include <gtk/gtk.h> #include "../color.h" #include "sp-color-slider.h" diff --git a/src/widgets/sp-color-notebook.h b/src/widgets/sp-color-notebook.h index 0b9b2ed87..b17612e03 100644 --- a/src/widgets/sp-color-notebook.h +++ b/src/widgets/sp-color-notebook.h @@ -12,9 +12,7 @@ * This code is in public domain */ -#include <gtk/gtkvbox.h> -#include <gtk/gtknotebook.h> -#include <gtk/gtkentry.h> +#include <gtk/gtk.h> #include "../color.h" #include "sp-color-selector.h" diff --git a/src/widgets/sp-color-preview.h b/src/widgets/sp-color-preview.h index 32572e915..731aceb70 100644 --- a/src/widgets/sp-color-preview.h +++ b/src/widgets/sp-color-preview.h @@ -13,7 +13,7 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include <gtk/gtkwidget.h> +#include <gtk/gtk.h> #include <glib.h> diff --git a/src/widgets/sp-color-scales.h b/src/widgets/sp-color-scales.h index 21a85a08e..b50c386e8 100644 --- a/src/widgets/sp-color-scales.h +++ b/src/widgets/sp-color-scales.h @@ -2,8 +2,7 @@ #define SEEN_SP_COLOR_SCALES_H #include <glib/gtypes.h> -#include <gtk/gtktooltips.h> -#include <gtk/gtkvbox.h> +#include <gtk/gtk.h> #include <color.h> #include <widgets/sp-color-slider.h> diff --git a/src/widgets/sp-color-selector.cpp b/src/widgets/sp-color-selector.cpp index c6f13b391..794cbdb42 100644 --- a/src/widgets/sp-color-selector.cpp +++ b/src/widgets/sp-color-selector.cpp @@ -7,7 +7,7 @@ # include "config.h" #endif #include <math.h> -#include <gtk/gtksignal.h> +#include <gtk/gtk.h> #include <glibmm/i18n.h> #include "sp-color-selector.h" diff --git a/src/widgets/sp-color-selector.h b/src/widgets/sp-color-selector.h index 3b35140ed..2030d02ff 100644 --- a/src/widgets/sp-color-selector.h +++ b/src/widgets/sp-color-selector.h @@ -1,7 +1,7 @@ #ifndef SEEN_SP_COLOR_SELECTOR_H #define SEEN_SP_COLOR_SELECTOR_H -#include <gtk/gtkvbox.h> +#include <gtk/gtk.h> #include "../color.h" #include <glib.h> diff --git a/src/widgets/sp-color-slider.cpp b/src/widgets/sp-color-slider.cpp index 0690caaab..09d2a87ab 100644 --- a/src/widgets/sp-color-slider.cpp +++ b/src/widgets/sp-color-slider.cpp @@ -10,8 +10,7 @@ * This code is in public domain */ -#include <gtk/gtkversion.h> -#include <gtk/gtksignal.h> +#include <gtk/gtk.h> #include "sp-color-scales.h" #include "preferences.h" diff --git a/src/widgets/sp-color-slider.h b/src/widgets/sp-color-slider.h index bdeb3e4b6..8b0bcb9a9 100644 --- a/src/widgets/sp-color-slider.h +++ b/src/widgets/sp-color-slider.h @@ -12,7 +12,7 @@ * This code is in public domain */ -#include <gtk/gtkwidget.h> +#include <gtk/gtk.h> #include <glib.h> diff --git a/src/widgets/sp-color-wheel-selector.cpp b/src/widgets/sp-color-wheel-selector.cpp index 784dd23ad..147c91525 100644 --- a/src/widgets/sp-color-wheel-selector.cpp +++ b/src/widgets/sp-color-wheel-selector.cpp @@ -2,10 +2,7 @@ # include "config.h" #endif #include <math.h> -#include <gtk/gtksignal.h> -#include <gtk/gtklabel.h> -#include <gtk/gtktable.h> -#include <gtk/gtkspinbutton.h> +#include <gtk/gtk.h> #include <glibmm/i18n.h> #include "../dialogs/dialog-events.h" #include "sp-color-wheel-selector.h" diff --git a/src/widgets/sp-color-wheel-selector.h b/src/widgets/sp-color-wheel-selector.h index 34a5f4cd0..6c8d2d12b 100644 --- a/src/widgets/sp-color-wheel-selector.h +++ b/src/widgets/sp-color-wheel-selector.h @@ -2,8 +2,7 @@ #define SEEN_SP_COLOR_WHEEL_SELECTOR_H #include <glib/gtypes.h> -#include <gtk/gtktooltips.h> -#include <gtk/gtkvbox.h> +#include <gtk/gtk.h> #include "../color.h" #include "sp-color-slider.h" diff --git a/src/widgets/sp-widget.h b/src/widgets/sp-widget.h index e9f9cfe73..ba6baf972 100644 --- a/src/widgets/sp-widget.h +++ b/src/widgets/sp-widget.h @@ -21,7 +21,7 @@ #define SP_IS_WIDGET(obj) (GTK_CHECK_TYPE ((obj), SP_TYPE_WIDGET)) #define SP_IS_WIDGET_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), SP_TYPE_WIDGET)) -#include <gtk/gtkbin.h> +#include <gtk/gtk.h> namespace Inkscape { class Application; diff --git a/src/widgets/sp-xmlview-attr-list.h b/src/widgets/sp-xmlview-attr-list.h index 8e7b844d0..b437cabf0 100644 --- a/src/widgets/sp-xmlview-attr-list.h +++ b/src/widgets/sp-xmlview-attr-list.h @@ -13,7 +13,6 @@ */ #include <stdio.h> -#include <gtk/gtkctree.h> #include <gtk/gtk.h> #include "../xml/repr.h" diff --git a/src/widgets/sp-xmlview-content.h b/src/widgets/sp-xmlview-content.h index 3077b2251..7f8a6d3ef 100644 --- a/src/widgets/sp-xmlview-content.h +++ b/src/widgets/sp-xmlview-content.h @@ -16,7 +16,7 @@ #include <stdio.h> -#include <gtk/gtktextview.h> +#include <gtk/gtk.h> #include "../xml/repr.h" #include <glib.h> diff --git a/src/widgets/sp-xmlview-tree.h b/src/widgets/sp-xmlview-tree.h index a5dadbb61..89f4af547 100644 --- a/src/widgets/sp-xmlview-tree.h +++ b/src/widgets/sp-xmlview-tree.h @@ -12,7 +12,7 @@ * Released under the GNU GPL; see COPYING for details */ -#include <gtk/gtkctree.h> +#include <gtk/gtk.h> #include "../xml/repr.h" #include <glib.h> diff --git a/src/widgets/spinbutton-events.h b/src/widgets/spinbutton-events.h index 683748d0a..46652a346 100644 --- a/src/widgets/spinbutton-events.h +++ b/src/widgets/spinbutton-events.h @@ -10,8 +10,7 @@ */ #include <glib/gtypes.h> -#include <gtk/gtkstyle.h> /* GtkWidget */ -#include <gtk/gtktypeutils.h> /* GtkObject */ +#include <gtk/gtk.h> /* GtkWidget */ gboolean spinbutton_focus_in (GtkWidget *w, GdkEventKey *event, gpointer data); void spinbutton_undo (GtkWidget *w); diff --git a/src/widgets/spw-utilities.h b/src/widgets/spw-utilities.h index 9a387454f..443831353 100644 --- a/src/widgets/spw-utilities.h +++ b/src/widgets/spw-utilities.h @@ -19,7 +19,7 @@ */ #include <glib/gtypes.h> -#include <gtk/gtkstyle.h> /* GtkWidget */ +#include <gtk/gtk.h> /* GtkWidget */ #include <gtkmm/widget.h> namespace Gtk { diff --git a/src/widgets/toolbox.h b/src/widgets/toolbox.h index a25705536..0f3ce83c5 100644 --- a/src/widgets/toolbox.h +++ b/src/widgets/toolbox.h @@ -15,8 +15,7 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include <gtk/gtkstyle.h> -#include <gtk/gtktooltips.h> +#include <gtk/gtk.h> #include <glibmm/ustring.h> #include "forward.h" |