Commit fde31211 authored by Sven Neumann's avatar Sven Neumann
Browse files

Cleaned up the Path header mess.


--Sven
parent 84dccbc7
Wed Feb 16 14:46:14 CET 2000 Sven Neumann <sven@gimp.org>
* app/pathsP.h: removed
* app/path.h
* app/pathP.h
* app/path_transform.h: new header files. Only files that absolutely
need to access the Path structures internally need to include pathP.h.
All other functionality is described in the other header files.
* app/Makefile.am
* app/bezier_select.h
* app/bezier_selectP.h
* app/edit_selection.c
* app/flip_tool.c
* app/gimpimage.c
* app/gimpimage.h
* app/gimpimageP.h
* app/path.c
* app/paths_cmds.c
* app/paths_dialog.c
* app/transform_core.c
* app/undo.c
* app/xcf.c
* tools/pdbgen/pdb/paths.pdb: Changed according to the changes
described above.
2000-02-16 Tuomas Kuosmanen <tigert@gimp.org>
 
* gimp1_1_splash.ppm: New splash, valentine is over.
......
......@@ -329,11 +329,13 @@ gimp_SOURCES = \
parasitelistF.h \
parasitelistP.h \
path.c \
path.h \
pathP.h \
path_transform.h \
paths_cmds.c \
paths_dialog.c \
paths_dialog.h \
paths_dialogP.h \
pathsP.h \
pattern_header.h \
pattern_select.c \
pattern_select.h \
......
......@@ -18,7 +18,10 @@
#ifndef __BEZIER_SELECT_H__
#define __BEZIER_SELECT_H__
#include "tools.h"
#include "toolsF.h"
typedef struct _bezier_point BezierPoint;
typedef struct _bezier_select BezierSelect;
/* bezier select functions */
......
......@@ -37,8 +37,6 @@
enum { EXTEND_EDIT, EXTEND_ADD, EXTEND_REMOVE, EXTEND_NEW };
typedef struct _bezier_point BezierPoint;
struct _bezier_point
{
int type; /* type of point (anchor/control/move) */
......@@ -52,8 +50,6 @@ struct _bezier_point
*/
};
typedef struct _bezier_select BezierSelect;
struct _bezier_select
{
int state; /* start, add, edit or drag */
......
......@@ -30,7 +30,7 @@
#include "undo.h"
#include "gimpsignal.h"
#include "gimpparasite.h"
#include "pathsP.h"
#include "path.h"
#include "gimprc.h"
#include "config.h"
......
......@@ -30,7 +30,7 @@
#include "plug_in.h"
#include "temp_buf.h"
#include "tile_manager.h"
#include "pathsP.h"
#include "path.h"
#define GIMP_TYPE_IMAGE gimp_image_get_type()
......
......@@ -30,7 +30,7 @@
#include "undo.h"
#include "gimpsignal.h"
#include "gimpparasite.h"
#include "pathsP.h"
#include "path.h"
#include "gimprc.h"
#include "config.h"
......
......@@ -30,7 +30,7 @@
#include "plug_in.h"
#include "temp_buf.h"
#include "tile_manager.h"
#include "pathsP.h"
#include "path.h"
#define GIMP_TYPE_IMAGE gimp_image_get_type()
......
......@@ -30,7 +30,7 @@
#include "undo.h"
#include "gimpsignal.h"
#include "gimpparasite.h"
#include "pathsP.h"
#include "path.h"
#include "gimprc.h"
#include "config.h"
......
......@@ -30,7 +30,7 @@
#include "plug_in.h"
#include "temp_buf.h"
#include "tile_manager.h"
#include "pathsP.h"
#include "path.h"
#define GIMP_TYPE_IMAGE gimp_image_get_type()
......
......@@ -30,7 +30,7 @@
#include "undo.h"
#include "gimpsignal.h"
#include "gimpparasite.h"
#include "pathsP.h"
#include "path.h"
#include "gimprc.h"
#include "config.h"
......
......@@ -30,7 +30,7 @@
#include "plug_in.h"
#include "temp_buf.h"
#include "tile_manager.h"
#include "pathsP.h"
#include "path.h"
#define GIMP_TYPE_IMAGE gimp_image_get_type()
......
......@@ -30,7 +30,7 @@
#include "undo.h"
#include "gimpsignal.h"
#include "gimpparasite.h"
#include "pathsP.h"
#include "path.h"
#include "gimprc.h"
#include "config.h"
......
......@@ -30,7 +30,7 @@
#include "plug_in.h"
#include "temp_buf.h"
#include "tile_manager.h"
#include "pathsP.h"
#include "path.h"
#define GIMP_TYPE_IMAGE gimp_image_get_type()
......
......@@ -34,6 +34,7 @@
#include "paint_core.h"
#include "paint_funcs.h"
#include "parasitelist.h"
#include "path_transform.h"
#include "tools.h"
#include "transform_core.h"
#include "undo.h"
......@@ -1069,8 +1070,8 @@ typedef struct _layer_display_undo LayerDisplaceUndo;
struct _layer_display_undo
{
int info[3];
void * path_undo;
int info[3];
PathUndo *path_undo;
};
int
......@@ -1082,15 +1083,15 @@ undo_push_layer_displace (GImage *gimage,
if ((new = undo_push (gimage, 12, LAYER_DISPLACE_UNDO, TRUE)))
{
new->data = (void *) g_malloc (sizeof(LayerDisplaceUndo));
new->data = (void *) g_malloc (sizeof (LayerDisplaceUndo));
new->pop_func = undo_pop_layer_displace;
new->free_func = undo_free_layer_displace;
ldu = (LayerDisplaceUndo *) new->data;
ldu->info[0] = drawable_ID(GIMP_DRAWABLE(layer));
ldu->info[1] = GIMP_DRAWABLE(layer)->offset_x;
ldu->info[2] = GIMP_DRAWABLE(layer)->offset_y;
ldu->path_undo = paths_transform_start_undo(gimage);
ldu->info[0] = drawable_ID (GIMP_DRAWABLE (layer));
ldu->info[1] = GIMP_DRAWABLE (layer)->offset_x;
ldu->info[2] = GIMP_DRAWABLE (layer)->offset_y;
ldu->path_undo = path_transform_start_undo (gimage);
return TRUE;
}
......@@ -1142,8 +1143,8 @@ undo_pop_layer_displace (GImage *gimage,
ldu->info[2] = old_offsets[1];
/* Now undo paths bits */
if(ldu->path_undo)
paths_transform_do_undo(gimage,ldu->path_undo);
if (ldu->path_undo)
path_transform_do_undo (gimage, ldu->path_undo);
return TRUE;
}
......@@ -1162,8 +1163,8 @@ undo_free_layer_displace (UndoState state,
ldu = (LayerDisplaceUndo *) info_ptr;
/* Free mem held for paths undo stuff */
if(ldu->path_undo)
paths_transform_free_undo(ldu->path_undo);
if (ldu->path_undo)
path_transform_free_undo (ldu->path_undo);
g_free (info_ptr);
}
......@@ -1216,7 +1217,7 @@ undo_pop_transform (GImage *gimage,
tc = (TransformCore *) active_tool->private;
tu = (TransformUndo *) tu_ptr;
paths_transform_do_undo(gimage,tu->path_undo);
path_transform_do_undo (gimage,tu->path_undo);
/* only pop if the active tool is the tool that pushed this undo */
if (tu->tool_ID != active_tool->ID)
......@@ -1257,7 +1258,7 @@ undo_free_transform (UndoState state,
tu = (TransformUndo *) tu_ptr;
if (tu->original)
tile_manager_destroy (tu->original);
paths_transform_free_undo(tu->path_undo);
path_transform_free_undo (tu->path_undo);
g_free (tu);
}
......
......@@ -30,7 +30,7 @@
#include "undo.h"
#include "gimpsignal.h"
#include "gimpparasite.h"
#include "pathsP.h"
#include "path.h"
#include "gimprc.h"
#include "config.h"
......
......@@ -30,7 +30,7 @@
#include "plug_in.h"
#include "temp_buf.h"
#include "tile_manager.h"
#include "pathsP.h"
#include "path.h"
#define GIMP_TYPE_IMAGE gimp_image_get_type()
......
......@@ -30,7 +30,7 @@
#include "undo.h"
#include "gimpsignal.h"
#include "gimpparasite.h"
#include "pathsP.h"
#include "path.h"
#include "gimprc.h"
#include "config.h"
......
......@@ -30,7 +30,7 @@
#include "plug_in.h"
#include "temp_buf.h"
#include "tile_manager.h"
#include "pathsP.h"
#include "path.h"
#define GIMP_TYPE_IMAGE gimp_image_get_type()
......
......@@ -15,6 +15,8 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include "config.h"
#include <stdlib.h>
#include <stdarg.h>
#include "gdk/gdkkeysyms.h"
......@@ -28,9 +30,8 @@
#include "gdisplay.h"
#include "undo.h"
#include "gimprc.h"
#include "paths_dialogP.h"
#include "path_transform.h"
#include "config.h"
#include "libgimp/gimpintl.h"
#include "libgimp/gimpmath.h"
......@@ -259,7 +260,7 @@ edit_selection_button_release (Tool *tool,
}
else
{
paths_transform_xy (gdisp->gimage, edit_select.cumlx, edit_select.cumly);
path_transform_xy (gdisp->gimage, edit_select.cumlx, edit_select.cumly);
}
undo_push_group_end (gdisp->gimage);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment