GNOME.org
 

gimp r25781 - in trunk: . app/display app/widgets libgimp libgimpwidgets plug-ins/common plug-ins/uri

Author: mitch
Date: Fri May 23 20:38:52 2008
New Revision: 25781
URL: http://svn.gnome.org/viewvc/gimp?rev=25781&view=rev

Log:
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>.



Modified:
   trunk/ChangeLog
   trunk/app/display/gimpcanvas.h
   trunk/app/display/gimpscalecombobox.h
   trunk/app/display/gimpstatusbar.h
   trunk/app/widgets/gimpaction.h
   trunk/app/widgets/gimpactiongroup.h
   trunk/app/widgets/gimpactionview.h
   trunk/app/widgets/gimpblobeditor.h
   trunk/app/widgets/gimpcellrendererdashes.h
   trunk/app/widgets/gimpcellrendererviewable.h
   trunk/app/widgets/gimpcolorbar.h
   trunk/app/widgets/gimpcolordisplayeditor.h
   trunk/app/widgets/gimpcolorframe.h
   trunk/app/widgets/gimpcontainercombobox.h
   trunk/app/widgets/gimpcontainereditor.h
   trunk/app/widgets/gimpcontainerentry.h
   trunk/app/widgets/gimpcontainerpopup.h
   trunk/app/widgets/gimpcontrollereditor.h
   trunk/app/widgets/gimpcontrollerlist.h
   trunk/app/widgets/gimpdasheditor.h
   trunk/app/widgets/gimpdockable.h
   trunk/app/widgets/gimpdockbook.h
   trunk/app/widgets/gimpdockseparator.h
   trunk/app/widgets/gimpeditor.h
   trunk/app/widgets/gimpfgbgeditor.h
   trunk/app/widgets/gimpfgbgview.h
   trunk/app/widgets/gimpfileprocview.h
   trunk/app/widgets/gimpgrideditor.h
   trunk/app/widgets/gimphandlebar.h
   trunk/app/widgets/gimphistogramview.h
   trunk/app/widgets/gimpimageparasiteview.h
   trunk/app/widgets/gimpimagepropview.h
   trunk/app/widgets/gimpprogressbox.h
   trunk/app/widgets/gimpradioaction.h
   trunk/app/widgets/gimpstrokeeditor.h
   trunk/app/widgets/gimptemplateeditor.h
   trunk/app/widgets/gimptoggleaction.h
   trunk/app/widgets/gimpuimanager.h
   trunk/app/widgets/gimpunitcombobox.h
   trunk/app/widgets/gimpwindow.h
   trunk/app/widgets/gtkwrapbox.h
   trunk/configure.in
   trunk/libgimp/gimpbrushmenu.c
   trunk/libgimp/gimpfontmenu.c
   trunk/libgimp/gimpgradientmenu.c
   trunk/libgimp/gimppalettemenu.c
   trunk/libgimp/gimppatternmenu.c
   trunk/libgimp/gimpprogressbar.h
   trunk/libgimp/gimpselectbutton.c
   trunk/libgimp/gimpselectbutton.h
   trunk/libgimpwidgets/gimpbrowser.h
   trunk/libgimpwidgets/gimpbutton.h
   trunk/libgimpwidgets/gimpchainbutton.h
   trunk/libgimpwidgets/gimpcolorarea.h
   trunk/libgimpwidgets/gimpcolorprofilecombobox.h
   trunk/libgimpwidgets/gimpcolorprofilestore.h
   trunk/libgimpwidgets/gimpcolorscale.h
   trunk/libgimpwidgets/gimpdialog.h
   trunk/libgimpwidgets/gimpenumlabel.h
   trunk/libgimpwidgets/gimpframe.h
   trunk/libgimpwidgets/gimpintcombobox.h
   trunk/libgimpwidgets/gimpintstore.h
   trunk/libgimpwidgets/gimpmemsizeentry.h
   trunk/libgimpwidgets/gimppageselector.h
   trunk/libgimpwidgets/gimppickbutton.h
   trunk/libgimpwidgets/gimppixmap.h
   trunk/libgimpwidgets/gimppreview.h
   trunk/libgimpwidgets/gimppreviewarea.h
   trunk/libgimpwidgets/gimpstock.c
   trunk/libgimpwidgets/gimpstringcombobox.h
   trunk/libgimpwidgets/gimpunitmenu.h
   trunk/plug-ins/common/poppler.c
   trunk/plug-ins/uri/gimpmountoperation.h

Modified: trunk/app/display/gimpcanvas.h
==============================================================================
--- trunk/app/display/gimpcanvas.h	(original)
+++ trunk/app/display/gimpcanvas.h	Fri May 23 20:38:52 2008
@@ -20,9 +20,6 @@
 #define __GIMP_CANVAS_H__
 
 
-#include <gtk/gtkdrawingarea.h>
-
-
 typedef enum
 {
   GIMP_CANVAS_STYLE_BLACK,

Modified: trunk/app/display/gimpscalecombobox.h
==============================================================================
--- trunk/app/display/gimpscalecombobox.h	(original)
+++ trunk/app/display/gimpscalecombobox.h	Fri May 23 20:38:52 2008
@@ -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))

Modified: trunk/app/display/gimpstatusbar.h
==============================================================================
--- trunk/app/display/gimpstatusbar.h	(original)
+++ trunk/app/display/gimpstatusbar.h	Fri May 23 20:38:52 2008
@@ -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
 

Modified: trunk/app/widgets/gimpaction.h
==============================================================================
--- trunk/app/widgets/gimpaction.h	(original)
+++ trunk/app/widgets/gimpaction.h	Fri May 23 20:38:52 2008
@@ -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))

Modified: trunk/app/widgets/gimpactiongroup.h
==============================================================================
--- trunk/app/widgets/gimpactiongroup.h	(original)
+++ trunk/app/widgets/gimpactiongroup.h	Fri May 23 20:38:52 2008
@@ -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))

Modified: trunk/app/widgets/gimpactionview.h
==============================================================================
--- trunk/app/widgets/gimpactionview.h	(original)
+++ trunk/app/widgets/gimpactionview.h	Fri May 23 20:38:52 2008
@@ -23,9 +23,6 @@
 #define __GIMP_ACTION_VIEW_H__
 
 
-#include <gtk/gtktreeview.h>
-
-
 enum
 {
   GIMP_ACTION_VIEW_COLUMN_ACTION,

Modified: trunk/app/widgets/gimpblobeditor.h
==============================================================================
--- trunk/app/widgets/gimpblobeditor.h	(original)
+++ trunk/app/widgets/gimpblobeditor.h	Fri May 23 20:38:52 2008
@@ -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))

Modified: trunk/app/widgets/gimpcellrendererdashes.h
==============================================================================
--- trunk/app/widgets/gimpcellrendererdashes.h	(original)
+++ trunk/app/widgets/gimpcellrendererdashes.h	Fri May 23 20:38:52 2008
@@ -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))

Modified: trunk/app/widgets/gimpcellrendererviewable.h
==============================================================================
--- trunk/app/widgets/gimpcellrendererviewable.h	(original)
+++ trunk/app/widgets/gimpcellrendererviewable.h	Fri May 23 20:38:52 2008
@@ -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))

Modified: trunk/app/widgets/gimpcolorbar.h
==============================================================================
--- trunk/app/widgets/gimpcolorbar.h	(original)
+++ trunk/app/widgets/gimpcolorbar.h	Fri May 23 20:38:52 2008
@@ -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))

Modified: trunk/app/widgets/gimpcolordisplayeditor.h
==============================================================================
--- trunk/app/widgets/gimpcolordisplayeditor.h	(original)
+++ trunk/app/widgets/gimpcolordisplayeditor.h	Fri May 23 20:38:52 2008
@@ -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))

Modified: trunk/app/widgets/gimpcolorframe.h
==============================================================================
--- trunk/app/widgets/gimpcolorframe.h	(original)
+++ trunk/app/widgets/gimpcolorframe.h	Fri May 23 20:38:52 2008
@@ -20,9 +20,6 @@
 #define __GIMP_COLOR_FRAME_H__
 
 
-#include <gtk/gtkframe.h>
-
-
 #define GIMP_COLOR_FRAME_ROWS 5
 
 

Modified: trunk/app/widgets/gimpcontainercombobox.h
==============================================================================
--- trunk/app/widgets/gimpcontainercombobox.h	(original)
+++ trunk/app/widgets/gimpcontainercombobox.h	Fri May 23 20:38:52 2008
@@ -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))

Modified: trunk/app/widgets/gimpcontainereditor.h
==============================================================================
--- trunk/app/widgets/gimpcontainereditor.h	(original)
+++ trunk/app/widgets/gimpcontainereditor.h	Fri May 23 20:38:52 2008
@@ -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))

Modified: trunk/app/widgets/gimpcontainerentry.h
==============================================================================
--- trunk/app/widgets/gimpcontainerentry.h	(original)
+++ trunk/app/widgets/gimpcontainerentry.h	Fri May 23 20:38:52 2008
@@ -23,9 +23,6 @@
 #define __GIMP_CONTAINER_ENTRY_H__
 
 
-#include <gtk/gtkentry.h>
-
-
 enum
 {
   GIMP_CONTAINER_ENTRY_COLUMN_RENDERER,

Modified: trunk/app/widgets/gimpcontainerpopup.h
==============================================================================
--- trunk/app/widgets/gimpcontainerpopup.h	(original)
+++ trunk/app/widgets/gimpcontainerpopup.h	Fri May 23 20:38:52 2008
@@ -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))

Modified: trunk/app/widgets/gimpcontrollereditor.h
==============================================================================
--- trunk/app/widgets/gimpcontrollereditor.h	(original)
+++ trunk/app/widgets/gimpcontrollereditor.h	Fri May 23 20:38:52 2008
@@ -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))

Modified: trunk/app/widgets/gimpcontrollerlist.h
==============================================================================
--- trunk/app/widgets/gimpcontrollerlist.h	(original)
+++ trunk/app/widgets/gimpcontrollerlist.h	Fri May 23 20:38:52 2008
@@ -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))

Modified: trunk/app/widgets/gimpdasheditor.h
==============================================================================
--- trunk/app/widgets/gimpdasheditor.h	(original)
+++ trunk/app/widgets/gimpdasheditor.h	Fri May 23 20:38:52 2008
@@ -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))

Modified: trunk/app/widgets/gimpdockable.h
==============================================================================
--- trunk/app/widgets/gimpdockable.h	(original)
+++ trunk/app/widgets/gimpdockable.h	Fri May 23 20:38:52 2008
@@ -23,9 +23,6 @@
 #define __GIMP_DOCKABLE_H__
 
 
-#include <gtk/gtkbin.h>
-
-
 #define GIMP_DOCKABLE_DRAG_OFFSET (-6)
 
 

Modified: trunk/app/widgets/gimpdockbook.h
==============================================================================
--- trunk/app/widgets/gimpdockbook.h	(original)
+++ trunk/app/widgets/gimpdockbook.h	Fri May 23 20:38:52 2008
@@ -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))

Modified: trunk/app/widgets/gimpdockseparator.h
==============================================================================
--- trunk/app/widgets/gimpdockseparator.h	(original)
+++ trunk/app/widgets/gimpdockseparator.h	Fri May 23 20:38:52 2008
@@ -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))

Modified: trunk/app/widgets/gimpeditor.h
==============================================================================
--- trunk/app/widgets/gimpeditor.h	(original)
+++ trunk/app/widgets/gimpeditor.h	Fri May 23 20:38:52 2008
@@ -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))

Modified: trunk/app/widgets/gimpfgbgeditor.h
==============================================================================
--- trunk/app/widgets/gimpfgbgeditor.h	(original)
+++ trunk/app/widgets/gimpfgbgeditor.h	Fri May 23 20:38:52 2008
@@ -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))

Modified: trunk/app/widgets/gimpfgbgview.h
==============================================================================
--- trunk/app/widgets/gimpfgbgview.h	(original)
+++ trunk/app/widgets/gimpfgbgview.h	Fri May 23 20:38:52 2008
@@ -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))

Modified: trunk/app/widgets/gimpfileprocview.h
==============================================================================
--- trunk/app/widgets/gimpfileprocview.h	(original)
+++ trunk/app/widgets/gimpfileprocview.h	Fri May 23 20:38:52 2008
@@ -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))

Modified: trunk/app/widgets/gimpgrideditor.h
==============================================================================
--- trunk/app/widgets/gimpgrideditor.h	(original)
+++ trunk/app/widgets/gimpgrideditor.h	Fri May 23 20:38:52 2008
@@ -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))

Modified: trunk/app/widgets/gimphandlebar.h
==============================================================================
--- trunk/app/widgets/gimphandlebar.h	(original)
+++ trunk/app/widgets/gimphandlebar.h	Fri May 23 20:38:52 2008
@@ -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))

Modified: trunk/app/widgets/gimphistogramview.h
==============================================================================
--- trunk/app/widgets/gimphistogramview.h	(original)
+++ trunk/app/widgets/gimphistogramview.h	Fri May 23 20:38:52 2008
@@ -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))

Modified: trunk/app/widgets/gimpimageparasiteview.h
==============================================================================
--- trunk/app/widgets/gimpimageparasiteview.h	(original)
+++ trunk/app/widgets/gimpimageparasiteview.h	Fri May 23 20:38:52 2008
@@ -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))

Modified: trunk/app/widgets/gimpimagepropview.h
==============================================================================
--- trunk/app/widgets/gimpimagepropview.h	(original)
+++ trunk/app/widgets/gimpimagepropview.h	Fri May 23 20:38:52 2008
@@ -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))

Modified: trunk/app/widgets/gimpprogressbox.h
==============================================================================
--- trunk/app/widgets/gimpprogressbox.h	(original)
+++ trunk/app/widgets/gimpprogressbox.h	Fri May 23 20:38:52 2008
@@ -22,8 +22,6 @@
 #ifndef __GIMP_PROGRESS_BOX_H__
 #define __GIMP_PROGRESS_BOX_H__
 
-#include <gtk/gtkvbox.h>
-
 G_BEGIN_DECLS
 
 

Modified: trunk/app/widgets/gimpradioaction.h
==============================================================================
--- trunk/app/widgets/gimpradioaction.h	(original)
+++ trunk/app/widgets/gimpradioaction.h	Fri May 23 20:38:52 2008
@@ -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))

Modified: trunk/app/widgets/gimpstrokeeditor.h
==============================================================================
--- trunk/app/widgets/gimpstrokeeditor.h	(original)
+++ trunk/app/widgets/gimpstrokeeditor.h	Fri May 23 20:38:52 2008
@@ -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))

Modified: trunk/app/widgets/gimptemplateeditor.h
==============================================================================
--- trunk/app/widgets/gimptemplateeditor.h	(original)
+++ trunk/app/widgets/gimptemplateeditor.h	Fri May 23 20:38:52 2008
@@ -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))

Modified: trunk/app/widgets/gimptoggleaction.h
==============================================================================
--- trunk/app/widgets/gimptoggleaction.h	(original)
+++ trunk/app/widgets/gimptoggleaction.h	Fri May 23 20:38:52 2008
@@ -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))

Modified: trunk/app/widgets/gimpuimanager.h
==============================================================================
--- trunk/app/widgets/gimpuimanager.h	(original)
+++ trunk/app/widgets/gimpuimanager.h	Fri May 23 20:38:52 2008
@@ -22,8 +22,6 @@
 #ifndef __GIMP_UI_MANAGER_H__
 #define __GIMP_UI_MANAGER_H__
 
-#include <gtk/gtkuimanager.h>
-
 
 typedef struct _GimpUIManagerUIEntry GimpUIManagerUIEntry;
 

Modified: trunk/app/widgets/gimpunitcombobox.h
==============================================================================
--- trunk/app/widgets/gimpunitcombobox.h	(original)
+++ trunk/app/widgets/gimpunitcombobox.h	Fri May 23 20:38:52 2008
@@ -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))

Modified: trunk/app/widgets/gimpwindow.h
==============================================================================
--- trunk/app/widgets/gimpwindow.h	(original)
+++ trunk/app/widgets/gimpwindow.h	Fri May 23 20:38:52 2008
@@ -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 @@
 };
 
 
-GType   gimp_window_get_type     (void) G_GNUC_CONST;
+GType   gimp_window_get_type (void) G_GNUC_CONST;
 
 
 #endif /* __GIMP_WINDOW_H__ */

Modified: trunk/app/widgets/gtkwrapbox.h
==============================================================================
--- trunk/app/widgets/gtkwrapbox.h	(original)
+++ trunk/app/widgets/gtkwrapbox.h	Fri May 23 20:38:52 2008
@@ -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
 

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Fri May 23 20:38:52 2008
@@ -1839,7 +1839,7 @@
 # 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"

Modified: trunk/libgimp/gimpbrushmenu.c
==============================================================================
--- trunk/libgimp/gimpbrushmenu.c	(original)
+++ trunk/libgimp/gimpbrushmenu.c	Fri May 23 20:38:52 2008
@@ -22,6 +22,8 @@
 
 #include "config.h"
 
+#include <gtk/gtk.h>
+
 #include "gimp.h"
 
 #include "gimpuitypes.h"

Modified: trunk/libgimp/gimpfontmenu.c
==============================================================================
--- trunk/libgimp/gimpfontmenu.c	(original)
+++ trunk/libgimp/gimpfontmenu.c	Fri May 23 20:38:52 2008
@@ -22,6 +22,8 @@
 
 #include "config.h"
 
+#include <gtk/gtk.h>
+
 #include "gimp.h"
 
 #include "gimpuitypes.h"

Modified: trunk/libgimp/gimpgradientmenu.c
==============================================================================
--- trunk/libgimp/gimpgradientmenu.c	(original)
+++ trunk/libgimp/gimpgradientmenu.c	Fri May 23 20:38:52 2008
@@ -22,6 +22,8 @@
 
 #include "config.h"
 
+#include <gtk/gtk.h>
+
 #include "gimp.h"
 
 #include "gimpuitypes.h"

Modified: trunk/libgimp/gimppalettemenu.c
==============================================================================
--- trunk/libgimp/gimppalettemenu.c	(original)
+++ trunk/libgimp/gimppalettemenu.c	Fri May 23 20:38:52 2008
@@ -22,6 +22,8 @@
 
 #include "config.h"
 
+#include <gtk/gtk.h>
+
 #include "gimp.h"
 
 #include "gimpuitypes.h"

Modified: trunk/libgimp/gimppatternmenu.c
==============================================================================
--- trunk/libgimp/gimppatternmenu.c	(original)
+++ trunk/libgimp/gimppatternmenu.c	Fri May 23 20:38:52 2008
@@ -22,6 +22,8 @@
 
 #include "config.h"
 
+#include <gtk/gtk.h>
+
 #include "gimp.h"
 
 #include "gimpuitypes.h"

Modified: trunk/libgimp/gimpprogressbar.h
==============================================================================
--- trunk/libgimp/gimpprogressbar.h	(original)
+++ trunk/libgimp/gimpprogressbar.h	Fri May 23 20:38:52 2008
@@ -23,8 +23,6 @@
 #ifndef __GIMP_PROGRESS_BAR_H__
 #define __GIMP_PROGRESS_BAR_H__
 
-#include <gtk/gtkprogressbar.h>
-
 G_BEGIN_DECLS
 
 

Modified: trunk/libgimp/gimpselectbutton.c
==============================================================================
--- trunk/libgimp/gimpselectbutton.c	(original)
+++ trunk/libgimp/gimpselectbutton.c	Fri May 23 20:38:52 2008
@@ -22,7 +22,10 @@
 
 #include "config.h"
 
+#include <gtk/gtk.h>
+
 #include "gimp.h"
+
 #include "gimpuitypes.h"
 #include "gimpselectbutton.h"
 

Modified: trunk/libgimp/gimpselectbutton.h
==============================================================================
--- trunk/libgimp/gimpselectbutton.h	(original)
+++ trunk/libgimp/gimpselectbutton.h	Fri May 23 20:38:52 2008
@@ -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 */

Modified: trunk/libgimpwidgets/gimpbrowser.h
==============================================================================
--- trunk/libgimpwidgets/gimpbrowser.h	(original)
+++ trunk/libgimpwidgets/gimpbrowser.h	Fri May 23 20:38:52 2008
@@ -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 */

Modified: trunk/libgimpwidgets/gimpbutton.h
==============================================================================
--- trunk/libgimpwidgets/gimpbutton.h	(original)
+++ trunk/libgimpwidgets/gimpbutton.h	Fri May 23 20:38:52 2008
@@ -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 */

Modified: trunk/libgimpwidgets/gimpchainbutton.h
==============================================================================
--- trunk/libgimpwidgets/gimpchainbutton.h	(original)
+++ trunk/libgimpwidgets/gimpchainbutton.h	Fri May 23 20:38:52 2008
@@ -31,8 +31,6 @@
 #ifndef __GIMP_CHAIN_BUTTON_H__
 #define __GIMP_CHAIN_BUTTON_H__
 
-#include <gtk/gtktable.h>
-
 G_BEGIN_DECLS
 
 

Modified: trunk/libgimpwidgets/gimpcolorarea.h
==============================================================================
--- trunk/libgimpwidgets/gimpcolorarea.h	(original)
+++ trunk/libgimpwidgets/gimpcolorarea.h	Fri May 23 20:38:52 2008
@@ -28,8 +28,6 @@
 #ifndef __GIMP_COLOR_AREA_H__
 #define __GIMP_COLOR_AREA_H__
 
-#include <gtk/gtkdrawingarea.h>
-
 G_BEGIN_DECLS
 
 

Modified: trunk/libgimpwidgets/gimpcolorprofilecombobox.h
==============================================================================
--- trunk/libgimpwidgets/gimpcolorprofilecombobox.h	(original)
+++ trunk/libgimpwidgets/gimpcolorprofilecombobox.h	Fri May 23 20:38:52 2008
@@ -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 ())

Modified: trunk/libgimpwidgets/gimpcolorprofilestore.h
==============================================================================
--- trunk/libgimpwidgets/gimpcolorprofilestore.h	(original)
+++ trunk/libgimpwidgets/gimpcolorprofilestore.h	Fri May 23 20:38:52 2008
@@ -23,8 +23,6 @@
 #ifndef __GIMP_COLOR_PROFILE_STORE_H__
 #define __GIMP_COLOR_PROFILE_STORE_H__
 
-#include <gtk/gtkliststore.h>
-
 G_BEGIN_DECLS
 
 

Modified: trunk/libgimpwidgets/gimpcolorscale.h
==============================================================================
--- trunk/libgimpwidgets/gimpcolorscale.h	(original)
+++ trunk/libgimpwidgets/gimpcolorscale.h	Fri May 23 20:38:52 2008
@@ -29,8 +29,6 @@
 #ifndef __GIMP_COLOR_SCALE_H__
 #define __GIMP_COLOR_SCALE_H__
 
-#include <gtk/gtkscale.h>
-
 G_BEGIN_DECLS
 
 

Modified: trunk/libgimpwidgets/gimpdialog.h
==============================================================================
--- trunk/libgimpwidgets/gimpdialog.h	(original)
+++ trunk/libgimpwidgets/gimpdialog.h	Fri May 23 20:38:52 2008
@@ -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 */

Modified: trunk/libgimpwidgets/gimpenumlabel.h
==============================================================================
--- trunk/libgimpwidgets/gimpenumlabel.h	(original)
+++ trunk/libgimpwidgets/gimpenumlabel.h	Fri May 23 20:38:52 2008
@@ -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 ())

Modified: trunk/libgimpwidgets/gimpframe.h
==============================================================================
--- trunk/libgimpwidgets/gimpframe.h	(original)
+++ trunk/libgimpwidgets/gimpframe.h	Fri May 23 20:38:52 2008
@@ -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 */

Modified: trunk/libgimpwidgets/gimpintcombobox.h
==============================================================================
--- trunk/libgimpwidgets/gimpintcombobox.h	(original)
+++ trunk/libgimpwidgets/gimpintcombobox.h	Fri May 23 20:38:52 2008
@@ -23,8 +23,6 @@
 #ifndef __GIMP_INT_COMBO_BOX_H__
 #define __GIMP_INT_COMBO_BOX_H__
 
-#include <gtk/gtkcombobox.h>
-
 G_BEGIN_DECLS
 
 

Modified: trunk/libgimpwidgets/gimpintstore.h
==============================================================================
--- trunk/libgimpwidgets/gimpintstore.h	(original)
+++ trunk/libgimpwidgets/gimpintstore.h	Fri May 23 20:38:52 2008
@@ -23,8 +23,6 @@
 #ifndef __GIMP_INT_STORE_H__
 #define __GIMP_INT_STORE_H__
 
-#include <gtk/gtkliststore.h>
-
 G_BEGIN_DECLS
 
 typedef enum

Modified: trunk/libgimpwidgets/gimpmemsizeentry.h
==============================================================================
--- trunk/libgimpwidgets/gimpmemsizeentry.h	(original)
+++ trunk/libgimpwidgets/gimpmemsizeentry.h	Fri May 23 20:38:52 2008
@@ -23,8 +23,6 @@
 #ifndef __GIMP_MEMSIZE_ENTRY_H__
 #define __GIMP_MEMSIZE_ENTRY_H__
 
-#include <gtk/gtkhbox.h>
-
 G_BEGIN_DECLS
 
 

Modified: trunk/libgimpwidgets/gimppageselector.h
==============================================================================
--- trunk/libgimpwidgets/gimppageselector.h	(original)
+++ trunk/libgimpwidgets/gimppageselector.h	Fri May 23 20:38:52 2008
@@ -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 ())

Modified: trunk/libgimpwidgets/gimppickbutton.h
==============================================================================
--- trunk/libgimpwidgets/gimppickbutton.h	(original)
+++ trunk/libgimpwidgets/gimppickbutton.h	Fri May 23 20:38:52 2008
@@ -20,8 +20,6 @@
 #ifndef __GIMP_PICK_BUTTON_H__
 #define __GIMP_PICK_BUTTON_H__
 
-#include <gtk/gtkbutton.h>
-
 G_BEGIN_DECLS
 
 

Modified: trunk/libgimpwidgets/gimppixmap.h
==============================================================================
--- trunk/libgimpwidgets/gimppixmap.h	(original)
+++ trunk/libgimpwidgets/gimppixmap.h	Fri May 23 20:38:52 2008
@@ -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 */

Modified: trunk/libgimpwidgets/gimppreview.h
==============================================================================
--- trunk/libgimpwidgets/gimppreview.h	(original)
+++ trunk/libgimpwidgets/gimppreview.h	Fri May 23 20:38:52 2008
@@ -22,8 +22,6 @@
 #ifndef __GIMP_PREVIEW_H__
 #define __GIMP_PREVIEW_H__
 
-#include <gtk/gtkvbox.h>
-
 G_BEGIN_DECLS
 
 

Modified: trunk/libgimpwidgets/gimppreviewarea.h
==============================================================================
--- trunk/libgimpwidgets/gimppreviewarea.h	(original)
+++ trunk/libgimpwidgets/gimppreviewarea.h	Fri May 23 20:38:52 2008
@@ -20,8 +20,6 @@
 #ifndef __GIMP_PREVIEW_AREA_H__
 #define __GIMP_PREVIEW_AREA_H__
 
-#include <gtk/gtkdrawingarea.h>
-
 G_BEGIN_DECLS
 
 

Modified: trunk/libgimpwidgets/gimpstock.c
==============================================================================
--- trunk/libgimpwidgets/gimpstock.c	(original)
+++ trunk/libgimpwidgets/gimpstock.c	Fri May 23 20:38:52 2008
@@ -23,7 +23,6 @@
 #include "config.h"
 
 #include <gtk/gtk.h>
-#include <gtk/gtkiconfactory.h>
 
 #include "gimpstock.h"
 

Modified: trunk/libgimpwidgets/gimpstringcombobox.h
==============================================================================
--- trunk/libgimpwidgets/gimpstringcombobox.h	(original)
+++ trunk/libgimpwidgets/gimpstringcombobox.h	Fri May 23 20:38:52 2008
@@ -23,8 +23,6 @@
 #ifndef __GIMP_STRING_COMBO_BOX_H__
 #define __GIMP_STRING_COMBO_BOX_H__
 
-#include <gtk/gtkcombobox.h>
-
 G_BEGIN_DECLS
 
 

Modified: trunk/libgimpwidgets/gimpunitmenu.h
==============================================================================
--- trunk/libgimpwidgets/gimpunitmenu.h	(original)
+++ trunk/libgimpwidgets/gimpunitmenu.h	Fri May 23 20:38:52 2008
@@ -27,8 +27,6 @@
 #undef GTK_DISABLE_DEPRECATED
 #include <gtk/gtkoptionmenu.h>
 #define GTK_DISABLE_DEPRECATED
-#else
-#include <gtk/gtkoptionmenu.h>
 #endif
 
 G_BEGIN_DECLS

Modified: trunk/plug-ins/common/poppler.c
==============================================================================
--- trunk/plug-ins/common/poppler.c	(original)
+++ trunk/plug-ins/common/poppler.c	Fri May 23 20:38:52 2008
@@ -26,7 +26,9 @@
 #include <libgimp/gimp.h>
 #include <libgimp/gimpui.h>
 
+#undef GTK_DISABLE_SINGLE_INCLUDES
 #include <poppler.h>
+#define GTK_DISABLE_SINGLE_INCLUDES
 
 #include "libgimp/stdplugins-intl.h"
 

Modified: trunk/plug-ins/uri/gimpmountoperation.h
==============================================================================
--- trunk/plug-ins/uri/gimpmountoperation.h	(original)
+++ trunk/plug-ins/uri/gimpmountoperation.h	Fri May 23 20:38:52 2008
@@ -27,10 +27,8 @@
 #ifndef __GIMP_MOUNT_OPERATION_H__
 #define __GIMP_MOUNT_OPERATION_H__
 
-#include <glib.h>
 #include <gio/gio.h>
-#include <gdk/gdkscreen.h>
-#include <gtk/gtkwindow.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
@@ -77,4 +75,3 @@
 G_END_DECLS
 
 #endif /* __GIMP_MOUNT_OPERATION_H__ */
-
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]