mirror of https://github.com/GNOME/gimp.git
app/paint/paint-types.h move opaque typedefs of object instances to
2007-02-08 Michael Natterer <mitch@gimp.org> * app/paint/paint-types.h * app/paint/*.h: move opaque typedefs of object instances to paint-types.h, don't typedef empty class stuctures as their parent class (gtk-doc gets confused), cleanups. svn path=/trunk/; revision=21877
This commit is contained in:
parent
b76ad2b84e
commit
1da4a19fe7
|
@ -1,3 +1,10 @@
|
|||
2007-02-08 Michael Natterer <mitch@gimp.org>
|
||||
|
||||
* app/paint/paint-types.h
|
||||
* app/paint/*.h: move opaque typedefs of object instances to
|
||||
paint-types.h, don't typedef empty class stuctures as their parent
|
||||
class (gtk-doc gets confused), cleanups.
|
||||
|
||||
2007-02-08 Sven Neumann <sven@gimp.org>
|
||||
|
||||
* app/tools/gimprectangleoptions.c
|
||||
|
|
|
@ -31,7 +31,6 @@
|
|||
#define GIMP_AIRBRUSH_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_AIRBRUSH, GimpAirbrushClass))
|
||||
|
||||
|
||||
typedef struct _GimpAirbrush GimpAirbrush;
|
||||
typedef struct _GimpAirbrushClass GimpAirbrushClass;
|
||||
|
||||
struct _GimpAirbrush
|
||||
|
@ -45,7 +44,7 @@ struct _GimpAirbrush
|
|||
|
||||
struct _GimpAirbrushClass
|
||||
{
|
||||
GimpPaintbrushClass parent_class;
|
||||
GimpPaintbrushClass parent_class;
|
||||
};
|
||||
|
||||
|
||||
|
|
|
@ -31,8 +31,7 @@
|
|||
#define GIMP_AIRBRUSH_OPTIONS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_AIRBRUSH_OPTIONS, GimpAirbrushOptionsClass))
|
||||
|
||||
|
||||
typedef struct _GimpAirbrushOptions GimpAirbrushOptions;
|
||||
typedef struct _GimpPaintOptionsClass GimpAirbrushOptionsClass;
|
||||
typedef struct _GimpAirbrushOptionsClass GimpAirbrushOptionsClass;
|
||||
|
||||
struct _GimpAirbrushOptions
|
||||
{
|
||||
|
@ -42,6 +41,11 @@ struct _GimpAirbrushOptions
|
|||
gdouble pressure;
|
||||
};
|
||||
|
||||
struct _GimpAirbrushOptionsClass
|
||||
{
|
||||
GimpPaintOptionsClass parent_class;
|
||||
};
|
||||
|
||||
|
||||
GType gimp_airbrush_options_get_type (void) G_GNUC_CONST;
|
||||
|
||||
|
|
|
@ -31,17 +31,16 @@
|
|||
#define GIMP_CLONE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CLONE, GimpCloneClass))
|
||||
|
||||
|
||||
typedef struct _GimpClone GimpClone;
|
||||
typedef struct _GimpCloneClass GimpCloneClass;
|
||||
|
||||
struct _GimpClone
|
||||
{
|
||||
GimpSourceCore parent_instance;
|
||||
GimpSourceCore parent_instance;
|
||||
};
|
||||
|
||||
struct _GimpCloneClass
|
||||
{
|
||||
GimpSourceCoreClass parent_class;
|
||||
GimpSourceCoreClass parent_class;
|
||||
};
|
||||
|
||||
|
||||
|
|
|
@ -31,7 +31,6 @@
|
|||
#define GIMP_CLONE_OPTIONS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CLONE_OPTIONS, GimpCloneOptionsClass))
|
||||
|
||||
|
||||
typedef struct _GimpCloneOptions GimpCloneOptions;
|
||||
typedef struct _GimpCloneOptionsClass GimpCloneOptionsClass;
|
||||
|
||||
struct _GimpCloneOptions
|
||||
|
|
|
@ -31,7 +31,6 @@
|
|||
#define GIMP_CONVOLVE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CONVOLVE, GimpConvolveClass))
|
||||
|
||||
|
||||
typedef struct _GimpConvolve GimpConvolve;
|
||||
typedef struct _GimpConvolveClass GimpConvolveClass;
|
||||
|
||||
struct _GimpConvolve
|
||||
|
|
|
@ -31,17 +31,21 @@
|
|||
#define GIMP_CONVOLVE_OPTIONS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CONVOLVE_OPTIONS, GimpConvolveOptionsClass))
|
||||
|
||||
|
||||
typedef struct _GimpConvolveOptions GimpConvolveOptions;
|
||||
typedef struct _GimpPaintOptionsClass GimpConvolveOptionsClass;
|
||||
typedef struct _GimpConvolveOptionsClass GimpConvolveOptionsClass;
|
||||
|
||||
struct _GimpConvolveOptions
|
||||
{
|
||||
GimpPaintOptions paint_options;
|
||||
GimpPaintOptions parent_instance;
|
||||
|
||||
GimpConvolveType type;
|
||||
gdouble rate;
|
||||
};
|
||||
|
||||
struct _GimpConvolveOptionsClass
|
||||
{
|
||||
GimpPaintOptionsClass parent_class;
|
||||
};
|
||||
|
||||
|
||||
GType gimp_convolve_options_get_type (void) G_GNUC_CONST;
|
||||
|
||||
|
|
|
@ -30,7 +30,6 @@
|
|||
#define GIMP_IS_DODGE_BURN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_DODGE_BURN))
|
||||
|
||||
|
||||
typedef struct _GimpDodgeBurn GimpDodgeBurn;
|
||||
typedef struct _GimpDodgeBurnClass GimpDodgeBurnClass;
|
||||
|
||||
struct _GimpDodgeBurn
|
||||
|
@ -42,7 +41,7 @@ struct _GimpDodgeBurn
|
|||
|
||||
struct _GimpDodgeBurnClass
|
||||
{
|
||||
GimpBrushCoreClass parent_class;
|
||||
GimpBrushCoreClass parent_class;
|
||||
};
|
||||
|
||||
|
||||
|
|
|
@ -31,18 +31,22 @@
|
|||
#define GIMP_DODGE_BURN_OPTIONS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_DODGE_BURN_OPTIONS, GimpDodgeBurnOptionsClass))
|
||||
|
||||
|
||||
typedef struct _GimpDodgeBurnOptions GimpDodgeBurnOptions;
|
||||
typedef struct _GimpPaintOptionsClass GimpDodgeBurnOptionsClass;
|
||||
typedef struct _GimpDodgeBurnOptionsClass GimpDodgeBurnOptionsClass;
|
||||
|
||||
struct _GimpDodgeBurnOptions
|
||||
{
|
||||
GimpPaintOptions paint_options;
|
||||
GimpPaintOptions parent_instance;
|
||||
|
||||
GimpDodgeBurnType type;
|
||||
GimpTransferMode mode; /*highlights, midtones, shadows*/
|
||||
gdouble exposure;
|
||||
};
|
||||
|
||||
struct _GimpDodgeBurnOptionsClass
|
||||
{
|
||||
GimpPaintOptionsClass parent_class;
|
||||
};
|
||||
|
||||
|
||||
GType gimp_dodge_burn_options_get_type (void) G_GNUC_CONST;
|
||||
|
||||
|
|
|
@ -31,17 +31,16 @@
|
|||
#define GIMP_ERASER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_ERASER, GimpEraserClass))
|
||||
|
||||
|
||||
typedef struct _GimpEraser GimpEraser;
|
||||
typedef struct _GimpEraserClass GimpEraserClass;
|
||||
|
||||
struct _GimpEraser
|
||||
{
|
||||
GimpBrushCore parent_instance;
|
||||
GimpBrushCore parent_instance;
|
||||
};
|
||||
|
||||
struct _GimpEraserClass
|
||||
{
|
||||
GimpBrushCoreClass parent_class;
|
||||
GimpBrushCoreClass parent_class;
|
||||
};
|
||||
|
||||
|
||||
|
|
|
@ -31,16 +31,20 @@
|
|||
#define GIMP_ERASER_OPTIONS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_ERASER_OPTIONS, GimpEraserOptionsClass))
|
||||
|
||||
|
||||
typedef struct _GimpEraserOptions GimpEraserOptions;
|
||||
typedef struct _GimpPaintOptionsClass GimpEraserOptionsClass;
|
||||
typedef struct _GimpEraserOptionsClass GimpEraserOptionsClass;
|
||||
|
||||
struct _GimpEraserOptions
|
||||
{
|
||||
GimpPaintOptions paint_options;
|
||||
GimpPaintOptions parent_instance;
|
||||
|
||||
gboolean anti_erase;
|
||||
};
|
||||
|
||||
struct _GimpEraserOptionsClass
|
||||
{
|
||||
GimpPaintOptionsClass parent_class;
|
||||
};
|
||||
|
||||
|
||||
GType gimp_eraser_options_get_type (void) G_GNUC_CONST;
|
||||
|
||||
|
|
|
@ -31,7 +31,6 @@
|
|||
#define GIMP_HEAL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_HEAL, GimpHealClass))
|
||||
|
||||
|
||||
typedef struct _GimpHeal GimpHeal;
|
||||
typedef struct _GimpHealClass GimpHealClass;
|
||||
|
||||
struct _GimpHeal
|
||||
|
|
|
@ -36,7 +36,6 @@
|
|||
#define GIMP_INK_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_INK, GimpInkClass))
|
||||
|
||||
|
||||
typedef struct _GimpInk GimpInk;
|
||||
typedef struct _GimpInkClass GimpInkClass;
|
||||
|
||||
struct _GimpInk
|
||||
|
|
|
@ -31,12 +31,11 @@
|
|||
#define GIMP_INK_OPTIONS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_INK_OPTIONS, GimpInkOptionsClass))
|
||||
|
||||
|
||||
typedef struct _GimpInkOptions GimpInkOptions;
|
||||
typedef struct _GimpPaintOptionsClass GimpInkOptionsClass;
|
||||
typedef struct _GimpInkOptionsClass GimpInkOptionsClass;
|
||||
|
||||
struct _GimpInkOptions
|
||||
{
|
||||
GimpPaintOptions paint_options;
|
||||
GimpPaintOptions parent_instance;
|
||||
|
||||
gdouble size;
|
||||
gdouble tilt_angle;
|
||||
|
@ -50,6 +49,11 @@ struct _GimpInkOptions
|
|||
gdouble blob_angle;
|
||||
};
|
||||
|
||||
struct _GimpInkOptionsClass
|
||||
{
|
||||
GimpPaintOptionsClass parent_instance;
|
||||
};
|
||||
|
||||
|
||||
GType gimp_ink_options_get_type (void) G_GNUC_CONST;
|
||||
|
||||
|
|
|
@ -31,17 +31,16 @@
|
|||
#define GIMP_PAINTBRUSH_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_PAINTBRUSH, GimpPaintbrushClass))
|
||||
|
||||
|
||||
typedef struct _GimpPaintbrush GimpPaintbrush;
|
||||
typedef struct _GimpPaintbrushClass GimpPaintbrushClass;
|
||||
|
||||
struct _GimpPaintbrush
|
||||
{
|
||||
GimpBrushCore parent_instance;
|
||||
GimpBrushCore parent_instance;
|
||||
};
|
||||
|
||||
struct _GimpPaintbrushClass
|
||||
{
|
||||
GimpBrushCoreClass parent_class;
|
||||
GimpBrushCoreClass parent_class;
|
||||
};
|
||||
|
||||
|
||||
|
|
|
@ -31,7 +31,6 @@
|
|||
#define GIMP_PENCIL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_PENCIL, GimpPencilClass))
|
||||
|
||||
|
||||
typedef struct _GimpPencil GimpPencil;
|
||||
typedef struct _GimpPencilClass GimpPencilClass;
|
||||
|
||||
struct _GimpPencil
|
||||
|
|
|
@ -31,14 +31,18 @@
|
|||
#define GIMP_PENCIL_OPTIONS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_PENCIL_OPTIONS, GimpPencilOptionsClass))
|
||||
|
||||
|
||||
typedef struct _GimpPencilOptions GimpPencilOptions;
|
||||
typedef struct _GimpPaintOptionsClass GimpPencilOptionsClass;
|
||||
typedef struct _GimpPencilOptionsClass GimpPencilOptionsClass;
|
||||
|
||||
struct _GimpPencilOptions
|
||||
{
|
||||
GimpPaintOptions parent_instance;
|
||||
};
|
||||
|
||||
struct _GimpPencilOptionsClass
|
||||
{
|
||||
GimpPaintOptionsClass parent_class;
|
||||
};
|
||||
|
||||
|
||||
GType gimp_pencil_options_get_type (void) G_GNUC_CONST;
|
||||
|
||||
|
|
|
@ -31,7 +31,6 @@
|
|||
#define GIMP_PERSPECTIVE_CLONE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_PERSPECTIVE_CLONE, GimpPerspectiveCloneClass))
|
||||
|
||||
|
||||
typedef struct _GimpPerspectiveClone GimpPerspectiveClone;
|
||||
typedef struct _GimpPerspectiveCloneClass GimpPerspectiveCloneClass;
|
||||
|
||||
struct _GimpPerspectiveClone
|
||||
|
|
|
@ -31,19 +31,18 @@
|
|||
#define GIMP_PERSPECTIVE_CLONE_OPTIONS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_PERSPECTIVE_CLONE_OPTIONS, GimpPerspectiveCloneOptionsClass))
|
||||
|
||||
|
||||
typedef struct _GimpPerspectiveCloneOptions GimpPerspectiveCloneOptions;
|
||||
typedef struct _GimpPerspectiveCloneOptionsClass GimpPerspectiveCloneOptionsClass;
|
||||
|
||||
struct _GimpPerspectiveCloneOptions
|
||||
{
|
||||
GimpCloneOptions paint_instance;
|
||||
GimpCloneOptions paint_instance;
|
||||
|
||||
GimpPerspectiveCloneMode clone_mode;
|
||||
GimpPerspectiveCloneMode clone_mode;
|
||||
};
|
||||
|
||||
struct _GimpPerspectiveCloneOptionsClass
|
||||
{
|
||||
GimpCloneOptionsClass parent_class;
|
||||
GimpCloneOptionsClass parent_class;
|
||||
};
|
||||
|
||||
|
||||
|
|
|
@ -33,7 +33,6 @@
|
|||
#define GIMP_SMUDGE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_SMUDGE, GimpSmudgeClass))
|
||||
|
||||
|
||||
typedef struct _GimpSmudge GimpSmudge;
|
||||
typedef struct _GimpSmudgeClass GimpSmudgeClass;
|
||||
|
||||
struct _GimpSmudge
|
||||
|
@ -47,7 +46,7 @@ struct _GimpSmudge
|
|||
|
||||
struct _GimpSmudgeClass
|
||||
{
|
||||
GimpBrushCoreClass parent_class;
|
||||
GimpBrushCoreClass parent_class;
|
||||
};
|
||||
|
||||
|
||||
|
|
|
@ -31,16 +31,20 @@
|
|||
#define GIMP_SMUDGE_OPTIONS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_SMUDGE_OPTIONS, GimpSmudgeOptionsClass))
|
||||
|
||||
|
||||
typedef struct _GimpSmudgeOptions GimpSmudgeOptions;
|
||||
typedef struct _GimpPaintOptionsClass GimpSmudgeOptionsClass;
|
||||
typedef struct _GimpSmudgeOptionsClass GimpSmudgeOptionsClass;
|
||||
|
||||
struct _GimpSmudgeOptions
|
||||
{
|
||||
GimpPaintOptions paint_options;
|
||||
GimpPaintOptions parent_instance;
|
||||
|
||||
gdouble rate;
|
||||
};
|
||||
|
||||
struct _GimpSmudgeOptionsClass
|
||||
{
|
||||
GimpPaintOptionsClass parent_class;
|
||||
};
|
||||
|
||||
|
||||
GType gimp_smudge_options_get_type (void) G_GNUC_CONST;
|
||||
|
||||
|
|
|
@ -31,7 +31,6 @@
|
|||
#define GIMP_SOURCE_CORE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_SOURCE_CORE, GimpSourceCoreClass))
|
||||
|
||||
|
||||
typedef struct _GimpSourceCore GimpSourceCore;
|
||||
typedef struct _GimpSourceCoreClass GimpSourceCoreClass;
|
||||
|
||||
struct _GimpSourceCore
|
||||
|
|
|
@ -31,22 +31,21 @@
|
|||
#define GIMP_SOURCE_OPTIONS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_SOURCE_OPTIONS, GimpSourceOptionsClass))
|
||||
|
||||
|
||||
typedef struct _GimpSourceOptions GimpSourceOptions;
|
||||
typedef struct _GimpSourceOptionsClass GimpSourceOptionsClass;
|
||||
|
||||
struct _GimpSourceOptions
|
||||
{
|
||||
GimpPaintOptions parent_instance;
|
||||
GimpPaintOptions parent_instance;
|
||||
|
||||
GimpSourceAlignMode align_mode;
|
||||
gboolean sample_merged;
|
||||
GimpSourceAlignMode align_mode;
|
||||
gboolean sample_merged;
|
||||
|
||||
gboolean use_source; /* not a property */
|
||||
gboolean use_source; /* not a property */
|
||||
};
|
||||
|
||||
struct _GimpSourceOptionsClass
|
||||
{
|
||||
GimpPaintOptionsClass parent_class;
|
||||
GimpPaintOptionsClass parent_class;
|
||||
};
|
||||
|
||||
|
||||
|
|
|
@ -24,15 +24,46 @@
|
|||
#include "paint/paint-enums.h"
|
||||
|
||||
|
||||
/* objects */
|
||||
/* paint cores */
|
||||
|
||||
typedef struct _GimpPaintCore GimpPaintCore;
|
||||
typedef struct _GimpBrushCore GimpBrushCore;
|
||||
typedef struct _GimpSourceCore GimpSourceCore;
|
||||
|
||||
typedef struct _GimpAirbrush GimpAirbrush;
|
||||
typedef struct _GimpClone GimpClone;
|
||||
typedef struct _GimpConvolve GimpConvolve;
|
||||
typedef struct _GimpDodgeBurn GimpDodgeBurn;
|
||||
typedef struct _GimpEraser GimpEraser;
|
||||
typedef struct _GimpHeal GimpHeal;
|
||||
typedef struct _GimpInk GimpInk;
|
||||
typedef struct _GimpPaintbrush GimpPaintbrush;
|
||||
typedef struct _GimpPencil GimpPencil;
|
||||
typedef struct _GimpPerspectiveClone GimpPerspectiveClone;
|
||||
typedef struct _GimpSmudge GimpSmudge;
|
||||
|
||||
|
||||
/* paint options */
|
||||
|
||||
typedef struct _GimpPaintOptions GimpPaintOptions;
|
||||
typedef struct _GimpSourceOptions GimpSourceOptions;
|
||||
|
||||
typedef struct _GimpAirbrushOptions GimpAirbrushOptions;
|
||||
typedef struct _GimpCloneOptions GimpCloneOptions;
|
||||
typedef struct _GimpConvolveOptions GimpConvolveOptions;
|
||||
typedef struct _GimpDodgeBurnOptions GimpDodgeBurnOptions;
|
||||
typedef struct _GimpEraserOptions GimpEraserOptions;
|
||||
typedef struct _GimpInkOptions GimpInkOptions;
|
||||
typedef struct _GimpPencilOptions GimpPencilOptions;
|
||||
typedef struct _GimpPerspectiveCloneOptions GimpPerspectiveCloneOptions;
|
||||
typedef struct _GimpSmudgeOptions GimpSmudgeOptions;
|
||||
|
||||
|
||||
/* paint undos */
|
||||
|
||||
typedef struct _GimpPaintCore GimpPaintCore;
|
||||
typedef struct _GimpPaintCoreUndo GimpPaintCoreUndo;
|
||||
typedef struct _GimpBrushCore GimpBrushCore;
|
||||
typedef struct _GimpInkUndo GimpInkUndo;
|
||||
|
||||
typedef struct _GimpPaintOptions GimpPaintOptions;
|
||||
|
||||
|
||||
/* functions */
|
||||
|
||||
|
|
Loading…
Reference in New Issue