diff options
Diffstat (limited to 'src')
150 files changed, 145 insertions, 279 deletions
diff --git a/src/color-profile.cpp b/src/color-profile.cpp index f06ebab88..9ba49d488 100644 --- a/src/color-profile.cpp +++ b/src/color-profile.cpp @@ -10,7 +10,7 @@ #include <glib/gi18n.h> #ifdef DEBUG_LCMS -#include <gtk/gtkmessagedialog.h> +#include <gtk.h> #endif // DEBUG_LCMS #include <cstring> diff --git a/src/color.h b/src/color.h index bebeaec60..8e6b54dd1 100644 --- a/src/color.h +++ b/src/color.h @@ -15,7 +15,7 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include <gdk/gdktypes.h> +#include <gdk/gdk.h> #include <string> /* Useful composition macros */ diff --git a/src/context-fns.h b/src/context-fns.h index be8b4dfd5..c86640aba 100644 --- a/src/context-fns.h +++ b/src/context-fns.h @@ -11,7 +11,7 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include <gdk/gdkevents.h> +#include <gdk/gdk.h> #include <2geom/forward.h> struct SPDesktop; diff --git a/src/debug/gdk-event-latency-tracker.h b/src/debug/gdk-event-latency-tracker.h index 12ebb6570..c3624e74f 100644 --- a/src/debug/gdk-event-latency-tracker.h +++ b/src/debug/gdk-event-latency-tracker.h @@ -12,7 +12,7 @@ #ifndef SEEN_INKSCAPE_DEBUG_GDK_EVENT_LATENCY_TRACKER_H #define SEEN_INKSCAPE_DEBUG_GDK_EVENT_LATENCY_TRACKER_H -#include <gdk/gdkevents.h> +#include <gdk/gdk.h> #include <glibmm/timer.h> #include <boost/optional.hpp> diff --git a/src/debug/log-display-config.cpp b/src/debug/log-display-config.cpp index d2821cc53..07380b3ad 100644 --- a/src/debug/log-display-config.cpp +++ b/src/debug/log-display-config.cpp @@ -10,8 +10,7 @@ */ #include <iostream> -#include <gdk/gdkdisplay.h> -#include <gdk/gdkscreen.h> +#include <gdk/gdk.h> #include "debug/event-tracker.h" #include "debug/logger.h" #include "debug/simple-event.h" diff --git a/src/desktop-events.h b/src/desktop-events.h index e720cf7a0..e573fc878 100644 --- a/src/desktop-events.h +++ b/src/desktop-events.h @@ -13,8 +13,8 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include <gdk/gdkevents.h> -#include <gtk/gtkwidget.h> +#include <gdk/gdk.h> +#include <gtk/gtk.h> class SPDesktop; class SPDesktopWidget; diff --git a/src/desktop.h b/src/desktop.h index 6d1bcd194..2581f2859 100644 --- a/src/desktop.h +++ b/src/desktop.h @@ -27,8 +27,8 @@ #include "config.h" #endif -#include <gdk/gdkevents.h> -#include <gtk/gtktypeutils.h> +#include <gdk/gdk.h> +#include <gtk/gtk.h> #include <stddef.h> #include <sigc++/sigc++.h> diff --git a/src/device-manager.cpp b/src/device-manager.cpp index 2b44a8d51..5cf376cc4 100644 --- a/src/device-manager.cpp +++ b/src/device-manager.cpp @@ -10,7 +10,7 @@ #include <glib.h> #include <map> #include <set> -#include <gtk/gtkaccelgroup.h> +#include <gtk/gtk.h> #include "device-manager.h" #include "preferences.h" diff --git a/src/dialogs/clonetiler.h b/src/dialogs/clonetiler.h index bfb35cd96..899181346 100644 --- a/src/dialogs/clonetiler.h +++ b/src/dialogs/clonetiler.h @@ -12,7 +12,7 @@ #include <glib.h> -#include <gtk/gtkwidget.h> +#include <gtk/gtk.h> void clonetiler_dialog ( void ); diff --git a/src/dialogs/dialog-events.h b/src/dialogs/dialog-events.h index 7b04d0f69..9c0a82f23 100644 --- a/src/dialogs/dialog-events.h +++ b/src/dialogs/dialog-events.h @@ -12,8 +12,7 @@ #ifndef __DIALOG_EVENTS_H__ #define __DIALOG_EVENTS_H__ -#include <gtk/gtkstyle.h> -#include <gtk/gtkwindow.h> +#include <gtk/gtk.h> #include <forward.h> /* diff --git a/src/dialogs/find.h b/src/dialogs/find.h index fe5861a73..219c36bf2 100644 --- a/src/dialogs/find.h +++ b/src/dialogs/find.h @@ -12,7 +12,7 @@ #ifndef SEEN_FIND_H #define SEEN_FIND_H -#include <gtk/gtkstyle.h> +#include <gtk/gtk.h> void sp_find_dialog(); diff --git a/src/dialogs/item-properties.cpp b/src/dialogs/item-properties.cpp index 94b8b1e98..54707c0aa 100644 --- a/src/dialogs/item-properties.cpp +++ b/src/dialogs/item-properties.cpp @@ -16,16 +16,7 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif -#include <gtk/gtkvbox.h> -#include <gtk/gtkhbox.h> -#include <gtk/gtktable.h> -#include <gtk/gtkcheckbutton.h> #include <gtk/gtk.h> -#include <gtk/gtklabel.h> -#include <gtk/gtkframe.h> -#include <gtk/gtkexpander.h> -#include <gtk/gtktextview.h> -#include <gtk/gtktooltips.h> #include "../desktop-handles.h" #include "dialog-events.h" diff --git a/src/dialogs/item-properties.h b/src/dialogs/item-properties.h index bc04608bc..7d57ae5e8 100644 --- a/src/dialogs/item-properties.h +++ b/src/dialogs/item-properties.h @@ -12,7 +12,7 @@ #define SEEN_DIALOGS_ITEM_PROPERTIES_H #include <glib.h> -#include <gtk/gtkwidget.h> +#include <gtk/gtk.h> #include "../forward.h" GtkWidget *sp_item_widget_new (void); diff --git a/src/dialogs/object-attributes.h b/src/dialogs/object-attributes.h index ef84708c0..b490ebfa1 100644 --- a/src/dialogs/object-attributes.h +++ b/src/dialogs/object-attributes.h @@ -13,7 +13,7 @@ #define SEEN_DIALOGS_OBJECT_ATTRIBUTES_H #include <glib.h> -#include <gtk/gtkwidget.h> +#include <gtk/gtk.h> #include "../forward.h" void sp_object_attributes_dialog (SPObject *object, const gchar *tag); diff --git a/src/dialogs/spellcheck.h b/src/dialogs/spellcheck.h index b941788ca..fe80be2cb 100644 --- a/src/dialogs/spellcheck.h +++ b/src/dialogs/spellcheck.h @@ -12,7 +12,7 @@ #ifndef SEEN_SPELLCHECK_H #define SEEN_SPELLCHECK_H -#include <gtk/gtkstyle.h> +#include <gtk/gtk.h> void sp_spellcheck_dialog(); diff --git a/src/display/canvas-arena.cpp b/src/display/canvas-arena.cpp index f3e1b0f0c..5975db9cc 100644 --- a/src/display/canvas-arena.cpp +++ b/src/display/canvas-arena.cpp @@ -11,7 +11,7 @@ */ #include <libnr/nr-blit.h> -#include <gtk/gtksignal.h> +#include <gtk/gtk.h> #include <display/sp-canvas-util.h> #include "helper/sp-marshal.h" diff --git a/src/display/canvas-temporary-item.cpp b/src/display/canvas-temporary-item.cpp index ccef4d0cb..8d336f0ff 100644 --- a/src/display/canvas-temporary-item.cpp +++ b/src/display/canvas-temporary-item.cpp @@ -16,7 +16,7 @@ #include "display/canvas-temporary-item.h" -#include <gtk/gtkobject.h> +#include <gtk/gtk.h> namespace Inkscape { namespace Display { diff --git a/src/display/grayscale.h b/src/display/grayscale.h index 855c9e465..d7092687c 100644 --- a/src/display/grayscale.h +++ b/src/display/grayscale.h @@ -12,7 +12,7 @@ * Released under GNU GPL */ -#include <gdk/gdktypes.h> +#include <gdk/gdk.h> namespace Grayscale { guint32 process(guint32 rgba); diff --git a/src/display/nr-3dutils.h b/src/display/nr-3dutils.h index 56bed6ba2..e19651ac8 100644 --- a/src/display/nr-3dutils.h +++ b/src/display/nr-3dutils.h @@ -14,7 +14,7 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include <gdk/gdktypes.h> +#include <gdk/gdk.h> #include <2geom/forward.h> struct NRPixBlock; diff --git a/src/display/nr-filter-diffuselighting.h b/src/display/nr-filter-diffuselighting.h index 8dc7a1818..f540bf4a5 100644 --- a/src/display/nr-filter-diffuselighting.h +++ b/src/display/nr-filter-diffuselighting.h @@ -13,7 +13,7 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include <gdk/gdktypes.h> +#include <gdk/gdk.h> #include "display/nr-light-types.h" #include "display/nr-filter-primitive.h" #include "display/nr-filter-slot.h" diff --git a/src/display/nr-filter-specularlighting.h b/src/display/nr-filter-specularlighting.h index a5d29588a..7c278df89 100644 --- a/src/display/nr-filter-specularlighting.h +++ b/src/display/nr-filter-specularlighting.h @@ -13,7 +13,7 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include <gdk/gdktypes.h> +#include <gdk/gdk.h> #include "display/nr-light-types.h" #include "display/nr-filter-primitive.h" #include "display/nr-filter-slot.h" diff --git a/src/display/nr-light.h b/src/display/nr-light.h index 49130cc4e..022243bfc 100644 --- a/src/display/nr-light.h +++ b/src/display/nr-light.h @@ -8,7 +8,7 @@ * light color components (at a given point). */ -#include <gdk/gdktypes.h> +#include <gdk/gdk.h> #include "display/nr-3dutils.h" #include "display/nr-light-types.h" #include <2geom/forward.h> diff --git a/src/display/sodipodi-ctrl.h b/src/display/sodipodi-ctrl.h index a708ad41b..c3b97cbe0 100644 --- a/src/display/sodipodi-ctrl.h +++ b/src/display/sodipodi-ctrl.h @@ -7,7 +7,7 @@ * */ -#include <gtk/gtkenums.h> +#include <gtk/gtk.h> #include <gdk-pixbuf/gdk-pixbuf.h> #include <libnr/nr-rect-l.h> #include "sp-canvas-item.h" diff --git a/src/display/sp-canvas-item.h b/src/display/sp-canvas-item.h index cc0bdfc77..26e5aa1f6 100644 --- a/src/display/sp-canvas-item.h +++ b/src/display/sp-canvas-item.h @@ -22,8 +22,8 @@ #endif #include <glib-object.h> -#include <gtk/gtkobject.h> -#include <gdk/gdkevents.h> +#include <gtk/gtk.h> +#include <gdk/gdk.h> #include "2geom/rect.h" diff --git a/src/display/sp-canvas.cpp b/src/display/sp-canvas.cpp index 0d450362a..ff1bf32c6 100644 --- a/src/display/sp-canvas.cpp +++ b/src/display/sp-canvas.cpp @@ -20,9 +20,7 @@ #include <libnr/nr-pixblock.h> -#include <gtk/gtkmain.h> -#include <gtk/gtksignal.h> -#include <gtk/gtkversion.h> +#include <gtk/gtk.h> #include <gtkmm.h> diff --git a/src/display/sp-canvas.h b/src/display/sp-canvas.h index 3a0b56585..a6ddafb1e 100644 --- a/src/display/sp-canvas.h +++ b/src/display/sp-canvas.h @@ -28,10 +28,8 @@ #endif #include <glib/gtypes.h> -#include <gdk/gdkevents.h> -#include <gdk/gdkgc.h> -#include <gtk/gtkobject.h> -#include <gtk/gtkwidget.h> +#include <gdk/gdk.h> +#include <gtk/gtk.h> #include <glibmm/ustring.h> diff --git a/src/document-undo.h b/src/document-undo.h index e4f0d15a8..afd595ed8 100644 --- a/src/document-undo.h +++ b/src/document-undo.h @@ -1,6 +1,7 @@ #ifndef SEEN_SP_DOCUMENT_UNDO_H #define SEEN_SP_DOCUMENT_UNDO_H +typedef struct _GtkObject GtkObject; namespace Inkscape { diff --git a/src/document.cpp b/src/document.cpp index 22cfa5663..90fc4c635 100644 --- a/src/document.cpp +++ b/src/document.cpp @@ -37,7 +37,7 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif -#include <gtk/gtkmain.h> +#include <gtk/gtk.h> #include <string> #include <cstring> diff --git a/src/document.h b/src/document.h index e3c70b2c6..82a9a5158 100644 --- a/src/document.h +++ b/src/document.h @@ -18,7 +18,6 @@ */ #include <glib-object.h> -#include <gtk/gtksignal.h> #include <stddef.h> #include <sigc++/sigc++.h> #include <sigc++/class_slot.h> diff --git a/src/ege-adjustment-action.cpp b/src/ege-adjustment-action.cpp index b8ee66f08..f6df395b9 100644 --- a/src/ege-adjustment-action.cpp +++ b/src/ege-adjustment-action.cpp @@ -43,18 +43,7 @@ #include <string.h> #include <gdk/gdkkeysyms.h> -#include <gtk/gtkversion.h> -#include <gtk/gtktoolitem.h> #include <gtk/gtk.h> -#include <gtk/gtkhscale.h> -#include <gtk/gtkscalebutton.h> -#include <gtk/gtkstock.h> -#include <gtk/gtkhbox.h> -#include <gtk/gtklabel.h> -#include <gtk/gtkmisc.h> -#include <gtk/gtktoolbar.h> -#include <gtk/gtktooltips.h> -#include <gtk/gtkradiomenuitem.h> #include "widgets/icon.h" #include "icon-size.h" diff --git a/src/ege-adjustment-action.h b/src/ege-adjustment-action.h index b7da6a499..f63d4ed3e 100644 --- a/src/ege-adjustment-action.h +++ b/src/ege-adjustment-action.h @@ -46,7 +46,7 @@ /* Note: this file should be kept compilable as both .cpp and .c */ #include <glib.h> -#include <gtk/gtkaction.h> +#include <gtk/gtk.h> #include <glib-object.h> G_BEGIN_DECLS diff --git a/src/ege-color-prof-tracker.cpp b/src/ege-color-prof-tracker.cpp index 900246595..a6fcaa126 100644 --- a/src/ege-color-prof-tracker.cpp +++ b/src/ege-color-prof-tracker.cpp @@ -41,9 +41,7 @@ #include <string.h> -#include <gtk/gtkwidget.h> -#include <gtk/gtkwindow.h> -#include <gtk/gtkmarshal.h> +#include <gtk/gtk.h> #ifdef GDK_WINDOWING_X11 #include <X11/Xlib.h> diff --git a/src/ege-output-action.cpp b/src/ege-output-action.cpp index 72616ce18..c1a5be694 100644 --- a/src/ege-output-action.cpp +++ b/src/ege-output-action.cpp @@ -41,9 +41,7 @@ #include <string.h> -#include <gtk/gtkhbox.h> -#include <gtk/gtklabel.h> -#include <gtk/gtktoolitem.h> +#include <gtk/gtk.h> #include "ege-output-action.h" diff --git a/src/ege-output-action.h b/src/ege-output-action.h index e626ccd8c..fc21c2f27 100644 --- a/src/ege-output-action.h +++ b/src/ege-output-action.h @@ -46,7 +46,7 @@ /* Note: this file should be kept compilable as both .cpp and .c */ #include <glib.h> -#include <gtk/gtkaction.h> +#include <gtk/gtk.h> #include <glib-object.h> G_BEGIN_DECLS diff --git a/src/ege-select-one-action.cpp b/src/ege-select-one-action.cpp index 1c3ec1ff5..2fd45e268 100644 --- a/src/ege-select-one-action.cpp +++ b/src/ege-select-one-action.cpp @@ -41,16 +41,7 @@ #include <string.h> -#include <gtk/gtkhbox.h> -#include <gtk/gtklabel.h> -#include <gtk/gtktoolitem.h> #include <gtk/gtk.h> -#include <gtk/gtkcellrenderertext.h> -#include <gtk/gtkcellrendererpixbuf.h> -#include <gtk/gtkcelllayout.h> -#include <gtk/gtkradioaction.h> -#include <gtk/gtkradiomenuitem.h> -#include <gtk/gtktable.h> #include "ege-select-one-action.h" diff --git a/src/ege-select-one-action.h b/src/ege-select-one-action.h index 36943b978..d605f4a67 100644 --- a/src/ege-select-one-action.h +++ b/src/ege-select-one-action.h @@ -49,8 +49,7 @@ /* Note: this file should be kept compilable as both .cpp and .c */ #include <glib.h> -#include <gtk/gtkaction.h> -#include <gtk/gtktreemodel.h> +#include <gtk/gtk.h> #include <glib-object.h> G_BEGIN_DECLS diff --git a/src/event-context.cpp b/src/event-context.cpp index 828ce3d5b..5a1c7130a 100644 --- a/src/event-context.cpp +++ b/src/event-context.cpp @@ -30,8 +30,7 @@ #include <string.h> #include <gdk/gdkkeysyms.h> -#include <gtk/gtkmain.h> -#include <gtk/gtkmenu.h> +#include <gtk/gtk.h> #include <glibmm/i18n.h> #include <cstring> #include <string> diff --git a/src/event-context.h b/src/event-context.h index 71084cb5f..b0772c23a 100644 --- a/src/event-context.h +++ b/src/event-context.h @@ -18,8 +18,7 @@ */ #include <glib-object.h> -#include <gdk/gdktypes.h> -#include <gdk/gdkevents.h> +#include <gdk/gdk.h> #include "knot.h" #include "2geom/forward.h" diff --git a/src/extension/effect.h b/src/extension/effect.h index c02ce542b..28ebc5d96 100644 --- a/src/extension/effect.h +++ b/src/extension/effect.h @@ -15,7 +15,7 @@ #include <glibmm/i18n.h> #include <gtkmm/dialog.h> -#include <gtk/gtkdialog.h> +#include <gtk/gtk.h> #include "verbs.h" #include "prefdialog.h" diff --git a/src/extension/implementation/implementation.h b/src/extension/implementation/implementation.h index bf584b401..b9e417feb 100644 --- a/src/extension/implementation/implementation.h +++ b/src/extension/implementation/implementation.h @@ -12,7 +12,7 @@ #ifndef __INKSCAPE_EXTENSION_IMPLEMENTATION_H__ #define __INKSCAPE_EXTENSION_IMPLEMENTATION_H__ -#include <gtk/gtkdialog.h> +#include <gtk/gtk.h> #include <gdkmm/types.h> #include <gtkmm/widget.h> diff --git a/src/extension/input.h b/src/extension/input.h index 24cbc4896..8b198495e 100644 --- a/src/extension/input.h +++ b/src/extension/input.h @@ -16,7 +16,7 @@ #include "extension.h" #include "xml/repr.h" #include "document.h" -#include <gtk/gtkdialog.h> +#include <gtk/gtk.h> namespace Inkscape { namespace Extension { diff --git a/src/extension/internal/emf-win32-print.cpp b/src/extension/internal/emf-win32-print.cpp index 503a13d09..9662881fe 100644 --- a/src/extension/internal/emf-win32-print.cpp +++ b/src/extension/internal/emf-win32-print.cpp @@ -42,9 +42,7 @@ #include "sp-item.h" //#include "glib.h" -//#include "gtk/gtkdialog.h" -//#include "gtk/gtkbox.h" -//#include "gtk/gtkstock.h" +//#include "gtk/gtk.h" //#include "glibmm/i18n.h" //#include "enums.h" diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp index fc2db7e69..186f337c4 100644 --- a/src/extension/internal/pdfinput/pdf-input.cpp +++ b/src/extension/internal/pdfinput/pdf-input.cpp @@ -40,7 +40,7 @@ #include "inkscape.h" #include "dialogs/dialog-events.h" -#include <gtk/gtkdialog.h> +#include <gtk/gtk.h> #include "ui/widget/spinbutton.h" namespace Inkscape { diff --git a/src/extension/output.h b/src/extension/output.h index 584fafda8..5f6785b8b 100644 --- a/src/extension/output.h +++ b/src/extension/output.h @@ -13,7 +13,7 @@ #ifndef INKSCAPE_EXTENSION_OUTPUT_H__ #define INKSCAPE_EXTENSION_OUTPUT_H__ -#include <gtk/gtkdialog.h> +#include <gtk/gtk.h> #include "extension.h" struct SPDocument; diff --git a/src/file.h b/src/file.h index 97d1bd5f8..dec7e3f14 100644 --- a/src/file.h +++ b/src/file.h @@ -17,7 +17,7 @@ #include <gtkmm.h> #include <glib/gslist.h> -#include <gtk/gtkwidget.h> +#include <gtk/gtk.h> #include "extension/extension-forward.h" #include "extension/system.h" diff --git a/src/help.h b/src/help.h index 35f67a714..b6c82fb51 100644 --- a/src/help.h +++ b/src/help.h @@ -14,7 +14,7 @@ */ #include <glib/gtypes.h> -#include <gtk/gtkmenuitem.h> +#include <gtk/gtk.h> void sp_help_about(void); void sp_help_open_tutorial(GtkMenuItem *menuitem, gpointer data); diff --git a/src/helper/unit-menu.cpp b/src/helper/unit-menu.cpp index e4ff09829..5494aaaeb 100644 --- a/src/helper/unit-menu.cpp +++ b/src/helper/unit-menu.cpp @@ -17,10 +17,7 @@ #ifdef HAVE_CONFIG_H # include "config.h" #endif -#include <gtk/gtksignal.h> -#include <gtk/gtkhbox.h> -#include <gtk/gtkmenu.h> -#include <gtk/gtkmenuitem.h> +#include <gtk/gtk.h> #include "helper/sp-marshal.h" #include "helper/units.h" #include "helper/unit-menu.h" diff --git a/src/helper/unit-menu.h b/src/helper/unit-menu.h index b3ab8836c..795dda7b7 100644 --- a/src/helper/unit-menu.h +++ b/src/helper/unit-menu.h @@ -11,7 +11,7 @@ */ #include <glib/gtypes.h> -#include <gtk/gtkoptionmenu.h> +#include <gtk/gtk.h> #include <helper/helper-forward.h> diff --git a/src/helper/unit-tracker.cpp b/src/helper/unit-tracker.cpp index 3f5a72e6a..609c2f292 100644 --- a/src/helper/unit-tracker.cpp +++ b/src/helper/unit-tracker.cpp @@ -10,7 +10,7 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include <gtk/gtkliststore.h> +#include <gtk/gtk.h> #include "unit-tracker.h" #include "ege-select-one-action.h" diff --git a/src/helper/unit-tracker.h b/src/helper/unit-tracker.h index 0f333b2ec..a15a0a6ca 100644 --- a/src/helper/unit-tracker.h +++ b/src/helper/unit-tracker.h @@ -15,8 +15,7 @@ #include <map> -#include <gtk/gtkaction.h> -#include <gtk/gtkliststore.h> +#include <gtk/gtk.h> #include "helper/units.h" diff --git a/src/helper/window.cpp b/src/helper/window.cpp index b814424e5..f4640203d 100644 --- a/src/helper/window.cpp +++ b/src/helper/window.cpp @@ -12,7 +12,7 @@ #ifdef HAVE_CONFIG_H # include <config.h> #endif -#include <gtk/gtkwindow.h> +#include <gtk/gtk.h> #include <gtkmm/window.h> #include "inkscape.h" diff --git a/src/helper/window.h b/src/helper/window.h index 36b91a813..dc2c48bc0 100644 --- a/src/helper/window.h +++ b/src/helper/window.h @@ -10,7 +10,7 @@ * This code is in public domain */ -#include <gtk/gtkwidget.h> +#include <gtk/gtk.h> #include <gtkmm/window.h> /* diff --git a/src/icon-size.h b/src/icon-size.h index da2b3854d..4bb4f1df6 100644 --- a/src/icon-size.h +++ b/src/icon-size.h @@ -14,7 +14,7 @@ #include <glib.h> -#include <gtk/gtkenums.h> +#include <gtk/gtk.h> namespace Inkscape { diff --git a/src/ink-action.cpp b/src/ink-action.cpp index 587efdff0..d26b038f8 100644 --- a/src/ink-action.cpp +++ b/src/ink-action.cpp @@ -2,12 +2,7 @@ #include <glib/gi18n.h> -#include <gtk/gtkalignment.h> -#include <gtk/gtktooltips.h> -#include <gtk/gtktoolitem.h> -#include <gtk/gtktoggletoolbutton.h> -#include <gtk/gtkcheckmenuitem.h> -#include <gtk/gtkimagemenuitem.h> +#include <gtk/gtk.h> #include "icon-size.h" #include "ink-action.h" @@ -183,7 +178,7 @@ void ink_action_set_property( GObject* obj, guint propId, const GValue *value, G } } -#include <gtk/gtkstock.h> +#include <gtk/gtk.h> static GtkWidget* ink_action_create_menu_item( GtkAction* action ) { diff --git a/src/ink-action.h b/src/ink-action.h index 7b48d40af..c957f0f5c 100644 --- a/src/ink-action.h +++ b/src/ink-action.h @@ -3,9 +3,7 @@ #include <glib.h> -#include <gtk/gtkaction.h> -#include <gtk/gtktoggleaction.h> -#include <gtk/gtkradioaction.h> +#include <gtk/gtk.h> #include <glib-object.h> #include "icon-size.h" #include "attributes.h" diff --git a/src/ink-comboboxentry-action.cpp b/src/ink-comboboxentry-action.cpp index eaaf62113..49ab343c2 100644 --- a/src/ink-comboboxentry-action.cpp +++ b/src/ink-comboboxentry-action.cpp @@ -26,9 +26,6 @@ #include <string.h> #include <gtk/gtk.h> -#include <gtk/gtktoolitem.h> -#include <gtk/gtkcomboboxentry.h> -#include <gtk/gtkentrycompletion.h> #include "ink-comboboxentry-action.h" diff --git a/src/ink-comboboxentry-action.h b/src/ink-comboboxentry-action.h index 1a83cb053..aade3a89f 100644 --- a/src/ink-comboboxentry-action.h +++ b/src/ink-comboboxentry-action.h @@ -22,8 +22,7 @@ #include <glib.h> #include <glib-object.h> -#include <gtk/gtkaction.h> -#include <gtk/gtktreemodel.h> +#include <gtk/gtk.h> #define INK_COMBOBOXENTRY_TYPE_ACTION (ink_comboboxentry_action_get_type()) diff --git a/src/inkscape.cpp b/src/inkscape.cpp index b794138ca..e90c44c82 100644 --- a/src/inkscape.cpp +++ b/src/inkscape.cpp @@ -40,8 +40,7 @@ using Inkscape::Extension::Internal::PrintWin32; #include <glib/gstdio.h> #include <glib.h> #include <glibmm/i18n.h> -#include <gtk/gtkmain.h> -#include <gtk/gtkmessagedialog.h> +#include <gtk/gtk.h> #include <gtkmm/messagedialog.h> #include <signal.h> #include <string> diff --git a/src/inkview.cpp b/src/inkview.cpp index 448aa77f1..173427aae 100644 --- a/src/inkview.cpp +++ b/src/inkview.cpp @@ -45,11 +45,7 @@ #include <libxml/tree.h> #include <gdk/gdkkeysyms.h> -#include <gtk/gtkmain.h> -#include <gtk/gtkstock.h> -#include <gtk/gtkwindow.h> -#include <gtk/gtktable.h> -#include <gtk/gtkbutton.h> +#include <gtk/gtk.h> #include <gtkmm/main.h> diff --git a/src/interface.h b/src/interface.h index 01732e911..a39769632 100644 --- a/src/interface.h +++ b/src/interface.h @@ -15,7 +15,7 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include <gtk/gtkstyle.h> +#include <gtk/gtk.h> #include "forward.h" #include "sp-item.h" diff --git a/src/io/sys.cpp b/src/io/sys.cpp index e6c512be2..85857c2f0 100644 --- a/src/io/sys.cpp +++ b/src/io/sys.cpp @@ -21,7 +21,7 @@ #include <glibmm/fileutils.h> #include <glib/gstdio.h> #include <glibmm/ustring.h> -#include <gtk/gtkmessagedialog.h> +#include <gtk/gtk.h> #include "preferences.h" #include "sys.h" diff --git a/src/knot.h b/src/knot.h index 1af2548e1..250165f79 100644 --- a/src/knot.h +++ b/src/knot.h @@ -15,7 +15,7 @@ */ #include <gdk/gdk.h> -#include <gtk/gtkenums.h> +#include <gtk/gtk.h> #include "forward.h" #include <2geom/point.h> #include "knot-enums.h" diff --git a/src/libgdl/gdl-dock-bar.h b/src/libgdl/gdl-dock-bar.h index 22b99edd4..c6697a47c 100644 --- a/src/libgdl/gdl-dock-bar.h +++ b/src/libgdl/gdl-dock-bar.h @@ -22,7 +22,7 @@ #ifndef __GDL_DOCK_BAR_H__ #define __GDL_DOCK_BAR_H__ -#include <gtk/gtkvbox.h> +#include <gtk/gtk.h> #include "libgdl/gdl-dock.h" G_BEGIN_DECLS diff --git a/src/libgdl/gdl-dock-item-grip.c b/src/libgdl/gdl-dock-item-grip.c index 86e7bc14c..6457016de 100644 --- a/src/libgdl/gdl-dock-item-grip.c +++ b/src/libgdl/gdl-dock-item-grip.c @@ -17,9 +17,7 @@ #include "gdl-i18n.h" #include <string.h> #include <glib-object.h> -#include <gtk/gtkbutton.h> -#include <gtk/gtktooltips.h> -#include <gtk/gtkimage.h> +#include <gtk/gtk.h> #include "gdl-dock-item.h" #include "gdl-dock-item-grip.h" #include "gdl-stock.h" diff --git a/src/libgdl/gdl-dock-item-grip.h b/src/libgdl/gdl-dock-item-grip.h index 377ea1470..495e9381d 100644 --- a/src/libgdl/gdl-dock-item-grip.h +++ b/src/libgdl/gdl-dock-item-grip.h @@ -13,7 +13,7 @@ #ifndef _GDL_DOCK_ITEM_GRIP_H_ #define _GDL_DOCK_ITEM_GRIP_H_ -#include <gtk/gtkwidget.h> +#include <gtk/gtk.h> #include "libgdl/gdl-dock-item.h" G_BEGIN_DECLS diff --git a/src/libgdl/gdl-dock-master.h b/src/libgdl/gdl-dock-master.h index 72697b484..1a10405b6 100644 --- a/src/libgdl/gdl-dock-master.h +++ b/src/libgdl/gdl-dock-master.h @@ -25,7 +25,7 @@ #define __GDL_DOCK_MASTER_H__ #include <glib-object.h> -#include <gtk/gtktypeutils.h> +#include <gtk/gtk.h> #include "libgdl/gdl-dock-object.h" diff --git a/src/libgdl/gdl-dock-object.h b/src/libgdl/gdl-dock-object.h index 84e5eb9a7..684bd043f 100644 --- a/src/libgdl/gdl-dock-object.h +++ b/src/libgdl/gdl-dock-object.h @@ -24,7 +24,7 @@ #ifndef __GDL_DOCK_OBJECT_H__ #define __GDL_DOCK_OBJECT_H__ -#include <gtk/gtkcontainer.h> +#include <gtk/gtk.h> G_BEGIN_DECLS diff --git a/src/libgdl/gdl-dock-paned.c b/src/libgdl/gdl-dock-paned.c index 268a9f673..70273c886 100644 --- a/src/libgdl/gdl-dock-paned.c +++ b/src/libgdl/gdl-dock-paned.c @@ -27,8 +27,7 @@ #include "gdl-i18n.h" #include <string.h> -#include <gtk/gtkhpaned.h> -#include <gtk/gtkvpaned.h> +#include <gtk/gtk.h> #include "gdl-tools.h" #include "gdl-dock-paned.h" diff --git a/src/libgdl/gdl-stock.c b/src/libgdl/gdl-stock.c index 94f825678..dc86e523b 100644 --- a/src/libgdl/gdl-stock.c +++ b/src/libgdl/gdl-stock.c @@ -24,7 +24,6 @@ #endif #include <gtk/gtk.h> -#include <gtk/gtkiconfactory.h> #include "gdl-stock.h" #include "gdl-stock-icons.h" diff --git a/src/libgdl/gdl-switcher.c b/src/libgdl/gdl-switcher.c index 43768bbdf..c5e139e70 100644 --- a/src/libgdl/gdl-switcher.c +++ b/src/libgdl/gdl-switcher.c @@ -35,10 +35,6 @@ #include "libgdltypebuiltins.h" #include <gtk/gtk.h> -#include <gtk/gtkhbox.h> -#include <gtk/gtkimage.h> -#include <gtk/gtklabel.h> -#include <gtk/gtktogglebutton.h> #if HAVE_GNOME #include <gconf/gconf-client.h> diff --git a/src/libgdl/gdl-switcher.h b/src/libgdl/gdl-switcher.h index be4b179bf..9c33f8bbf 100644 --- a/src/libgdl/gdl-switcher.h +++ b/src/libgdl/gdl-switcher.h @@ -25,7 +25,7 @@ #ifndef _GDL_SWITCHER_H_ #define _GDL_SWITCHER_H_ -#include <gtk/gtknotebook.h> +#include <gtk/gtk.h> G_BEGIN_DECLS diff --git a/src/libgdl/gdl-tools.h b/src/libgdl/gdl-tools.h index 32c2e4a41..0cfc9fb95 100644 --- a/src/libgdl/gdl-tools.h +++ b/src/libgdl/gdl-tools.h @@ -25,7 +25,7 @@ #define __GDL_TOOLS_H__ #include <glib.h> -#include <gtk/gtkwidget.h> +#include <gtk/gtk.h> /* FIXME: Toggle this */ diff --git a/src/libnrtype/Layout-TNG-Input.cpp b/src/libnrtype/Layout-TNG-Input.cpp index d16c6457d..45bc0c89b 100644 --- a/src/libnrtype/Layout-TNG-Input.cpp +++ b/src/libnrtype/Layout-TNG-Input.cpp @@ -11,7 +11,7 @@ #define PANGO_ENABLE_ENGINE -#include <gtk/gtkversion.h> +#include <gtk/gtk.h> #include "Layout-TNG.h" #include "style.h" #include "svg/svg-length.h" diff --git a/src/live_effects/parameter/path.cpp b/src/live_effects/parameter/path.cpp index d652dfd0c..bd9748fd6 100644 --- a/src/live_effects/parameter/path.cpp +++ b/src/live_effects/parameter/path.cpp @@ -15,7 +15,7 @@ #include "ui/widget/point.h" #include "widgets/icon.h" -#include <gtk/gtkstock.h> +#include <gtk/gtk.h> #include "selection-chemistry.h" #include "xml/repr.h" #include "desktop.h" diff --git a/src/main.cpp b/src/main.cpp index 82a4b28c0..8ed6b4c03 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -31,7 +31,7 @@ // This has to be included prior to anything that includes setjmp.h, it croaks otherwise #include <png.h> -#include <gtk/gtkmessagedialog.h> +#include <gtk/gtk.h> #ifdef HAVE_IEEEFP_H #include <ieeefp.h> @@ -51,10 +51,6 @@ #include <glib/gprintf.h> #include <glib-object.h> #include <gtk/gtk.h> -#include <gtk/gtkmain.h> -#include <gtk/gtksignal.h> -#include <gtk/gtkwindow.h> -#include <gtk/gtkbox.h> #include "gc-core.h" diff --git a/src/modifier-fns.h b/src/modifier-fns.h index 8d78455e1..c1b35e948 100644 --- a/src/modifier-fns.h +++ b/src/modifier-fns.h @@ -11,7 +11,7 @@ * Hereby placed in public domain. */ -#include <gdk/gdktypes.h> +#include <gdk/gdk.h> #include <glib/gtypes.h> inline bool diff --git a/src/select-context.h b/src/select-context.h index 377e07275..6d12558ca 100644 --- a/src/select-context.h +++ b/src/select-context.h @@ -13,7 +13,7 @@ */ #include "event-context.h" -#include <gtk/gtktypeutils.h> +#include <gtk/gtk.h> #define SP_TYPE_SELECT_CONTEXT (sp_select_context_get_type ()) #define SP_SELECT_CONTEXT(obj) (GTK_CHECK_CAST ((obj), SP_TYPE_SELECT_CONTEXT, SPSelectContext)) diff --git a/src/seltrans-handles.h b/src/seltrans-handles.h index f796a1007..53dbd3cda 100644 --- a/src/seltrans-handles.h +++ b/src/seltrans-handles.h @@ -14,7 +14,7 @@ #include "display/sodipodi-ctrl.h" #include <2geom/forward.h> -#include <gdk/gdkcursor.h> +#include <gdk/gdk.h> namespace Inkscape { diff --git a/src/shortcuts.cpp b/src/shortcuts.cpp index d647d30b3..fe1d31331 100644 --- a/src/shortcuts.cpp +++ b/src/shortcuts.cpp @@ -26,7 +26,7 @@ #include <cstring> #include <string> -#include <gdk/gdkkeys.h> +#include <gdk/gdk.h> #include <gdk/gdkkeysyms.h> #include <gtk/gtk.h> diff --git a/src/sp-gradient.h b/src/sp-gradient.h index 2adb085c1..217b9f3ee 100644 --- a/src/sp-gradient.h +++ b/src/sp-gradient.h @@ -17,7 +17,7 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include <gdk/gdktypes.h> +#include <gdk/gdk.h> #include <glibmm/ustring.h> #include "libnr/nr-matrix.h" #include "sp-paint-server.h" diff --git a/src/sp-image.cpp b/src/sp-image.cpp index 746cd97d9..88daf31ba 100644 --- a/src/sp-image.cpp +++ b/src/sp-image.cpp @@ -63,7 +63,7 @@ } #include "preferences.h" -#include <gtk/gtkmessagedialog.h> +#include <gtk/gtk.h> #endif // DEBUG_LCMS #endif // ENABLE_LCMS /* diff --git a/src/sp-pattern.h b/src/sp-pattern.h index fa0541698..141474277 100644 --- a/src/sp-pattern.h +++ b/src/sp-pattern.h @@ -13,7 +13,7 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include <gtk/gtktypeutils.h> +#include <gtk/gtk.h> #include "forward.h" #include "sp-item.h" diff --git a/src/spiral-context.h b/src/spiral-context.h index 29a5f41b2..906cf61df 100644 --- a/src/spiral-context.h +++ b/src/spiral-context.h @@ -15,7 +15,7 @@ * Released under GNU GPL */ -#include <gtk/gtktypeutils.h> +#include <gtk/gtk.h> #include <stddef.h> #include <sigc++/sigc++.h> #include "event-context.h" diff --git a/src/svg-view-widget.cpp b/src/svg-view-widget.cpp index 777c1b496..da5ad068f 100644 --- a/src/svg-view-widget.cpp +++ b/src/svg-view-widget.cpp @@ -14,7 +14,7 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include <gtk/gtkscrolledwindow.h> +#include <gtk/gtk.h> #include "display/sp-canvas.h" #include "display/sp-canvas-group.h" #include "display/canvas-arena.h" diff --git a/src/text-context.cpp b/src/text-context.cpp index 5af2c5ebc..a7c6772e5 100644 --- a/src/text-context.cpp +++ b/src/text-context.cpp @@ -18,11 +18,10 @@ #endif #include <gdk/gdkkeysyms.h> -#include <gtk/gtkmain.h> +#include <gtk/gtk.h> #include <display/sp-ctrlline.h> #include <display/sodipodi-ctrlrect.h> #include <display/sp-ctrlquadr.h> -#include <gtk/gtkimmulticontext.h> #include <gtkmm/clipboard.h> #include "macros.h" diff --git a/src/text-context.h b/src/text-context.h index ec1710da3..b7d1b8e69 100644 --- a/src/text-context.h +++ b/src/text-context.h @@ -17,7 +17,7 @@ /* #include <gdk/gdkic.h> */ #include <stddef.h> #include <sigc++/sigc++.h> -#include <gtk/gtkimcontext.h> +#include <gtk/gtk.h> #include "event-context.h" #include <2geom/point.h> diff --git a/src/ui/context-menu.cpp b/src/ui/context-menu.cpp index 05fe9a459..72e5ee63b 100644 --- a/src/ui/context-menu.cpp +++ b/src/ui/context-menu.cpp @@ -42,7 +42,7 @@ sp_object_menu(SPObject *object, SPDesktop *desktop, GtkMenu *menu) /* Implementation */ -#include <gtk/gtkmenuitem.h> +#include <gtk/gtk.h> #include <glibmm/i18n.h> diff --git a/src/ui/context-menu.h b/src/ui/context-menu.h index 36846edc3..1f8208ebe 100644 --- a/src/ui/context-menu.h +++ b/src/ui/context-menu.h @@ -11,7 +11,7 @@ * This code is in public domain */ -#include <gtk/gtkmenu.h> +#include <gtk/gtk.h> #include "forward.h" #include "sp-object.h" diff --git a/src/ui/dialog/color-item.cpp b/src/ui/dialog/color-item.cpp index 9f163c00c..da8393fc5 100644 --- a/src/ui/dialog/color-item.cpp +++ b/src/ui/dialog/color-item.cpp @@ -13,7 +13,7 @@ #include <errno.h> #include <glibmm/i18n.h> #include <gtkmm/label.h> -#include <gtk/gtkdnd.h> +#include <gtk/gtk.h> #include "color-item.h" diff --git a/src/ui/dialog/extensions.cpp b/src/ui/dialog/extensions.cpp index 3c778affe..27cd15e8c 100644 --- a/src/ui/dialog/extensions.cpp +++ b/src/ui/dialog/extensions.cpp @@ -9,7 +9,7 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include <gtk/gtkdialog.h> //for GTK_RESPONSE* types +#include <gtk/gtk.h> //for GTK_RESPONSE* types #include <gtkmm/scrolledwindow.h> #include "extension/db.h" diff --git a/src/ui/dialog/filedialogimpl-gtkmm.h b/src/ui/dialog/filedialogimpl-gtkmm.h index af607c124..1598a04d3 100644 --- a/src/ui/dialog/filedialogimpl-gtkmm.h +++ b/src/ui/dialog/filedialogimpl-gtkmm.h @@ -35,11 +35,7 @@ //Temporary ugly hack //Remove this after the get_filter() calls in //show() on both classes are fixed -#include <gtk/gtkfilechooser.h> - -//Another hack -#include <gtk/gtkentry.h> -#include <gtk/gtkexpander.h> +#include <gtk/gtk.h> //Inkscape includes #include "extension/input.h" diff --git a/src/ui/dialog/glyphs.cpp b/src/ui/dialog/glyphs.cpp index 8eef5d89b..fc0912539 100644 --- a/src/ui/dialog/glyphs.cpp +++ b/src/ui/dialog/glyphs.cpp @@ -22,9 +22,7 @@ #include <gtkmm/treemodelcolumn.h> #include <gtkmm/widget.h> -#include <gtk/gtkbutton.h> -#include <gtk/gtkstock.h> -#include <gtk/gtkversion.h> +#include <gtk/gtk.h> #include "glyphs.h" diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp index 28c59c321..ad3553b86 100644 --- a/src/ui/dialog/inkscape-preferences.cpp +++ b/src/ui/dialog/inkscape-preferences.cpp @@ -21,7 +21,7 @@ #include <gtkmm/scrolledwindow.h> #include <gtkmm/alignment.h> -#include <gtk/gtkicontheme.h> +#include <gtk/gtk.h> #include "preferences.h" #include "inkscape-preferences.h" diff --git a/src/ui/dialog/layers.cpp b/src/ui/dialog/layers.cpp index 30924ab86..8d2d25162 100644 --- a/src/ui/dialog/layers.cpp +++ b/src/ui/dialog/layers.cpp @@ -13,8 +13,7 @@ # include <config.h> #endif -#include <gtk/gtkstock.h> -#include <gtk/gtkmain.h> +#include <gtk/gtk.h> #include <gtkmm/widget.h> #include <gtkmm/icontheme.h> #include <glibmm/i18n.h> diff --git a/src/ui/dialog/ocaldialogs.h b/src/ui/dialog/ocaldialogs.h index 85aefade8..a7dfaa5cd 100644 --- a/src/ui/dialog/ocaldialogs.h +++ b/src/ui/dialog/ocaldialogs.h @@ -33,11 +33,9 @@ //Temporary ugly hack //Remove this after the get_filter() calls in //show() on both classes are fixed -#include <gtk/gtkfilechooser.h> +#include <gtk/gtk.h> //Another hack -#include <gtk/gtkentry.h> -#include <gtk/gtkexpander.h> #ifdef WITH_GNOME_VFS #include <libgnomevfs/gnome-vfs-init.h> // gnome_vfs_initialized #include<libgnomevfs/gnome-vfs.h> diff --git a/src/ui/dialog/print.h b/src/ui/dialog/print.h index cc27955cb..0184bc783 100644 --- a/src/ui/dialog/print.h +++ b/src/ui/dialog/print.h @@ -13,7 +13,7 @@ #include <glibmm/i18n.h> #include <gtkmm/printoperation.h> // GtkMM -#include <gtk/gtkprintoperation.h> // Gtk +#include <gtk/gtk.h> // Gtk #include "desktop.h" #include "sp-item.h" diff --git a/src/ui/dialog/session-player.cpp b/src/ui/dialog/session-player.cpp index d8ff8ca56..040c1419b 100644 --- a/src/ui/dialog/session-player.cpp +++ b/src/ui/dialog/session-player.cpp @@ -15,7 +15,7 @@ #include <glibmm.h> #include <glibmm/i18n.h> -#include <gtk/gtkdialog.h> +#include <gtk/gtk.h> #include <gtkmm.h> #include "inkscape.h" diff --git a/src/ui/dialog/swatches.cpp b/src/ui/dialog/swatches.cpp index 0f4626126..cbae7c26f 100644 --- a/src/ui/dialog/swatches.cpp +++ b/src/ui/dialog/swatches.cpp @@ -17,11 +17,7 @@ #include <map> #include <algorithm> -#include <gtk/gtkdialog.h> //for GTK_RESPONSE* types -#include <gtk/gtkdnd.h> -#include <gtk/gtkmenu.h> -#include <gtk/gtkmenuitem.h> -#include <gtk/gtkseparatormenuitem.h> +#include <gtk/gtk.h> //for GTK_RESPONSE* types #include <glibmm/i18n.h> #include <glibmm/main.h> #include <gdkmm/pixbuf.h> diff --git a/src/ui/dialog/tile.cpp b/src/ui/dialog/tile.cpp index 3510503d3..ae17214bf 100644 --- a/src/ui/dialog/tile.cpp +++ b/src/ui/dialog/tile.cpp @@ -18,8 +18,7 @@ # include <config.h> #endif -#include <gtk/gtkdialog.h> //for GTK_RESPONSE* types -#include <gtk/gtksizegroup.h> +#include <gtk/gtk.h> //for GTK_RESPONSE* types #include <glibmm/i18n.h> #include <gtkmm/stock.h> diff --git a/src/ui/dialog/tracedialog.cpp b/src/ui/dialog/tracedialog.cpp index 083cd0077..7fb172531 100644 --- a/src/ui/dialog/tracedialog.cpp +++ b/src/ui/dialog/tracedialog.cpp @@ -19,7 +19,7 @@ #include "ui/widget/spinbutton.h" #include <gtkmm/stock.h> -#include <gtk/gtkdialog.h> //for GTK_RESPONSE* types +#include <gtk/gtk.h> //for GTK_RESPONSE* types #include <glibmm/i18n.h> #include "desktop.h" diff --git a/src/ui/dialog/undo-history.cpp b/src/ui/dialog/undo-history.cpp index e6f113e48..4c3446a51 100644 --- a/src/ui/dialog/undo-history.cpp +++ b/src/ui/dialog/undo-history.cpp @@ -14,7 +14,7 @@ #endif #include <glibmm/i18n.h> -#include <gtk/gtkimage.h> +#include <gtk/gtk.h> #include <stddef.h> #include <sigc++/sigc++.h> diff --git a/src/ui/dialog/whiteboard-connect.cpp b/src/ui/dialog/whiteboard-connect.cpp index 0555281d4..ca18cd20d 100644 --- a/src/ui/dialog/whiteboard-connect.cpp +++ b/src/ui/dialog/whiteboard-connect.cpp @@ -14,7 +14,7 @@ */ #include <glibmm/i18n.h> -#include <gtk/gtkdialog.h> +#include <gtk/gtk.h> #include <gtkmm/entry.h> #include <gtkmm/checkbutton.h> #include <gtkmm/table.h> diff --git a/src/ui/dialog/whiteboard-sharewithchat.cpp b/src/ui/dialog/whiteboard-sharewithchat.cpp index 3315a7029..8ef69613a 100644 --- a/src/ui/dialog/whiteboard-sharewithchat.cpp +++ b/src/ui/dialog/whiteboard-sharewithchat.cpp @@ -16,7 +16,7 @@ #include <glibmm/i18n.h> #include <sigc++/sigc++.h> -#include <gtk/gtkdialog.h> +#include <gtk/gtk.h> #include "message-stack.h" #include "message-context.h" diff --git a/src/ui/dialog/whiteboard-sharewithuser.cpp b/src/ui/dialog/whiteboard-sharewithuser.cpp index 6d905b684..772184107 100644 --- a/src/ui/dialog/whiteboard-sharewithuser.cpp +++ b/src/ui/dialog/whiteboard-sharewithuser.cpp @@ -13,7 +13,7 @@ #include <glibmm/i18n.h> #include <sigc++/sigc++.h> -#include <gtk/gtkdialog.h> +#include <gtk/gtk.h> #include "message-stack.h" #include "message-context.h" diff --git a/src/ui/view/view-widget.h b/src/ui/view/view-widget.h index 9b5e9c4a8..7bdbdefb1 100644 --- a/src/ui/view/view-widget.h +++ b/src/ui/view/view-widget.h @@ -14,7 +14,7 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include <gtk/gtkeventbox.h> +#include <gtk/gtk.h> namespace Inkscape { namespace UI { diff --git a/src/ui/view/view.h b/src/ui/view/view.h index e6853555f..13499a2e4 100644 --- a/src/ui/view/view.h +++ b/src/ui/view/view.h @@ -14,7 +14,7 @@ * Released under GNU GPL, read the file 'COPYING' for more information */ -#include <gdk/gdktypes.h> +#include <gdk/gdk.h> #include <stddef.h> #include <sigc++/connection.h> #include "message.h" diff --git a/src/ui/widget/combo-text.cpp b/src/ui/widget/combo-text.cpp index 7706f7c29..43428adb8 100644 --- a/src/ui/widget/combo-text.cpp +++ b/src/ui/widget/combo-text.cpp @@ -23,7 +23,7 @@ #endif #include "combo-text.h" -#include <gtk/gtkcombobox.h> +#include <gtk/gtk.h> ComboText::ComboText() : Gtk::ComboBox() diff --git a/src/ui/widget/panel.cpp b/src/ui/widget/panel.cpp index b3c8ce376..3e0c27587 100644 --- a/src/ui/widget/panel.cpp +++ b/src/ui/widget/panel.cpp @@ -22,7 +22,7 @@ #include <gtkmm/dialog.h> // for Gtk::RESPONSE_* #include <gtkmm/stock.h> -#include <gtk/gtkiconfactory.h> +#include <gtk/gtk.h> #include "panel.h" #include "icon-size.h" diff --git a/src/ui/widget/selected-style.cpp b/src/ui/widget/selected-style.cpp index 50476dc65..ae8cd564e 100644 --- a/src/ui/widget/selected-style.cpp +++ b/src/ui/widget/selected-style.cpp @@ -14,7 +14,7 @@ # include <config.h> #endif -#include <gtk/gtkdnd.h> +#include <gtk/gtk.h> #include "selected-style.h" diff --git a/src/ui/widget/toolbox.cpp b/src/ui/widget/toolbox.cpp index e90a58b6e..5e5f43263 100644 --- a/src/ui/widget/toolbox.cpp +++ b/src/ui/widget/toolbox.cpp @@ -14,7 +14,7 @@ #endif #include <gtkmm/radioaction.h> -#include <gtk/gtkmain.h> +#include <gtk/gtk.h> #include "ui/widget/toolbox.h" #include "path-prefix.h" diff --git a/src/verbs.cpp b/src/verbs.cpp index 4dbe15a03..de935f700 100644 --- a/src/verbs.cpp +++ b/src/verbs.cpp @@ -29,7 +29,7 @@ #endif #include <cstring> -#include <gtk/gtkstock.h> +#include <gtk/gtk.h> #include <gtkmm/filechooserdialog.h> #include <gtkmm/messagedialog.h> #include <gtkmm/stock.h> 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" |