Commit f235eabb authored by Michael Natterer's avatar Michael Natterer 😴 Committed by Michael Natterer

app/Makefile.am app/disp_callbacks.[ch] app/gdisplay.[ch]

2001-09-26  Michael Natterer  <mitch@gimp.org>

	* app/Makefile.am
	* app/disp_callbacks.[ch]
	* app/gdisplay.[ch]
	* app/gdisplay_ops.[ch]
	* app/gximage.[ch]
	* app/image_render.[ch]
	* app/interface.[ch]
	* app/marching_ants.h
	* app/scale.[ch]
	* app/scroll.[ch]
	* app/selection.[ch]: removed.

	* app/display/Makefile.am
	* app/display/display-types.h
	* app/display/gimpdisplay-callbacks.[ch]
	* app/display/gimpdisplay-marching-ants.h
	* app/display/gimpdisplay-ops.[ch]
	* app/display/gimpdisplay-render.[ch]
	* app/display/gimpdisplay-scale.[ch]
	* app/display/gimpdisplay-scroll.[ch]
	* app/display/gimpdisplay-selection.[ch]
	* app/display/gimpdisplay.[ch]
	* app/display/gimpdisplayshell.[ch]
	* app/display/gximage.[ch]: added here.

	* app/[many files]
	* app/gui/[many files]
	* app/tools/*
	* app/widgets/[many files]: changed accordingly. Still very
	incomplete separation of the display stuff but it at least
	compiles.

	* tools/pdbgen/pdb.pl:
	* tools/pdbgen/pdb/display.pdb: s/GDisplay/GimpDisplay/,
	s/"gdisplay.h"/"display/gimpdisplay.h"/.

	* app/pdb/display_cmds.c: regenerated.
parent b2215a1f
2001-09-26 Michael Natterer <mitch@gimp.org>
* app/Makefile.am
* app/disp_callbacks.[ch]
* app/gdisplay.[ch]
* app/gdisplay_ops.[ch]
* app/gximage.[ch]
* app/image_render.[ch]
* app/interface.[ch]
* app/marching_ants.h
* app/scale.[ch]
* app/scroll.[ch]
* app/selection.[ch]: removed.
* app/display/Makefile.am
* app/display/display-types.h
* app/display/gimpdisplay-callbacks.[ch]
* app/display/gimpdisplay-marching-ants.h
* app/display/gimpdisplay-ops.[ch]
* app/display/gimpdisplay-render.[ch]
* app/display/gimpdisplay-scale.[ch]
* app/display/gimpdisplay-scroll.[ch]
* app/display/gimpdisplay-selection.[ch]
* app/display/gimpdisplay.[ch]
* app/display/gimpdisplayshell.[ch]
* app/display/gximage.[ch]: added here.
* app/[many files]
* app/gui/[many files]
* app/tools/*
* app/widgets/[many files]: changed accordingly. Still very
incomplete separation of the display stuff but it at least
compiles.
* tools/pdbgen/pdb.pl:
* tools/pdbgen/pdb/display.pdb: s/GDisplay/GimpDisplay/,
s/"gdisplay.h"/"display/gimpdisplay.h"/.
* app/pdb/display_cmds.c: regenerated.
2001-09-25 Michael Natterer <mitch@gimp.org>
* app/gdisplay.[ch]: renamed it to GimpDisplay and made it a
......@@ -46,7 +86,6 @@
caused segfaults on images with a width of exactly 64. Bug is present
in 1.2.2; fix should be committed to stable after it is tested.
2001-09-23 Sven Neumann <sven@gimp.org>
* plug-ins/Makefile.am: reenabled build of ifscompose. We should port
......
......@@ -27,28 +27,6 @@ gimp_SOURCES = @STRIP_BEGIN@ \
undo_history.c \
undo_history.h \
##
## display stuff
##
disp_callbacks.c \
disp_callbacks.h \
gdisplay.c \
gdisplay.h \
gdisplay_ops.c \
gdisplay_ops.h \
gximage.c \
gximage.h \
image_render.c \
image_render.h \
interface.c \
interface.h \
scale.c \
scale.h \
scroll.c \
scroll.h \
selection.c \
selection.h \
marching_ants.h \
##
## stuff that needs to be split up in core / ui files
##
image_map.c \
......
......@@ -31,11 +31,12 @@
#include "core/gimpimage-mask.h"
#include "core/gimplist.h"
#include "display/gimpdisplay.h"
#include "widgets/gimpcolorpanel.h"
#include "widgets/gimpwidgets-utils.h"
#include "channels-commands.h"
#include "gdisplay.h"
#include "menus.h"
#include "app_procs.h"
......
......@@ -22,7 +22,6 @@
#include "libgimpwidgets/gimpwidgets.h"
#include "core/core-types.h"
#include "tools/tools-types.h"
#include "core/gimp.h"
......@@ -34,6 +33,8 @@
#include "core/gimpimage.h"
#include "core/gimpimage-mask.h"
#include "display/gimpdisplay.h"
#include "tools/tool_manager.h"
#include "widgets/gimpdialogfactory.h"
......@@ -41,7 +42,6 @@
#include "dialogs.h"
#include "edit-commands.h"
#include "gdisplay.h"
#include "undo.h"
#include "libgimp/gimpintl.h"
......
......@@ -22,11 +22,14 @@
#include "libgimpwidgets/gimpwidgets.h"
#include "core/core-types.h"
#include "display/display-types.h"
#include "core/gimpimage.h"
#include "core/gimpobject.h"
#include "display/gimpdisplay.h"
#include "display/gimpdisplay-ops.h"
#include "file-commands.h"
#include "file-new-dialog.h"
#include "file-open-dialog.h"
......@@ -36,8 +39,6 @@
#include "app_procs.h"
#include "file-open.h"
#include "file-save.h"
#include "gdisplay.h"
#include "gdisplay_ops.h"
#include "gimprc.h"
#include "undo.h"
......
......@@ -33,11 +33,12 @@
#include "pdb/procedural_db.h"
#include "display/gimpdisplay.h"
#include "convert-dialog.h"
#include "offset-dialog.h"
#include "resize-dialog.h"
#include "gdisplay.h"
#include "undo.h"
#include "libgimp/gimpintl.h"
......
......@@ -26,7 +26,7 @@
#include "libgimpbase/gimpbase.h"
#include "libgimpwidgets/gimpwidgets.h"
#include "core/core-types.h"
#include "gui-types.h"
#include "paint-funcs/paint-funcs.h"
......@@ -37,6 +37,8 @@
#include "core/gimplayermask.h"
#include "core/gimplist.h"
#include "display/gimpdisplay.h"
#include "widgets/gimpwidgets-utils.h"
#include "layers-commands.h"
......@@ -44,7 +46,6 @@
#include "resize-dialog.h"
#include "app_procs.h"
#include "gdisplay.h"
#include "floating_sel.h"
#include "undo.h"
......
......@@ -84,7 +84,7 @@
#include "libgimpbase/gimpprotocol.h"
#include "libgimpbase/gimpwire.h"
#include "core/core-types.h"
#include "display/display-types.h"
#include "base/tile.h"
#include "base/tile-manager.h"
......@@ -95,11 +95,12 @@
#include "core/gimpdrawable.h"
#include "core/gimpimage.h"
#include "display/gimpdisplay.h"
#include "gui/brush-select.h"
#include "gui/gradient-select.h"
#include "gui/menus.h"
#include "gui/pattern-select.h"
#include "gdisplay.h"
#include "app_procs.h"
#include "appenv.h"
......
......@@ -35,11 +35,12 @@
#include "core/gimpimage.h"
#include "core/gimpimage-mask.h"
#include "display/gimpdisplay.h"
#include "widgets/gimpcolorpanel.h"
#include "app_procs.h"
#include "floating_sel.h"
#include "gdisplay.h"
#include "qmask.h"
#include "undo.h"
......
......@@ -35,11 +35,12 @@
#include "core/gimpimage.h"
#include "core/gimpimage-mask.h"
#include "display/gimpdisplay.h"
#include "widgets/gimpcolorpanel.h"
#include "app_procs.h"
#include "floating_sel.h"
#include "gdisplay.h"
#include "qmask.h"
#include "undo.h"
......
......@@ -23,12 +23,12 @@
#include "libgimpmath/gimpmath.h"
#include "libgimpwidgets/gimpwidgets.h"
#include "core/core-types.h"
#include "gui-types.h"
#include "core/gimpimage.h"
#include "core/gimpimage-mask.h"
#include "gdisplay.h"
#include "display/gimpdisplay.h"
#include "libgimp/gimpintl.h"
......
......@@ -20,17 +20,18 @@
#include <gtk/gtk.h>
#include "tools/tools-types.h"
#include "gui-types.h"
#include "core/gimp.h"
#include "core/gimpcontext.h"
#include "core/gimpimage.h"
#include "display/gimpdisplay.h"
#include "tools/gimptool.h"
#include "tools/tool_manager.h"
#include "app_procs.h"
#include "gdisplay.h"
#define return_if_no_display(gdisp) \
......
......@@ -26,16 +26,17 @@
#include "core/gimpimage.h"
#include "display/gimpdisplay.h"
#include "display/gimpdisplay-ops.h"
#include "display/gimpdisplay-scale.h"
#include "display/gimpdisplay-selection.h"
#include "info-dialog.h"
#include "info-window.h"
#include "view-commands.h"
#include "gdisplay.h"
#include "gdisplay_ops.h"
#include "gimprc.h"
#include "nav_window.h"
#include "scale.h"
#include "selection.h"
#define return_if_no_display(gdisp) \
......
......@@ -46,6 +46,8 @@
#include "xcf/xcf.h"
#include "display/gimpdisplay.h"
#include "tools/tool_manager.h"
#include "gui/file-open-dialog.h"
......@@ -58,7 +60,6 @@
#include "colormaps.h"
#include "docindex.h"
#include "errors.h"
#include "gdisplay.h"
#include "gimprc.h"
#include "module_db.h"
#include "plug_in.h"
......
......@@ -33,13 +33,14 @@
#include "widgets/gimpwidgets-utils.h"
#include "display/gimpdisplay.h"
#include "gimpcolorbalancetool.h"
#include "gimpcolorbalancetool-transfer.h"
#include "tool_manager.h"
#include "tool_options.h"
#include "app_procs.h"
#include "gdisplay.h"
#include "image_map.h"
#include "libgimp/gimpintl.h"
......
......@@ -39,12 +39,13 @@
#include "widgets/gimpcursor.h"
#include "widgets/gimpwidgets-utils.h"
#include "display/gimpdisplay.h"
#include "gimpcurvestool.h"
#include "tool_manager.h"
#include "tool_options.h"
#include "app_procs.h"
#include "gdisplay.h"
#include "image_map.h"
#include "libgimp/gimpintl.h"
......
......@@ -34,12 +34,13 @@
#include "widgets/gimpwidgets-utils.h"
#include "display/gimpdisplay.h"
#include "gimphuesaturationtool.h"
#include "tool_manager.h"
#include "tool_options.h"
#include "app_procs.h"
#include "gdisplay.h"
#include "image_map.h"
#include "libgimp/gimpintl.h"
......
......@@ -36,12 +36,13 @@
#include "widgets/gimphistogramview.h"
#include "widgets/gimpwidgets-utils.h"
#include "display/gimpdisplay.h"
#include "gimpthresholdtool.h"
#include "tool_manager.h"
#include "tool_options.h"
#include "app_procs.h"
#include "gdisplay.h"
#include "image_map.h"
#include "libgimp/gimpintl.h"
......
......@@ -26,6 +26,7 @@
#include "libgimpwidgets/gimpwidgets.h"
#include "tools-types.h"
#include "gui/gui-types.h"
#include "base/base-config.h"
#include "base/pixel-region.h"
......@@ -46,7 +47,8 @@
#include "core/gimptoolinfo.h"
#include "gui/info-dialog.h"
#include "gdisplay.h"
#include "display/gimpdisplay.h"
#include "tool_manager.h"
#include "tool_options.h"
......
......@@ -45,9 +45,10 @@
#include "widgets/gimpdnd.h"
#include "display/gimpdisplay.h"
#include "app_procs.h"
#include "errors.h"
#include "gdisplay.h"
#include "gimpprogress.h"
#include "undo.h"
......
......@@ -26,6 +26,7 @@
#include "libgimpwidgets/gimpwidgets.h"
#include "tools-types.h"
#include "gui/gui-types.h"
#include "base/base-config.h"
#include "base/pixel-region.h"
......@@ -46,7 +47,8 @@
#include "core/gimptoolinfo.h"
#include "gui/info-dialog.h"
#include "gdisplay.h"
#include "display/gimpdisplay.h"
#include "tool_manager.h"
#include "tool_options.h"
......
......@@ -24,6 +24,7 @@
#include "libgimpwidgets/gimpwidgets.h"
#include "tools-types.h"
#include "gui/gui-types.h"
#include "core/gimpdrawable.h"
#include "core/gimpimage.h"
......@@ -31,12 +32,13 @@
#include "gui/info-dialog.h"
#include "gui/palette-editor.h"
#include "display/gimpdisplay.h"
#include "gimpdrawtool.h"
#include "gimpcolorpickertool.h"
#include "tool_manager.h"
#include "tool_options.h"
#include "gdisplay.h"
#include "gimprc.h"
#include "libgimp/gimpintl.h"
......
......@@ -35,11 +35,12 @@
#include "core/gimpimage.h"
#include "core/gimpimage-mask.h"
#include "display/gimpdisplay.h"
#include "widgets/gimpcolorpanel.h"
#include "app_procs.h"
#include "floating_sel.h"
#include "gdisplay.h"
#include "qmask.h"
#include "undo.h"
......
......@@ -35,11 +35,12 @@
#include "core/gimpimage.h"
#include "core/gimpimage-mask.h"
#include "display/gimpdisplay.h"
#include "widgets/gimpcolorpanel.h"
#include "app_procs.h"
#include "floating_sel.h"
#include "gdisplay.h"
#include "qmask.h"
#include "undo.h"
......
......@@ -25,7 +25,6 @@
#include "libgimpbase/gimpbase.h"
#include "core/core-types.h"
#include "tools/tools-types.h"
#include "base/pixel-region.h"
......@@ -45,6 +44,8 @@
#include "core/gimpparasite.h"
#include "core/gimpparasitelist.h"
#include "display/gimpdisplay.h"
#include "tools/gimpbycolorselecttool.h"
#include "tools/gimptool.h"
#include "tools/gimpdrawtool.h"
......@@ -54,15 +55,12 @@
#include "app_procs.h"
#include "floating_sel.h"
#include "gdisplay.h"
#include "gdisplay_ops.h"
#include "path_transform.h"
#include "undo.h"
#include "libgimp/gimpintl.h"
/*#define DEBUG*/
#ifdef DEBUG
......
......@@ -31,7 +31,8 @@
#include "core/gimpdrawable.h"
#include "core/gimpimage.h"
#include "gdisplay.h"
#include "display/gimpdisplay.h"
#include "image_map.h"
......
......@@ -26,8 +26,8 @@
#include "libgimpmath/gimpmath.h"
#include "libgimpbase/gimpbase.h"
#include "core/core-types.h"
#include "tools/tools-types.h"
#include "display-types.h"
#include "gui/gui-types.h" /* FIXME */
#include "base/temp-buf.h"
......@@ -44,24 +44,25 @@
#include "tools/gimptool.h"
#include "tools/tool_manager.h"
#include "disp_callbacks.h"
#include "gdisplay.h"
#include "gdisplay_ops.h"
#include "gui/info-window.h"
#include "interface.h"
#include "gui/menus.h"
#include "nav_window.h"
#include "gimpdisplay.h"
#include "gimpdisplay-callbacks.h"
#include "gimpdisplay-ops.h"
#include "gimpdisplay-render.h"
#include "gimpdisplay-scale.h"
#include "gimpdisplay-selection.h"
#include "gimpdisplayshell.h"
#include "gximage.h"
#include "app_procs.h"
#include "appenv.h"
#include "colormaps.h"
#include "gimprc.h"
#include "gximage.h"
#include "image_render.h"
#include "nav_window.h"
#include "plug_in.h"
#include "qmask.h"
#include "scale.h"
#include "selection.h"
#include "undo.h"
#ifdef DISPLAY_FILTERS
......
......@@ -23,9 +23,8 @@
#include "core/gimpobject.h"
/* FIXME: move the display stuff to display/ */
#include "display/display-types.h"
/* FIXME move all GTK stuff to gimpdisplayshell */
#include "gui/gui-types.h"
/* some useful macros */
......
......@@ -32,11 +32,12 @@
#include "core/gimplist.h"
#include "core/gimppalette.h"
#include "display/gimpdisplay.h"
#include "tools/gimptool.h"
#include "tools/tool_manager.h"
#include "app_procs.h"
#include "gdisplay.h"
#include "palette-select.h"
#include "libgimp/gimpintl.h"
......
......@@ -25,11 +25,12 @@
#include "core/core-types.h"
#include "display/gimpdisplay.h"
#include "widgets/gimpwidgets-utils.h"
#include "menus.h"
#include "gdisplay.h"
#include "plug_in.h"
......
......@@ -24,14 +24,13 @@
#include "libgimpbase/gimpbase.h"
#include "libgimpwidgets/gimpwidgets.h"
#include "core/core-types.h"
#include "gui-types.h"
#include "core/gimp.h"
#include "core/gimpcoreconfig.h"
#include "core/gimpimage-new.h"
#include "file-new-dialog.h"
#include "gdisplay.h"
#include "app_procs.h"
#include "gimprc.h"
......
......@@ -23,7 +23,6 @@
#include "libgimpbase/gimpbase.h"
#include "libgimpwidgets/gimpwidgets.h"
#include "core/core-types.h"
#include "tools/tools-types.h"
#include "widgets/widgets-types.h"
......@@ -33,6 +32,8 @@
#include "core/gimpimage.h"
#include "core/gimpunit.h"
#include "display/gimpdisplay.h"
#include "widgets/gimppreview.h"
#include "tools/gimptool.h"
......@@ -45,7 +46,6 @@
#include "app_procs.h"
#include "colormaps.h"
#include "gdisplay.h"
#include "libgimp/gimpintl.h"
......
......@@ -23,13 +23,13 @@
#include "libgimpmath/gimpmath.h"
#include "libgimpwidgets/gimpwidgets.h"
#include "core/core-types.h"
#include "gui-types.h"
#include "core/gimpdrawable.h"
#include "core/gimpdrawable-offset.h"
#include "core/gimpimage.h"
#include "gdisplay.h"
#include "display/gimpdisplay.h"
#include "libgimp/gimpintl.h"
......
......@@ -26,7 +26,7 @@
#include "libgimpbase/gimpbase.h"
#include "libgimpwidgets/gimpwidgets.h"
#include "tools/tools-types.h"
#include "gui-types.h"