Commit 598da617 authored by Michael Natterer's avatar Michael Natterer 😴 Committed by Michael Natterer

Stop including single headers from gtk+ to be prepared for the upcoming

2008-05-23  Michael Natterer  <mitch@gimp.org>

	Stop including single headers from gtk+ to be prepared
	for the upcoming GTK_DISABLE_SINGLE_INCLUDES:

	* configure.in: add -DGTK_DISABLE_SINGLE_INCLUDES to CPPFLAGS.

	* app/display/gimpcanvas.h
	* app/display/gimpscalecombobox.h
	* app/display/gimpstatusbar.h
	* app/widgets/*.h
	* libgimp/gimpprogressbar.h
	* libgimp/gimpselectbutton.h
	* libgimpwidgets/*.h
	* libgimpwidgets/gimpstock.c
	* plug-ins/uri/gimpmountoperation.h: remove inclusion of parent
	classes and single files from gtk+.

	* app/widgets/gtkwrapbox.h
	* libgimp/gimpbrushmenu.c
	* libgimp/gimpfontmenu.c
	* libgimp/gimpgradientmenu.c
	* libgimp/gimppalettemenu.c
	* libgimp/gimppatternmenu.c
	* libgimp/gimpselectbutton.c: #include <gtk/gtk.h>

	* plug-ins/common/poppler.c: undef GTK_DISABLE_SINGLE_INCLUDES
	when including <poppler.h>.


svn path=/trunk/; revision=25781
parent 19a6177f
2008-05-23 Michael Natterer <mitch@gimp.org>
Stop including single headers from gtk+ to be prepared
for the upcoming GTK_DISABLE_SINGLE_INCLUDES:
* configure.in: add -DGTK_DISABLE_SINGLE_INCLUDES to CPPFLAGS.
* app/display/gimpcanvas.h
* app/display/gimpscalecombobox.h
* app/display/gimpstatusbar.h
* app/widgets/*.h
* libgimp/gimpprogressbar.h
* libgimp/gimpselectbutton.h
* libgimpwidgets/*.h
* libgimpwidgets/gimpstock.c
* plug-ins/uri/gimpmountoperation.h: remove inclusion of parent
classes and single files from gtk+.
* app/widgets/gtkwrapbox.h
* libgimp/gimpbrushmenu.c
* libgimp/gimpfontmenu.c
* libgimp/gimpgradientmenu.c
* libgimp/gimppalettemenu.c
* libgimp/gimppatternmenu.c
* libgimp/gimpselectbutton.c: #include <gtk/gtk.h>
* plug-ins/common/poppler.c: undef GTK_DISABLE_SINGLE_INCLUDES
when including <poppler.h>.
2008-05-23 Sven Neumann <sven@gimp.org>
* app/tools/gimpimagemaptool-settings.c: string change.
......
......@@ -20,9 +20,6 @@
#define __GIMP_CANVAS_H__
#include <gtk/gtkdrawingarea.h>
typedef enum
{
GIMP_CANVAS_STYLE_BLACK,
......
......@@ -22,8 +22,6 @@
#ifndef __GIMP_SCALE_COMBO_BOX_H__
#define __GIMP_SCALE_COMBO_BOX_H__
#include <gtk/gtkcomboboxentry.h>
#define GIMP_TYPE_SCALE_COMBO_BOX (gimp_scale_combo_box_get_type ())
#define GIMP_SCALE_COMBO_BOX(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_SCALE_COMBO_BOX, GimpScaleComboBox))
......
......@@ -19,10 +19,9 @@
#ifndef __GIMP_STATUSBAR_H__
#define __GIMP_STATUSBAR_H__
#include <gtk/gtkstatusbar.h>
G_BEGIN_DECLS
/* maximal length of the format string for the cursor-coordinates */
#define CURSOR_FORMAT_LENGTH 32
......
......@@ -23,9 +23,6 @@
#define __GIMP_ACTION_H__
#include <gtk/gtkaction.h>
#define GIMP_TYPE_ACTION (gimp_action_get_type ())
#define GIMP_ACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_ACTION, GimpAction))
#define GIMP_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_ACTION, GimpActionClass))
......
......@@ -22,8 +22,6 @@
#ifndef __GIMP_ACTION_GROUP_H__
#define __GIMP_ACTION_GROUP_H__
#include <gtk/gtkactiongroup.h>
#define GIMP_TYPE_ACTION_GROUP (gimp_action_group_get_type ())
#define GIMP_ACTION_GROUP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_ACTION_GROUP, GimpActionGroup))
......
......@@ -23,9 +23,6 @@
#define __GIMP_ACTION_VIEW_H__
#include <gtk/gtktreeview.h>
enum
{
GIMP_ACTION_VIEW_COLUMN_ACTION,
......
......@@ -22,9 +22,6 @@
#define __GIMP_BLOB_EDITOR_H__
#include "gtk/gtkdrawingarea.h"
#define GIMP_TYPE_BLOB_EDITOR (gimp_blob_editor_get_type ())
#define GIMP_BLOB_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_BLOB_EDITOR, GimpBlobEditor))
#define GIMP_BLOB_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_BLOB_EDITOR, GimpBlobEditorClass))
......
......@@ -23,9 +23,6 @@
#define __GIMP_CELL_RENDERER_DASHES_H__
#include <gtk/gtkcellrenderer.h>
#define GIMP_TYPE_CELL_RENDERER_DASHES (gimp_cell_renderer_dashes_get_type ())
#define GIMP_CELL_RENDERER_DASHES(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CELL_RENDERER_DASHES, GimpCellRendererDashes))
#define GIMP_CELL_RENDERER_DASHES_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CELL_RENDERER_DASHES, GimpCellRendererDashesClass))
......
......@@ -23,9 +23,6 @@
#define __GIMP_CELL_RENDERER_VIEWABLE_H__
#include <gtk/gtkcellrenderer.h>
#define GIMP_TYPE_CELL_RENDERER_VIEWABLE (gimp_cell_renderer_viewable_get_type ())
#define GIMP_CELL_RENDERER_VIEWABLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CELL_RENDERER_VIEWABLE, GimpCellRendererViewable))
#define GIMP_CELL_RENDERER_VIEWABLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CELL_RENDERER_VIEWABLE, GimpCellRendererViewableClass))
......
......@@ -20,9 +20,6 @@
#define __GIMP_COLOR_BAR_H__
#include <gtk/gtkmisc.h>
#define GIMP_TYPE_COLOR_BAR (gimp_color_bar_get_type ())
#define GIMP_COLOR_BAR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_COLOR_BAR, GimpColorBar))
#define GIMP_COLOR_BAR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_COLOR_BAR, GimpColorBarClass))
......
......@@ -23,9 +23,6 @@
#define __GIMP_COLOR_DISPLAY_EDITOR_H__
#include <gtk/gtkvbox.h>
#define GIMP_TYPE_COLOR_DISPLAY_EDITOR (gimp_color_display_editor_get_type ())
#define GIMP_COLOR_DISPLAY_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_COLOR_DISPLAY_EDITOR, GimpColorDisplayEditor))
#define GIMP_COLOR_DISPLAY_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_COLOR_DISPLAY_EDITOR, GimpColorDisplayEditorClass))
......
......@@ -20,9 +20,6 @@
#define __GIMP_COLOR_FRAME_H__
#include <gtk/gtkframe.h>
#define GIMP_COLOR_FRAME_ROWS 5
......
......@@ -23,9 +23,6 @@
#define __GIMP_CONTAINER_COMBO_BOX_H__
#include <gtk/gtkcombobox.h>
#define GIMP_TYPE_CONTAINER_COMBO_BOX (gimp_container_combo_box_get_type ())
#define GIMP_CONTAINER_COMBO_BOX(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CONTAINER_COMBO_BOX, GimpContainerComboBox))
#define GIMP_CONTAINER_COMBO_BOX_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CONTAINER_COMBO_BOX, GimpContainerComboBoxClass))
......
......@@ -23,9 +23,6 @@
#define __GIMP_CONTAINER_EDITOR_H__
#include <gtk/gtkvbox.h>
#define GIMP_TYPE_CONTAINER_EDITOR (gimp_container_editor_get_type ())
#define GIMP_CONTAINER_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CONTAINER_EDITOR, GimpContainerEditor))
#define GIMP_CONTAINER_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CONTAINER_EDITOR, GimpContainerEditorClass))
......
......@@ -23,9 +23,6 @@
#define __GIMP_CONTAINER_ENTRY_H__
#include <gtk/gtkentry.h>
enum
{
GIMP_CONTAINER_ENTRY_COLUMN_RENDERER,
......
......@@ -23,9 +23,6 @@
#define __GIMP_CONTAINER_POPUP_H__
#include <gtk/gtkwindow.h>
#define GIMP_TYPE_CONTAINER_POPUP (gimp_container_popup_get_type ())
#define GIMP_CONTAINER_POPUP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CONTAINER_POPUP, GimpContainerPopup))
#define GIMP_CONTAINER_POPUP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CONTAINER_POPUP, GimpContainerPopupClass))
......
......@@ -23,9 +23,6 @@
#define __GIMP_CONTROLLER_EDITOR_H__
#include <gtk/gtkvbox.h>
#define GIMP_TYPE_CONTROLLER_EDITOR (gimp_controller_editor_get_type ())
#define GIMP_CONTROLLER_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CONTROLLER_EDITOR, GimpControllerEditor))
#define GIMP_CONTROLLER_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CONTROLLER_EDITOR, GimpControllerEditorClass))
......
......@@ -23,9 +23,6 @@
#define __GIMP_CONTROLLER_LIST_H__
#include <gtk/gtkvbox.h>
#define GIMP_TYPE_CONTROLLER_LIST (gimp_controller_list_get_type ())
#define GIMP_CONTROLLER_LIST(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CONTROLLER_LIST, GimpControllerList))
#define GIMP_CONTROLLER_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CONTROLLER_LIST, GimpControllerListClass))
......
......@@ -23,9 +23,6 @@
#define __GIMP_DASH_EDITOR_H__
#include <gtk/gtkdrawingarea.h>
#define GIMP_TYPE_DASH_EDITOR (gimp_dash_editor_get_type ())
#define GIMP_DASH_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_DASH_EDITOR, GimpDashEditor))
#define GIMP_DASH_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_DASH_EDITOR, GimpDashEditorClass))
......
......@@ -23,9 +23,6 @@
#define __GIMP_DOCKABLE_H__
#include <gtk/gtkbin.h>
#define GIMP_DOCKABLE_DRAG_OFFSET (-6)
......
......@@ -23,9 +23,6 @@
#define __GIMP_DOCKBOOK_H__
#include <gtk/gtknotebook.h>
#define GIMP_TYPE_DOCKBOOK (gimp_dockbook_get_type ())
#define GIMP_DOCKBOOK(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_DOCKBOOK, GimpDockbook))
#define GIMP_DOCKBOOK_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_DOCKBOOK, GimpDockbookClass))
......
......@@ -23,9 +23,6 @@
#define __GIMP_DOCK_SEPARATOR_H__
#include <gtk/gtkeventbox.h>
#define GIMP_TYPE_DOCK_SEPARATOR (gimp_dock_separator_get_type ())
#define GIMP_DOCK_SEPARATOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_DOCK_SEPARATOR, GimpDockSeparator))
#define GIMP_DOCK_SEPARATOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_DOCK_SEPARATOR, GimpDockSeparatorClass))
......
......@@ -23,9 +23,6 @@
#define __GIMP_EDITOR_H__
#include <gtk/gtkvbox.h>
#define GIMP_TYPE_EDITOR (gimp_editor_get_type ())
#define GIMP_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_EDITOR, GimpEditor))
#define GIMP_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_EDITOR, GimpEditorClass))
......
......@@ -23,9 +23,6 @@
#define __GIMP_FG_BG_EDITOR_H__
#include <gtk/gtkdrawingarea.h>
#define GIMP_TYPE_FG_BG_EDITOR (gimp_fg_bg_editor_get_type ())
#define GIMP_FG_BG_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_FG_BG_EDITOR, GimpFgBgEditor))
#define GIMP_FG_BG_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_FG_BG_EDITOR, GimpFgBgEditorClass))
......
......@@ -23,9 +23,6 @@
#define __GIMP_FG_BG_VIEW_H__
#include <gtk/gtkdrawingarea.h>
#define GIMP_TYPE_FG_BG_VIEW (gimp_fg_bg_view_get_type ())
#define GIMP_FG_BG_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_FG_BG_VIEW, GimpFgBgView))
#define GIMP_FG_BG_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_FG_BG_VIEW, GimpFgBgViewClass))
......
......@@ -23,9 +23,6 @@
#define __GIMP_FILE_PROC_VIEW_H__
#include <gtk/gtktreeview.h>
#define GIMP_TYPE_FILE_PROC_VIEW (gimp_file_proc_view_get_type ())
#define GIMP_FILE_PROC_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_FILE_PROC_VIEW, GimpFileProcView))
#define GIMP_FILE_PROC_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_FILE_PROC_VIEW, GimpFileProcViewClass))
......
......@@ -23,9 +23,6 @@
#define __GIMP_GRID_EDITOR_H__
#include <gtk/gtkvbox.h>
#define GIMP_TYPE_GRID_EDITOR (gimp_grid_editor_get_type ())
#define GIMP_GRID_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_GRID_EDITOR, GimpGridEditor))
#define GIMP_GRID_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_GRID_EDITOR, GimpGridEditorClass))
......
......@@ -20,9 +20,6 @@
#define __GIMP_HANDLE_BAR_H__
#include <gtk/gtkmisc.h>
#define GIMP_TYPE_HANDLE_BAR (gimp_handle_bar_get_type ())
#define GIMP_HANDLE_BAR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_HANDLE_BAR, GimpHandleBar))
#define GIMP_HANDLE_BAR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_HANDLE_BAR, GimpHandleBarClass))
......
......@@ -20,9 +20,6 @@
#define __GIMP_HISTOGRAM_VIEW_H__
#include <gtk/gtkdrawingarea.h>
#define GIMP_TYPE_HISTOGRAM_VIEW (gimp_histogram_view_get_type ())
#define GIMP_HISTOGRAM_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_HISTOGRAM_VIEW, GimpHistogramView))
#define GIMP_HISTOGRAM_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_HISTOGRAM_VIEW, GimpHistogramViewClass))
......
......@@ -23,9 +23,6 @@
#define __GIMP_IMAGE_PARASITE_VIEW_H__
#include <gtk/gtkvbox.h>
#define GIMP_TYPE_IMAGE_PARASITE_VIEW (gimp_image_parasite_view_get_type ())
#define GIMP_IMAGE_PARASITE_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_IMAGE_PARASITE_VIEW, GimpImageParasiteView))
#define GIMP_IMAGE_PARASITE_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_IMAGE_PARASITE_VIEW, GimpImageParasiteViewClass))
......
......@@ -23,9 +23,6 @@
#define __GIMP_IMAGE_PROP_VIEW_H__
#include <gtk/gtktable.h>
#define GIMP_TYPE_IMAGE_PROP_VIEW (gimp_image_prop_view_get_type ())
#define GIMP_IMAGE_PROP_VIEW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_IMAGE_PROP_VIEW, GimpImagePropView))
#define GIMP_IMAGE_PROP_VIEW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_IMAGE_PROP_VIEW, GimpImagePropViewClass))
......
......@@ -22,8 +22,6 @@
#ifndef __GIMP_PROGRESS_BOX_H__
#define __GIMP_PROGRESS_BOX_H__
#include <gtk/gtkvbox.h>
G_BEGIN_DECLS
......
......@@ -24,9 +24,6 @@
#define __GIMP_RADIO_ACTION_H__
#include <gtk/gtkradioaction.h>
#define GIMP_TYPE_RADIO_ACTION (gimp_radio_action_get_type ())
#define GIMP_RADIO_ACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_RADIO_ACTION, GimpRadioAction))
#define GIMP_RADIO_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_RADIO_ACTION, GimpRadioActionClass))
......
......@@ -23,9 +23,6 @@
#define __GIMP_STROKE_EDITOR_H__
#include <gtk/gtkvbox.h>
#define GIMP_TYPE_STROKE_EDITOR (gimp_stroke_editor_get_type ())
#define GIMP_STROKE_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_STROKE_EDITOR, GimpStrokeEditor))
#define GIMP_STROKE_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_STROKE_EDITOR, GimpStrokeEditorClass))
......
......@@ -23,9 +23,6 @@
#define __GIMP_TEMPLATE_EDITOR_H__
#include <gtk/gtkvbox.h>
#define GIMP_TYPE_TEMPLATE_EDITOR (gimp_template_editor_get_type ())
#define GIMP_TEMPLATE_EDITOR(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TEMPLATE_EDITOR, GimpTemplateEditor))
#define GIMP_TEMPLATE_EDITOR_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_TEMPLATE_EDITOR, GimpTemplateEditorClass))
......
......@@ -24,9 +24,6 @@
#define __GIMP_TOGGLE_ACTION_H__
#include <gtk/gtktoggleaction.h>
#define GIMP_TYPE_TOGGLE_ACTION (gimp_toggle_action_get_type ())
#define GIMP_TOGGLE_ACTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_TOGGLE_ACTION, GimpToggleAction))
#define GIMP_TOGGLE_ACTION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_TOGGLE_ACTION, GimpToggleActionClass))
......
......@@ -22,8 +22,6 @@
#ifndef __GIMP_UI_MANAGER_H__
#define __GIMP_UI_MANAGER_H__
#include <gtk/gtkuimanager.h>
typedef struct _GimpUIManagerUIEntry GimpUIManagerUIEntry;
......
......@@ -22,8 +22,6 @@
#ifndef __GIMP_UNIT_COMBO_BOX_H__
#define __GIMP_UNIT_COMBO_BOX_H__
#include <gtk/gtkcombobox.h>
#define GIMP_TYPE_UNIT_COMBO_BOX (gimp_unit_combo_box_get_type ())
#define GIMP_UNIT_COMBO_BOX(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_UNIT_COMBO_BOX, GimpUnitComboBox))
......
......@@ -22,9 +22,6 @@
#define __GIMP_WINDOW_H__
#include <gtk/gtkwindow.h>
#define GIMP_TYPE_WINDOW (gimp_window_get_type ())
#define GIMP_WINDOW(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_WINDOW, GimpWindow))
#define GIMP_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_WINDOW, GimpWindowClass))
......@@ -46,7 +43,7 @@ struct _GimpWindowClass
};
GType gimp_window_get_type (void) G_GNUC_CONST;
GType gimp_window_get_type (void) G_GNUC_CONST;
#endif /* __GIMP_WINDOW_H__ */
......@@ -23,8 +23,7 @@
#ifndef __GTK_WRAP_BOX_H__
#define __GTK_WRAP_BOX_H__
#include <gtk/gtkcontainer.h>
#include <gtk/gtk.h>
G_BEGIN_DECLS
......
......@@ -1839,7 +1839,7 @@ AC_SUBST(MIME_TYPES)
# Disable deprecated APIs
#########################
CPPFLAGS="${CPPFLAGS} -DGIMP_DISABLE_DEPRECATED -DG_DISABLE_SINGLE_INCLUDES"
CPPFLAGS="${CPPFLAGS} -DGIMP_DISABLE_DEPRECATED -DG_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES"
if test "x$have_glib_2_19" != "xyes"; then
CPPFLAGS="${CPPFLAGS} -DG_DISABLE_DEPRECATED"
......
......@@ -22,6 +22,8 @@
#include "config.h"
#include <gtk/gtk.h>
#include "gimp.h"
#include "gimpuitypes.h"
......
......@@ -22,6 +22,8 @@
#include "config.h"
#include <gtk/gtk.h>
#include "gimp.h"
#include "gimpuitypes.h"
......
......@@ -22,6 +22,8 @@
#include "config.h"
#include <gtk/gtk.h>
#include "gimp.h"
#include "gimpuitypes.h"
......
......@@ -22,6 +22,8 @@
#include "config.h"
#include <gtk/gtk.h>
#include "gimp.h"
#include "gimpuitypes.h"
......
......@@ -22,6 +22,8 @@
#include "config.h"
#include <gtk/gtk.h>
#include "gimp.h"
#include "gimpuitypes.h"
......
......@@ -23,8 +23,6 @@
#ifndef __GIMP_PROGRESS_BAR_H__
#define __GIMP_PROGRESS_BAR_H__
#include <gtk/gtkprogressbar.h>
G_BEGIN_DECLS
......
......@@ -22,7 +22,10 @@
#include "config.h"
#include <gtk/gtk.h>
#include "gimp.h"
#include "gimpuitypes.h"
#include "gimpselectbutton.h"
......
......@@ -22,8 +22,6 @@
#ifndef __GIMP_SELECT_BUTTON_H__
#define __GIMP_SELECT_BUTTON_H__
#include <gtk/gtkhbox.h>
G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
......
......@@ -23,8 +23,6 @@
#ifndef __GIMP_BROWSER_H__
#define __GIMP_BROWSER_H__
#include <gtk/gtkhpaned.h>
G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
......
......@@ -23,8 +23,6 @@
#ifndef __GIMP_BUTTON_H__
#define __GIMP_BUTTON_H__
#include <gtk/gtkbutton.h>
G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
......
......@@ -31,8 +31,6 @@
#ifndef __GIMP_CHAIN_BUTTON_H__
#define __GIMP_CHAIN_BUTTON_H__
#include <gtk/gtktable.h>
G_BEGIN_DECLS
......
......@@ -28,8 +28,6 @@
#ifndef __GIMP_COLOR_AREA_H__
#define __GIMP_COLOR_AREA_H__
#include <gtk/gtkdrawingarea.h>
G_BEGIN_DECLS
......
......@@ -23,8 +23,6 @@
#ifndef __GIMP_COLOR_PROFILE_COMBO_BOX_H__
#define __GIMP_COLOR_PROFILE_COMBO_BOX_H__
#include <gtk/gtkcombobox.h>
G_BEGIN_DECLS
#define GIMP_TYPE_COLOR_PROFILE_COMBO_BOX (gimp_color_profile_combo_box_get_type ())
......
......@@ -23,8 +23,6 @@
#ifndef __GIMP_COLOR_PROFILE_STORE_H__
#define __GIMP_COLOR_PROFILE_STORE_H__
#include <gtk/gtkliststore.h>
G_BEGIN_DECLS
......
......@@ -29,8 +29,6 @@
#ifndef __GIMP_COLOR_SCALE_H__
#define __GIMP_COLOR_SCALE_H__
#include <gtk/gtkscale.h>
G_BEGIN_DECLS
......
......@@ -23,8 +23,6 @@
#ifndef __GIMP_DIALOG_H__
#define __GIMP_DIALOG_H__
#include <gtk/gtkdialog.h>
G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
......
......@@ -23,8 +23,6 @@
#ifndef __GIMP_ENUM__LABEL_H__
#define __GIMP_ENUM__LABEL_H__
#include <gtk/gtklabel.h>
G_BEGIN_DECLS
#define GIMP_TYPE_ENUM_LABEL (gimp_enum_label_get_type ())
......
......@@ -23,8 +23,6 @@
#ifndef __GIMP_FRAME_H__
#define __GIMP_FRAME_H__
#include <gtk/gtkframe.h>
G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
......
......@@ -23,8 +23,6 @@
#ifndef __GIMP_INT_COMBO_BOX_H__
#define __GIMP_INT_COMBO_BOX_H__
#include <gtk/gtkcombobox.h>
G_BEGIN_DECLS
......
......@@ -23,8 +23,6 @@
#ifndef __GIMP_INT_STORE_H__
#define __GIMP_INT_STORE_H__
#include <gtk/gtkliststore.h>
G_BEGIN_DECLS
typedef enum
......
......@@ -23,8 +23,6 @@
#ifndef __GIMP_MEMSIZE_ENTRY_H__
#define __GIMP_MEMSIZE_ENTRY_H__
#include <gtk/gtkhbox.h>
G_BEGIN_DECLS
......
......@@ -23,8 +23,6 @@
#ifndef __GIMP_PAGE_SELECTOR_H__
#define __GIMP_PAGE_SELECTOR_H__
#include <gtk/gtkvbox.h>
G_BEGIN_DECLS
#define GIMP_TYPE_PAGE_SELECTOR (gimp_page_selector_get_type ())
......
......@@ -20,8 +20,6 @@
#ifndef __GIMP_PICK_BUTTON_H__
#define __GIMP_PICK_BUTTON_H__
#include <gtk/gtkbutton.h>
G_BEGIN_DECLS
......
......@@ -25,8 +25,6 @@
#ifndef __GIMP_PIXMAP_H__
#define __GIMP_PIXMAP_H__
#include <gtk/gtkimage.h>
G_BEGIN_DECLS
/* For information look into the C source or the html documentation */
......
......@@ -22,8 +22,6 @@
#ifndef __GIMP_PREVIEW_H__
#define __GIMP_PREVIEW_H__
#include <gtk/gtkvbox.h>
G_BEGIN_DECLS
......
......@@ -20,8 +20,6 @@
#ifndef __GIMP_PREVIEW_AREA_H__
#define __GIMP_PREVIEW_AREA_H__
#include <gtk/gtkdrawingarea.h>
G_BEGIN_DECLS
......
......@@ -23,7 +23,6 @@
#include "config.h"
#include <gtk/gtk.h>
#include <gtk/gtkiconfactory.h>
#include "gimpstock.h"
......
......@@ -23,8 +23,6 @@
#ifndef __GIMP_STRING_COMBO_BOX_H__
#define __GIMP_STRING_COMBO_BOX_H__
#include <gtk/gtkcombobox.h>
G_BEGIN_DECLS