Commit 01b780d6 authored by Michael Natterer's avatar Michael Natterer 😴 Committed by Michael Natterer

added app/display/ and app/plug-in/. Empty for now except for the types

2001-08-17  Michael Natterer  <mitch@gimp.org>

	* configure.in: added app/display/ and app/plug-in/. Empty for
	now except for the types files.

	* app/Makefile.am
	* app/appenums.h
	* app/apptypes.h: removed.

	* app/display/Makefile.am
	* app/display/display-types.h
	* app/plug-in/Makefile.am
	* app/plug-in/plug-in-types.h
	* app/gui/Makefile.am
	* app/gui/gui-types.h
	* app/pdb/Makefile.am
	* app/pdb/pdb-types.h: new files for typedefs.

	* app/appenv.h: added MessageHandlerType and StackTraceMode here.

	* app/undo_types.h: moved undo struct typedefs here.

	* app/tools/tools-types.h
	* app/core/core-types.h: added some enums and Tattoo here
	(renamed to GimpTattoo).

	* app/gdisplay.h: temp_hack: #include "display/display-types.h"

	* app/gimphelp.c: s/gtk_idle_add/g_idle_add/

	* app/gimprc.c: don't use "gimprc" in token handlers but the
	passed "val1p" and "val2p".

	* app/image_map.[ch]: cleanup in preparation of making a GObject
	out of it.

	* app/base/pixel-region.[ch]: no need to pass the
	PixelRegionIterator around as void pointer.

	* app/core/gimp.[ch]
	* app/core/gimpcontext.[ch]
	* app/core/gimptoolinfo.[ch]
	* app/tools/tool_manager.c
	* app/widgets/gimpdnd.c: added the standard_tool_info to the Gimp
	object.

	* app/batch.c
	* app/file-open.c
	* app/file-save.c
	* app/file-utils.c
	* app/interface.c
	* app/main.c
	* app/path.[ch]
	* app/pathP.h
	* app/plug_in.h
	* app/core/gimpdrawable.[ch]
	* app/core/gimpimage-mask.c
	* app/core/gimpimage.[ch]
	* app/core/gimplayer.c
	* app/gui/color-area.c
	* app/gui/color-notebook.c
	* app/gui/colormap-dialog.c
	* app/gui/dialogs-commands.c
	* app/gui/dialogs-constructors.c
	* app/gui/error-console-dialog.c
	* app/gui/gradient-editor.c
	* app/gui/gradient-select.c
	* app/gui/indicator-area.c
	* app/gui/info-dialog.c
	* app/gui/palette-editor.c
	* app/gui/palette-select.c
	* app/gui/pattern-select.c
	* app/gui/session.c
	* app/gui/splash.c
	* app/gui/view-commands.c
	* app/tools/gimpinktool-blob.c
	* app/widgets/gimpcolorpanel.c
	* app/widgets/gimpdockbook.c
	* app/widgets/gimppreview.c
	* app/xcf/xcf-load.c
	* app/xcf/xcf-save.c
	* app/xcf/xcf.c: changed accordingly: s/Tattoo/GimpTattoo/, include
	the new types files, include <glib-object.h> instead of >gtk/gtk.h>.
	Bad hacks to get rid of SELECTION_OFF and friends in core/ (will
	be replaced ba a signal soon).

	* tools/pdbgen/Makefile.am: changed list of headers scanned for
	enums accordingly.

	* app/pdb/procedural_db.c
	* tools/pdbgen/app.pl
	* tools/pdbgen/pdb/channel.pdb
	* tools/pdbgen/pdb/display.pdb
	* tools/pdbgen/pdb/gradient_select.pdb
	* tools/pdbgen/pdb/image.pdb
	* tools/pdbgen/pdb/layer.pdb
	* tools/pdbgen/pdb/pattern_select.pdb: same fixes as above, added
	hacks to ensure that all foo-types.h files are included before all
	other gimp internal includes, include "pdb-types.h" unconditionally.

	* tools/pdbgen/enums.pl
	* app/pdb/*_cmds.c: regenerated.
parent 667d8626
2001-08-17 Michael Natterer <mitch@gimp.org>
* configure.in: added app/display/ and app/plug-in/. Empty for
now except for the types files.
* app/Makefile.am
* app/appenums.h
* app/apptypes.h: removed.
* app/display/Makefile.am
* app/display/display-types.h
* app/plug-in/Makefile.am
* app/plug-in/plug-in-types.h
* app/gui/Makefile.am
* app/gui/gui-types.h
* app/pdb/Makefile.am
* app/pdb/pdb-types.h: new files for typedefs.
* app/appenv.h: added MessageHandlerType and StackTraceMode here.
* app/undo_types.h: moved undo struct typedefs here.
* app/tools/tools-types.h
* app/core/core-types.h: added some enums and Tattoo here
(renamed to GimpTattoo).
* app/gdisplay.h: temp_hack: #include "display/display-types.h"
* app/gimphelp.c: s/gtk_idle_add/g_idle_add/
* app/gimprc.c: don't use "gimprc" in token handlers but the
passed "val1p" and "val2p".
* app/image_map.[ch]: cleanup in preparation of making a GObject
out of it.
* app/base/pixel-region.[ch]: no need to pass the
PixelRegionIterator around as void pointer.
* app/core/gimp.[ch]
* app/core/gimpcontext.[ch]
* app/core/gimptoolinfo.[ch]
* app/tools/tool_manager.c
* app/widgets/gimpdnd.c: added the standard_tool_info to the Gimp
object.
* app/batch.c
* app/file-open.c
* app/file-save.c
* app/file-utils.c
* app/interface.c
* app/main.c
* app/path.[ch]
* app/pathP.h
* app/plug_in.h
* app/core/gimpdrawable.[ch]
* app/core/gimpimage-mask.c
* app/core/gimpimage.[ch]
* app/core/gimplayer.c
* app/gui/color-area.c
* app/gui/color-notebook.c
* app/gui/colormap-dialog.c
* app/gui/dialogs-commands.c
* app/gui/dialogs-constructors.c
* app/gui/error-console-dialog.c
* app/gui/gradient-editor.c
* app/gui/gradient-select.c
* app/gui/indicator-area.c
* app/gui/info-dialog.c
* app/gui/palette-editor.c
* app/gui/palette-select.c
* app/gui/pattern-select.c
* app/gui/session.c
* app/gui/splash.c
* app/gui/view-commands.c
* app/tools/gimpinktool-blob.c
* app/widgets/gimpcolorpanel.c
* app/widgets/gimpdockbook.c
* app/widgets/gimppreview.c
* app/xcf/xcf-load.c
* app/xcf/xcf-save.c
* app/xcf/xcf.c: changed accordingly: s/Tattoo/GimpTattoo/, include
the new types files, include <glib-object.h> instead of >gtk/gtk.h>.
Bad hacks to get rid of SELECTION_OFF and friends in core/ (will
be replaced ba a signal soon).
* tools/pdbgen/Makefile.am: changed list of headers scanned for
enums accordingly.
* app/pdb/procedural_db.c
* tools/pdbgen/app.pl
* tools/pdbgen/pdb/channel.pdb
* tools/pdbgen/pdb/display.pdb
* tools/pdbgen/pdb/gradient_select.pdb
* tools/pdbgen/pdb/image.pdb
* tools/pdbgen/pdb/layer.pdb
* tools/pdbgen/pdb/pattern_select.pdb: same fixes as above, added
hacks to ensure that all foo-types.h files are included before all
other gimp internal includes, include "pdb-types.h" unconditionally.
* tools/pdbgen/enums.pl
* app/pdb/*_cmds.c: regenerated.
2001-08-15 Michael Natterer <mitch@gimp.org>
* app/tools/gimptool.[ch]
......
## Process this file with automake to produce Makefile.in
SUBDIRS = paint-funcs base core pdb xcf tools widgets gui
SUBDIRS = paint-funcs base core pdb plug-in xcf tools display widgets gui
scriptdata =
......@@ -103,8 +103,6 @@ gimp_SOURCES = @STRIP_BEGIN@ \
##
app_procs.c \
app_procs.h \
appenums.h \
apptypes.h \
main.c \
\
batch.c \
......@@ -153,8 +151,10 @@ INCLUDES = @STRIP_BEGIN@ \
gimp_LDADD = @STRIP_BEGIN@ \
gui/libappgui.a \
tools/libapptools.a \
display/libappdisplay.a \
widgets/libappwidgets.a \
xcf/libappxcf.a \
plug-in/libappplug-in.a \
pdb/libapppdb.a \
core/libappcore.a \
paint-funcs/libapppaint-funcs.a \
......
......@@ -20,8 +20,7 @@
#include <gtk/gtk.h>
#include "apptypes.h"
#include "widgets/widgets-types.h"
#include "gui-types.h"
#include "widgets/gimpdialogfactory.h"
#include "widgets/gimpdockable.h"
......
......@@ -22,7 +22,7 @@
#include "libgimpwidgets/gimpwidgets.h"
#include "core/core-types.h"
#include "gui-types.h"
#include "core/gimpimage.h"
......
......@@ -20,6 +20,21 @@
#define __APPENV_H__
typedef enum
{
MESSAGE_BOX,
CONSOLE,
ERROR_CONSOLE
} MessageHandlerType;
typedef enum
{
STACK_TRACE_NEVER,
STACK_TRACE_QUERY,
STACK_TRACE_ALWAYS
} StackTraceMode;
/* command line options */
extern gboolean no_interface;
extern gboolean no_splash;
......
......@@ -344,13 +344,11 @@ pixel_regions_register (gint num_regions,
gpointer
pixel_regions_process (gpointer PRI_ptr)
pixel_regions_process (PixelRegionIterator *PRI)
{
GSList *list;
PixelRegionHolder *PRH;
PixelRegionIterator *PRI;
PRI = (PixelRegionIterator *) PRI_ptr;
PRI->process_count++;
/* Unref all referenced tiles and increment the offsets */
......@@ -390,13 +388,11 @@ pixel_regions_process (gpointer PRI_ptr)
}
void
pixel_regions_process_stop (gpointer PRI_ptr)
pixel_regions_process_stop (PixelRegionIterator *PRI)
{
GSList *list;
PixelRegionHolder *PRH;
PixelRegionIterator *PRI;
PRI = (PixelRegionIterator *) PRI_ptr;
PRI->process_count++;
/* Unref all referenced tiles and increment the offsets */
......
......@@ -60,50 +60,51 @@ struct _PixelRegionIterator
/* PixelRegion functions */
void pixel_region_init (PixelRegion *PR,
TileManager *tiles,
gint x,
gint y,
gint w,
gint h,
gboolean dirty);
void pixel_region_resize (PixelRegion *PR,
gint x,
gint y,
gint w,
gint h);
void pixel_region_get_async (PixelRegion *PR,
gint ulx,
gint uly,
gint lrx,
gint lry);
void pixel_region_get_row (PixelRegion *PR,
gint x,
gint y,
gint w,
guchar *data,
gint subsample);
void pixel_region_set_row (PixelRegion *PR,
gint x,
gint y,
gint w,
guchar *data);
void pixel_region_get_col (PixelRegion *PR,
gint x,
gint y,
gint h,
guchar *data,
gint subsample);
void pixel_region_set_col (PixelRegion *PR,
gint x,
gint y,
gint h,
guchar *data);
gboolean pixel_region_has_alpha (PixelRegion *PR);
gpointer pixel_regions_register (gint num_regions,
void pixel_region_init (PixelRegion *PR,
TileManager *tiles,
gint x,
gint y,
gint w,
gint h,
gboolean dirty);
void pixel_region_resize (PixelRegion *PR,
gint x,
gint y,
gint w,
gint h);
void pixel_region_get_async (PixelRegion *PR,
gint ulx,
gint uly,
gint lrx,
gint lry);
void pixel_region_get_row (PixelRegion *PR,
gint x,
gint y,
gint w,
guchar *data,
gint subsample);
void pixel_region_set_row (PixelRegion *PR,
gint x,
gint y,
gint w,
guchar *data);
void pixel_region_get_col (PixelRegion *PR,
gint x,
gint y,
gint h,
guchar *data,
gint subsample);
void pixel_region_set_col (PixelRegion *PR,
gint x,
gint y,
gint h,
guchar *data);
gboolean pixel_region_has_alpha (PixelRegion *PR);
gpointer pixel_regions_register (gint num_regions,
...);
gpointer pixel_regions_process (gpointer PRI_ptr);
void pixel_regions_process_stop (gpointer PRI_ptr);
gpointer pixel_regions_process (PixelRegionIterator *PRI);
void pixel_regions_process_stop (PixelRegionIterator *PRI);
#endif /* __PIXEL_REGION_H__ */
......@@ -27,7 +27,7 @@
#include <unistd.h>
#endif
#include <gtk/gtk.h>
#include <glib-object.h>
#include "core/core-types.h"
......
......@@ -20,15 +20,19 @@
#define __CORE_TYPES_H__
/* EEK */
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gdk-pixbuf/gdk-pixbuf.h> /* EEK */
#include "apptypes.h"
#include "libgimpbase/gimpbasetypes.h"
#include "libgimpmath/gimpmath.h"
#include "base/base-types.h"
#include "plug-in/plug-in-types.h"
#include "undo_types.h" /* EEK */
/* enums */
/* Base image types */
typedef enum
{
RGB,
......@@ -36,7 +40,6 @@ typedef enum
INDEXED
} GimpImageBaseType;
/* Image types */
typedef enum
{
RGB_GIMAGE, /*< nick=RGB_IMAGE >*/
......@@ -47,7 +50,6 @@ typedef enum
INDEXEDA_GIMAGE /*< nick=INDEXEDA_IMAGE >*/
} GimpImageType;
/* Channel types */
typedef enum
{
RED_CHANNEL,
......@@ -58,13 +60,44 @@ typedef enum
ALPHA_CHANNEL
} ChannelType;
typedef enum /*< chop=ADD_ >*/
{
ADD_WHITE_MASK,
ADD_BLACK_MASK,
ADD_ALPHA_MASK,
ADD_SELECTION_MASK,
ADD_INV_SELECTION_MASK
} AddMaskType;
typedef enum
{
APPLY,
DISCARD
} MaskApplyMode;
/* Fill types */
typedef enum
{
HORIZONTAL,
VERTICAL,
UNKNOWN
} OrientationType;
typedef enum /*< skip >*/
{
ORIENTATION_UNKNOWN,
ORIENTATION_HORIZONTAL,
ORIENTATION_VERTICAL
} InternalOrientationType;
/* Selection Boolean operations */
typedef enum /*< chop=CHANNEL_OP_ >*/
{
CHANNEL_OP_ADD,
CHANNEL_OP_SUB,
CHANNEL_OP_REPLACE,
CHANNEL_OP_INTERSECT
} ChannelOps;
typedef enum
{
FOREGROUND_FILL, /*< nick=FG_IMAGE_FILL >*/
......@@ -74,7 +107,6 @@ typedef enum
NO_FILL /*< nick=NO_IMAGE_FILL >*/
} GimpFillType;
/* Transfer modes */
typedef enum /*< chop=GIMP_ >*/
{
GIMP_SHADOWS,
......@@ -140,6 +172,11 @@ typedef struct _GimpUndo GimpUndo;
typedef struct _GimpUndoStack GimpUndoStack;
/* other objects */
typedef struct _ImageMap ImageMap; /* temp_hack, will be an object */
/* non-object types */
typedef struct _GimpCoreConfig GimpCoreConfig;
......@@ -148,6 +185,17 @@ typedef struct _GimpGuide GimpGuide;
typedef struct _GimpImageNewValues GimpImageNewValues;
typedef struct _GimpProgress GimpProgress;
typedef guint32 GimpTattoo;
/* EEK stuff */
typedef struct _Path Path;
typedef struct _PathPoint PathPoint;
typedef struct _PathList PathList;
/* stuff which is forward declared here so we don't need to cross-include it */
......
......@@ -25,6 +25,7 @@
#include "libgimpbase/gimpbase.h"
#include "core-types.h"
#include "pdb/pdb-types.h"
#include "base/tile-manager.h"
......@@ -146,6 +147,7 @@ gimp_init (Gimp *gimp)
gimp->tool_info_list = gimp_list_new (GIMP_TYPE_TOOL_INFO,
GIMP_CONTAINER_POLICY_STRONG);
gimp->standard_tool_info = NULL;
gimp_documents_init (gimp);
......@@ -210,6 +212,8 @@ gimp_finalize (GObject *object)
if (gimp->documents)
gimp_documents_exit (gimp);
gimp_tool_info_set_standard (gimp, NULL);
if (gimp->tool_info_list)
{
g_object_unref (G_OBJECT (gimp->tool_info_list));
......
......@@ -75,6 +75,7 @@ struct _Gimp
GHashTable *procedural_ht;
GimpContainer *tool_info_list;
GimpToolInfo *standard_tool_info;
/* the opened and saved images in MRU order */
GimpContainer *documents;
......
......@@ -1366,7 +1366,7 @@ gimp_context_tool_list_thaw (GimpContainer *container,
(context,
GIMP_TOOL_INFO (gimp_container_get_child_by_index (container, 0)));
else
gimp_context_real_set_tool (context, gimp_tool_info_get_standard ());
gimp_context_real_set_tool (context, gimp_tool_info_get_standard (context->gimp));
}
/* the active tool disappeared */
......@@ -1394,7 +1394,7 @@ gimp_context_real_set_tool (GimpContext *context,
GimpToolInfo *tool_info)
{
if (! standard_tool_info)
standard_tool_info = gimp_tool_info_get_standard ();
standard_tool_info = gimp_tool_info_get_standard (context->gimp);
if (context->tool_info == tool_info)
return;
......
......@@ -96,7 +96,7 @@ struct _GimpContext
guint32 defined_props;
GimpImage *image;
GDisplay *display;
gpointer display;
GimpToolInfo *tool_info;
gchar *tool_name;
......@@ -129,7 +129,7 @@ struct _GimpContextClass
void (* image_changed) (GimpContext *context,
GimpImage *image);
void (* display_changed) (GimpContext *context,
GDisplay *display);
gpointer display);
void (* tool_changed) (GimpContext *context,
GimpToolInfo *tool_info);
......
......@@ -883,7 +883,7 @@ gimp_drawable_parasite_detach (GimpDrawable *drawable,
gimp_parasite_list_remove (drawable->parasites, parasite);
}
Tattoo
GimpTattoo
gimp_drawable_get_tattoo (const GimpDrawable *drawable)
{
g_return_val_if_fail (GIMP_IS_DRAWABLE (drawable), 0);
......@@ -893,11 +893,11 @@ gimp_drawable_get_tattoo (const GimpDrawable *drawable)
void
gimp_drawable_set_tattoo (GimpDrawable *drawable,
Tattoo val)
GimpTattoo tattoo)
{
g_return_if_fail (GIMP_IS_DRAWABLE (drawable));
drawable->tattoo = val;
drawable->tattoo = tattoo;
}
gboolean
......
......@@ -148,9 +148,9 @@ GimpParasite * gimp_drawable_parasite_find (const GimpDrawable *drawable,
const gchar *name);
gchar ** gimp_drawable_parasite_list (const GimpDrawable *drawable,
gint *count);
Tattoo gimp_drawable_get_tattoo (const GimpDrawable *drawable);
GimpTattoo gimp_drawable_get_tattoo (const GimpDrawable *drawable);
void gimp_drawable_set_tattoo (GimpDrawable *drawable,
Tattoo tattoo);
GimpTattoo tattoo);
#endif /* __GIMP_DRAWABLE_H__ */
......@@ -1666,7 +1666,8 @@ gimp_image_parasite_detach (GimpImage *gimage,
{
GimpParasite *p;
g_return_if_fail (GIMP_IS_IMAGE (gimage) && parasite != NULL);
g_return_if_fail (GIMP_IS_IMAGE (gimage));
g_return_if_fail (parasite != NULL);
if (!(p = gimp_parasite_list_find (gimage->parasites, parasite)))
return;
......@@ -1677,31 +1678,35 @@ gimp_image_parasite_detach (GimpImage *gimage,
gimp_parasite_list_remove (gimage->parasites, parasite);
}
Tattoo
gimp_image_get_new_tattoo (GimpImage *image)
GimpTattoo
gimp_image_get_new_tattoo (GimpImage *gimage)
{
image->tattoo_state++;
g_return_val_if_fail (GIMP_IS_IMAGE (gimage), 0);
gimage->tattoo_state++;
if (image->tattoo_state <= 0)
g_warning ("Tattoo state has become corrupt (2.1 billion operation limit exceded)");
if (gimage->tattoo_state <= 0)
g_warning ("gimp_image_get_new_tattoo(): Tattoo state has become corrupt (2.1 billion operation limit exceded)");
return image->tattoo_state;
return gimage->tattoo_state;
}
Tattoo
gimp_image_get_tattoo_state (GimpImage *image)
GimpTattoo
gimp_image_get_tattoo_state (GimpImage *gimage)
{
return (image->tattoo_state);
g_return_val_if_fail (GIMP_IS_IMAGE (gimage), 0);
return gimage->tattoo_state;
}
gboolean
gimp_image_set_tattoo_state (GimpImage *gimage,
Tattoo val)
gimp_image_set_tattoo_state (GimpImage *gimage,
GimpTattoo val)
{
GList *list;
gboolean retval = TRUE;
GimpChannel *channel;
Tattoo maxval = 0;
GimpTattoo maxval = 0;
Path *pptr = NULL;
PathList *plist;
......@@ -1711,7 +1716,7 @@ gimp_image_set_tattoo_state (GimpImage *gimage,
list;
list = g_list_next (list))
{
Tattoo ltattoo;
GimpTattoo ltattoo;
ltattoo = gimp_drawable_get_tattoo (GIMP_DRAWABLE (list->data));
if (ltattoo > maxval)
......@@ -1733,7 +1738,8 @@ gimp_image_set_tattoo_state (GimpImage *gimage,
list;
list = g_list_next (list))
{
Tattoo ctattoo;
GimpTattoo ctattoo;
channel = (GimpChannel *) list->data;
ctattoo = gimp_drawable_get_tattoo (GIMP_DRAWABLE (channel));
......@@ -1751,8 +1757,8 @@ gimp_image_set_tattoo_state (GimpImage *gimage,
if (plist && plist->bz_paths)
{
Tattoo ptattoo;
GSList *pl;
GimpTattoo ptattoo;
GSList *pl;
for (pl = plist->bz_paths; pl; pl = g_slist_next (pl))
{
......@@ -2520,7 +2526,7 @@ gimp_image_get_active_channel (const GimpImage *gimage)
GimpLayer *
gimp_image_get_layer_by_tattoo (const GimpImage *gimage,
Tattoo tattoo)
GimpTattoo tattoo)
{
GimpLayer *layer;
GList *list;
......@@ -2542,7 +2548,7 @@ gimp_image_get_layer_by_tattoo (const GimpImage *gimage,
GimpChannel *
gimp_image_get_channel_by_tattoo (const GimpImage *gimage,
Tattoo tattoo)
GimpTattoo tattoo)
{
GimpChannel *channel;
GList *list;
......
......@@ -81,7 +81,7 @@ struct _GimpImage
gint instance_count; /* number of instances */
gint disp_count; /* number of displays */
Tattoo tattoo_state; /* the next unique tattoo to use*/
GimpTattoo tattoo_state; /* the next unique tattoo to use*/
TileManager *shadow; /* shadow buffer tiles */
......@@ -262,10 +262,10 @@ void gimp_image_parasite_attach (GimpImage *gimage,
void gimp_image_parasite_detach (GimpImage *gimage,
const gchar *parasite);
Tattoo gimp_image_get_new_tattoo (GimpImage *gimage);
GimpTattoo gimp_image_get_new_tattoo (GimpImage *gimage);
gboolean gimp_image_set_tattoo_state (GimpImage *gimage,
Tattoo val);
Tattoo gimp_image_get_tattoo_state (GimpImage *gimage);
GimpTattoo val);
GimpTattoo gimp_image_get_tattoo_state (GimpImage *gimage);
void gimp_image_set_paths (GimpImage *gimage,
PathList *paths);
......@@ -303,9 +303,9 @@ gint gimp_image_get_channel_index (const GimpImage *gimage,
GimpLayer * gimp_image_get_active_layer (const GimpImage *gimage);
GimpChannel * gimp_image_get_active_channel (const GimpImage *gimage);
GimpLayer * gimp_image_get_layer_by_tattoo (const GimpImage *gimage,
Tattoo tatoo);
GimpTattoo tatoo);
GimpChannel * gimp_image_get_channel_by_tattoo (const GimpImage *gimage,
Tattoo tatoo);
GimpTattoo tatoo);
GimpChannel * gimp_image_get_channel_by_name (const GimpImage *gimage,
const gchar *name);
GimpChannel * gimp_image_get_mask (const GimpImage *gimage);
......
......@@ -20,9 +20,10 @@
#include <glib-object.h>
#include <gtk/gtk.h>
#include <glib-object.h>
#include "core-types.h"
#include "pdb/pdb-types.h"
#include "base/boundary.h"
#include "base/pixel-region.h"
......@@ -39,7 +40,6 @@
#include "gimptoolinfo.h"
#include "floating_sel.h"
#include "gdisplay.h" /* EEK */
#include "undo.h"