adg-adim.h   adg-adim.h 
skipping to change at line 36 skipping to change at line 36
#define ADG_TYPE_ADIM (adg_adim_get_type ()) #define ADG_TYPE_ADIM (adg_adim_get_type ())
#define ADG_ADIM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ADG_T YPE_ADIM, AdgADim)) #define ADG_ADIM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ADG_T YPE_ADIM, AdgADim))
#define ADG_ADIM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ADG_TY PE_ADIM, AdgADimClass)) #define ADG_ADIM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ADG_TY PE_ADIM, AdgADimClass))
#define ADG_IS_ADIM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ADG_T YPE_ADIM)) #define ADG_IS_ADIM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ADG_T YPE_ADIM))
#define ADG_IS_ADIM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ADG_TY PE_ADIM)) #define ADG_IS_ADIM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ADG_TY PE_ADIM))
#define ADG_ADIM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ADG_TY PE_ADIM, AdgADimClass)) #define ADG_ADIM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ADG_TY PE_ADIM, AdgADimClass))
typedef struct _AdgADim AdgADim; typedef struct _AdgADim AdgADim;
typedef struct _AdgADimClass AdgADimClass; typedef struct _AdgADimClass AdgADimClass;
typedef struct _AdgADimPrivate AdgADimPrivate;
struct _AdgADim { struct _AdgADim {
AdgDim dim;
/*< private >*/ /*< private >*/
AdgADimPrivate *priv; AdgDim parent;
gpointer data;
}; };
struct _AdgADimClass { struct _AdgADimClass {
/*< private >*/
AdgDimClass parent_class; AdgDimClass parent_class;
}; };
GType adg_adim_get_type (void) G_GNUC_CONST; GType adg_adim_get_type (void) G_GNUC_CONST;
AdgEntity * adg_adim_new (void); AdgEntity * adg_adim_new (void);
gdouble adg_adim_get_angle1 (AdgADim *adim);
void adg_adim_set_angle1 (AdgADim *adim,
gdouble angle);
gdouble adg_adim_get_angle2 (AdgADim *adim);
void adg_adim_set_angle2 (AdgADim *adim,
gdouble angle);
G_END_DECLS G_END_DECLS
#endif /* __ADG_ADIM_H__ */ #endif /* __ADG_ADIM_H__ */
 End of changes. 5 change blocks. 
3 lines changed or deleted 10 lines changed or added


 adg-arrow-style.h   adg-arrow-style.h 
skipping to change at line 29 skipping to change at line 29
#ifndef __ADG_ARROW_STYLE_H__ #ifndef __ADG_ARROW_STYLE_H__
#define __ADG_ARROW_STYLE_H__ #define __ADG_ARROW_STYLE_H__
#include <adg/adg-style.h> #include <adg/adg-style.h>
#include <adg/adg-enums.h> #include <adg/adg-enums.h>
#include <cpml/cpml.h> #include <cpml/cpml.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define ADG_TYPE_ARROW_STYLE (adg_arrow_style_get_type ()) #define ADG_TYPE_ARROW_STYLE (adg_arrow_style_get_type())
#define ADG_SLOT_ARROW_STYLE (adg_arrow_style_get_slot ()) #define ADG_ARROW_STYLE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),
#define ADG_ARROW_STYLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj) ADG_TYPE_ARROW_STYLE, AdgArrowStyle))
, ADG_TYPE_ARROW_STYLE, AdgArrowStyle)) #define ADG_ARROW_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),
#define ADG_ARROW_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ADG_TYPE_ARROW_STYLE, AdgArrowStyleClass))
ADG_TYPE_ARROW_STYLE, AdgArrowStyleClass)) #define ADG_IS_ARROW_STYLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),
#define ADG_IS_ARROW_STYLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj) ADG_TYPE_ARROW_STYLE))
, ADG_TYPE_ARROW_STYLE)) #define ADG_IS_ARROW_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass),
#define ADG_IS_ARROW_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ADG_TYPE_ARROW_STYLE))
ADG_TYPE_ARROW_STYLE)) #define ADG_ARROW_STYLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj),
#define ADG_ARROW_STYLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ADG_TYPE_ARROW_STYLE, AdgArrowStyleClass))
ADG_TYPE_ARROW_STYLE, AdgArrowStyleClass)) #define ADG_SLOT_ARROW_STYLE (_adg_arrow_style_get_slot())
typedef struct _AdgArrowStyle AdgArrowStyle; typedef struct _AdgArrowStyle AdgArrowStyle;
typedef struct _AdgArrowStyleClass AdgArrowStyleClass; typedef struct _AdgArrowStyleClass AdgArrowStyleClass;
typedef struct _AdgArrowStylePrivate AdgArrowStylePrivate;
/** /**
* AdgArrowRenderer: * AdgArrowRenderer:
* @arrow_style: an #AdgArrowStyle object * @arrow_style: an #AdgArrowStyle object
* @cr: a #cairo_t drawing context * @cr: a #cairo_t drawing context
* @segment: the #CpmlSegment where rendering the arrow * @segment: the #CpmlSegment where rendering the arrow
* *
* Callback that renders a custom arrow at the start position in @segment. * Callback that renders a custom arrow at the start position in @segment.
* If you need an ending arrow, you should reverse the segment and recall * If you need an ending arrow, you should reverse the segment and recall
* this function. * this function.
**/ **/
typedef void (*AdgArrowRenderer) (AdgArrowStyle *arrow_styl e, typedef void (*AdgArrowRenderer) (AdgArrowStyle *arrow_styl e,
cairo_t *cr, cairo_t *cr,
CpmlSegment *segment); CpmlSegment *segment);
struct _AdgArrowStyle { struct _AdgArrowStyle {
AdgStyle style;
/*< private >*/ /*< private >*/
AdgArrowStylePrivate *priv; AdgStyle parent;
gpointer data;
}; };
struct _AdgArrowStyleClass { struct _AdgArrowStyleClass {
AdgStyleClass parent_class; /*< private >*/
AdgStyleClass parent_class;
}; };
GType adg_arrow_style_get_type (void) G_GNUC_CONST; GType adg_arrow_style_get_type (void) G_GNUC_CONST;
AdgStyleSlot adg_arrow_style_get_slot (void) G_GNUC_CONST; AdgStyleSlot _adg_arrow_style_get_slot (void) G_GNUC_CONST;
AdgStyle * adg_arrow_style_new (void); AdgStyle * adg_arrow_style_new (void);
void adg_arrow_style_render (AdgArrowStyle *arrow_styl e, void adg_arrow_style_render (AdgArrowStyle *arrow_styl e,
cairo_t *cr, cairo_t *cr,
CpmlSegment *segment); CpmlSegment *segment);
gdouble adg_arrow_style_get_size (AdgArrowStyle *arrow_styl e); gdouble adg_arrow_style_get_size (AdgArrowStyle *arrow_styl e);
void adg_arrow_style_set_size (AdgArrowStyle *arrow_styl e, void adg_arrow_style_set_size (AdgArrowStyle *arrow_styl e,
gdouble size); gdouble size);
gdouble adg_arrow_style_get_angle (AdgArrowStyle *arrow_styl e); gdouble adg_arrow_style_get_angle (AdgArrowStyle *arrow_styl e);
 End of changes. 6 change blocks. 
17 lines changed or deleted 17 lines changed or added


 adg-canvas.h   adg-canvas.h 
skipping to change at line 35 skipping to change at line 35
G_BEGIN_DECLS G_BEGIN_DECLS
#define ADG_TYPE_CANVAS (adg_canvas_get_type ()) #define ADG_TYPE_CANVAS (adg_canvas_get_type ())
#define ADG_CANVAS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ADG _TYPE_CANVAS, AdgCanvas)) #define ADG_CANVAS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ADG _TYPE_CANVAS, AdgCanvas))
#define ADG_CANVAS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ADG_ TYPE_CANVAS, AdgCanvasClass)) #define ADG_CANVAS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ADG_ TYPE_CANVAS, AdgCanvasClass))
#define ADG_IS_CANVAS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ADG _TYPE_CANVAS)) #define ADG_IS_CANVAS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ADG _TYPE_CANVAS))
#define ADG_IS_CANVAS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ADG_ TYPE_CANVAS)) #define ADG_IS_CANVAS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ADG_ TYPE_CANVAS))
#define ADG_CANVAS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ADG_ TYPE_CANVAS, AdgCanvasClass)) #define ADG_CANVAS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ADG_ TYPE_CANVAS, AdgCanvasClass))
#if 0
/* AdgCanvas declared in adg-entity.h */ /* AdgCanvas declared in adg-entity.h */
typedef struct _AdgCanvas AdgCanvas;
#endif
typedef struct _AdgCanvasClass AdgCanvasClass; typedef struct _AdgCanvasClass AdgCanvasClass;
typedef struct _AdgCanvasPrivate AdgCanvasPrivate;
struct _AdgCanvas { struct _AdgCanvas {
AdgContainer container;
/*< private >*/ /*< private >*/
AdgCanvasPrivate *priv; AdgContainer parent;
gpointer data;
}; };
struct _AdgCanvasClass { struct _AdgCanvasClass {
/*< private >*/
AdgContainerClass parent_class; AdgContainerClass parent_class;
}; };
GType adg_canvas_get_type (void) G_GNUC_CONST ; GType adg_canvas_get_type (void) G_GNUC_CONST ;
AdgCanvas * adg_canvas_new (void); AdgCanvas * adg_canvas_new (void);
G_END_DECLS G_END_DECLS
#endif /* __ADG_CANVAS_H__ */ #endif /* __ADG_CANVAS_H__ */
 End of changes. 6 change blocks. 
3 lines changed or deleted 6 lines changed or added


 adg-container.h   adg-container.h 
skipping to change at line 34 skipping to change at line 34
G_BEGIN_DECLS G_BEGIN_DECLS
#define ADG_TYPE_CONTAINER (adg_container_get_type ()) #define ADG_TYPE_CONTAINER (adg_container_get_type ())
#define ADG_CONTAINER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ADG_TYPE_CONTAINER, AdgContainer)) #define ADG_CONTAINER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ADG_TYPE_CONTAINER, AdgContainer))
#define ADG_CONTAINER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), A DG_TYPE_CONTAINER, AdgContainerClass)) #define ADG_CONTAINER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), A DG_TYPE_CONTAINER, AdgContainerClass))
#define ADG_IS_CONTAINER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ADG_TYPE_CONTAINER)) #define ADG_IS_CONTAINER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ADG_TYPE_CONTAINER))
#define ADG_IS_CONTAINER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), A DG_TYPE_CONTAINER)) #define ADG_IS_CONTAINER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), A DG_TYPE_CONTAINER))
#define ADG_CONTAINER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), A DG_TYPE_CONTAINER, AdgContainerClass)) #define ADG_CONTAINER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), A DG_TYPE_CONTAINER, AdgContainerClass))
/* AdgContainer declared in adg-entity.h */ typedef struct _AdgContainer AdgContainer;
typedef struct _AdgContainerClass AdgContainerClass; typedef struct _AdgContainerClass AdgContainerClass;
typedef struct _AdgContainerPrivate AdgContainerPrivate;
struct _AdgContainer { struct _AdgContainer {
AdgEntity entity;
/*< private >*/ /*< private >*/
AdgContainerPrivate *priv; AdgEntity parent;
gpointer data;
}; };
struct _AdgContainerClass { struct _AdgContainerClass {
/*< private >*/
AdgEntityClass parent_class; AdgEntityClass parent_class;
/*< public >*/
/* Virtual Table */ /* Virtual Table */
GSList * (*get_children) (AdgContainer *container) ; GSList * (*get_children) (AdgContainer *container) ;
gboolean (*add) (AdgContainer *container, void (*add) (AdgContainer *container,
AdgEntity *entity); AdgEntity *entity);
gboolean (*remove) (AdgContainer *container, void (*remove) (AdgContainer *container,
AdgEntity *entity); AdgEntity *entity);
}; };
GType adg_container_get_type (void) G_GNUC_CONST; GType adg_container_get_type (void) G_GNUC_CONST;
AdgEntity * adg_container_new (void); AdgEntity * adg_container_new (void);
GSList * adg_container_get_children (AdgContainer *container ); GSList * adg_container_get_children (AdgContainer *container );
void adg_container_add (AdgContainer *container , void adg_container_add (AdgContainer *container ,
AdgEntity *entity); AdgEntity *entity);
void adg_container_remove (AdgContainer *container , void adg_container_remove (AdgContainer *container ,
skipping to change at line 79 skipping to change at line 79
guint signal_id , guint signal_id ,
GQuark detail, GQuark detail,
...); ...);
void adg_container_propagate_by_name (AdgContainer *container , void adg_container_propagate_by_name (AdgContainer *container ,
const gchar *detailed_ signal, const gchar *detailed_ signal,
...); ...);
void adg_container_propagate_valist (AdgContainer *container , void adg_container_propagate_valist (AdgContainer *container ,
guint signal_id , guint signal_id ,
GQuark detail, GQuark detail,
va_list var_args) ; va_list var_args) ;
const AdgMatrix *
adg_container_get_model_transformation
(AdgContainer *container
);
void adg_container_set_model_transformation
(AdgContainer *container
,
const AdgMatrix *transform
ation);
const AdgMatrix *
adg_container_get_paper_transformation
(AdgContainer *container
);
void adg_container_set_paper_transformation
(AdgContainer *container
,
const AdgMatrix *transform
ation);
G_END_DECLS G_END_DECLS
#endif /* __ADG_CONTAINER_H__ */ #endif /* __ADG_CONTAINER_H__ */
 End of changes. 8 change blocks. 
26 lines changed or deleted 8 lines changed or added


 adg-context.h   adg-context.h 
skipping to change at line 36 skipping to change at line 36
#define ADG_TYPE_CONTEXT (adg_context_get_type ()) #define ADG_TYPE_CONTEXT (adg_context_get_type ())
#define ADG_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), AD G_TYPE_CONTEXT, AdgContext)) #define ADG_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), AD G_TYPE_CONTEXT, AdgContext))
#define ADG_CONTEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ADG _TYPE_CONTEXT, AdgContextClass)) #define ADG_CONTEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ADG _TYPE_CONTEXT, AdgContextClass))
#define ADG_IS_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), AD G_TYPE_CONTEXT)) #define ADG_IS_CONTEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), AD G_TYPE_CONTEXT))
#define ADG_IS_CONTEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ADG _TYPE_CONTEXT)) #define ADG_IS_CONTEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ADG _TYPE_CONTEXT))
#define ADG_CONTEXT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ADG _TYPE_CONTEXT, AdgContextClass)) #define ADG_CONTEXT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ADG _TYPE_CONTEXT, AdgContextClass))
typedef struct _AdgContext AdgContext; typedef struct _AdgContext AdgContext;
typedef struct _AdgContextClass AdgContextClass; typedef struct _AdgContextClass AdgContextClass;
typedef struct _AdgContextPrivate AdgContextPrivate;
typedef AdgStyle * (*AdgContextFiller) (AdgStyleClass *style_class, gpointe r user_data); typedef AdgStyle * (*AdgContextFiller) (AdgStyleClass *style_class, gpointe r user_data);
struct _AdgContext { struct _AdgContext {
GObject object;
/*< private >*/ /*< private >*/
AdgContextPrivate *priv; GObject parent;
gpointer data;
}; };
struct _AdgContextClass { struct _AdgContextClass {
GObjectClass object_class; /*< private >*/
GObjectClass parent_class;
}; };
GType adg_context_get_type (void) G_GNUC_CONST; GType adg_context_get_type (void) G_GNUC_CONST;
AdgStyleSlot adg_context_get_slot (GType type); AdgStyleSlot adg_context_get_slot (GType type);
AdgContext * adg_context_new (AdgContextFiller context_f iller, AdgContext * adg_context_new (AdgContextFiller context_f iller,
gpointer user_data) ; gpointer user_data) ;
AdgStyle * adg_context_get_style (AdgContext *context, AdgStyle * adg_context_get_style (AdgContext *context,
AdgStyleSlot slot); AdgStyleSlot slot);
void adg_context_set_style (AdgContext *context, void adg_context_set_style (AdgContext *context,
 End of changes. 4 change blocks. 
4 lines changed or deleted 4 lines changed or added


 adg-dim-style.h   adg-dim-style.h 
skipping to change at line 32 skipping to change at line 32
#include <adg/adg-style.h> #include <adg/adg-style.h>
#include <adg/adg-font-style.h> #include <adg/adg-font-style.h>
#include <adg/adg-line-style.h> #include <adg/adg-line-style.h>
#include <adg/adg-arrow-style.h> #include <adg/adg-arrow-style.h>
#include <adg/adg-pair.h> #include <adg/adg-pair.h>
#include <adg/adg-enums.h> #include <adg/adg-enums.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define ADG_TYPE_DIM_STYLE (adg_dim_style_get_type ()) #define ADG_TYPE_DIM_STYLE (adg_dim_style_get_type())
#define ADG_SLOT_DIM_STYLE (adg_dim_style_get_slot ()) #define ADG_DIM_STYLE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), A
#define ADG_DIM_STYLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), DG_TYPE_DIM_STYLE, AdgDimStyle))
ADG_TYPE_DIM_STYLE, AdgDimStyle)) #define ADG_DIM_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), AD
#define ADG_DIM_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), A G_TYPE_DIM_STYLE, AdgDimStyleClass))
DG_TYPE_DIM_STYLE, AdgDimStyleClass)) #define ADG_IS_DIM_STYLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), A
#define ADG_IS_DIM_STYLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), DG_TYPE_DIM_STYLE))
ADG_TYPE_DIM_STYLE)) #define ADG_IS_DIM_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), AD
#define ADG_IS_DIM_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), A G_TYPE_DIM_STYLE))
DG_TYPE_DIM_STYLE)) #define ADG_DIM_STYLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), AD
#define ADG_DIM_STYLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), A G_TYPE_DIM_STYLE, AdgDimStyleClass))
DG_TYPE_DIM_STYLE, AdgDimStyleClass)) #define ADG_SLOT_DIM_STYLE (_adg_dim_style_get_slot())
typedef struct _AdgDimStyle AdgDimStyle; typedef struct _AdgDimStyle AdgDimStyle;
typedef struct _AdgDimStyleClass AdgDimStyleClass; typedef struct _AdgDimStyleClass AdgDimStyleClass;
typedef struct _AdgDimStylePrivate AdgDimStylePrivate;
struct _AdgDimStyle { struct _AdgDimStyle {
AdgStyle style;
/*< private >*/ /*< private >*/
AdgDimStylePrivate *priv; AdgStyle parent;
gpointer data;
}; };
struct _AdgDimStyleClass { struct _AdgDimStyleClass {
/*< private >*/
AdgStyleClass parent_class; AdgStyleClass parent_class;
}; };
GType adg_dim_style_get_type (void) G_GNUC_CONST; GType adg_dim_style_get_type (void) G_GNUC_CONST;
AdgStyleSlot adg_dim_style_get_slot (void) G_GNUC_CONST; AdgStyleSlot _adg_dim_style_get_slot (void) G_GNUC_CONST;
AdgStyle * adg_dim_style_new (void); AdgStyle * adg_dim_style_new (void);
AdgStyle * adg_dim_style_get_quote_style (AdgDimStyle *dim_style) AdgStyle * adg_dim_style_get_value_style (AdgDimStyle *dim_style)
; ;
void adg_dim_style_set_quote_style (AdgDimStyle *dim_style, void adg_dim_style_set_value_style (AdgDimStyle *dim_style,
AdgFontStyle *style); AdgFontStyle *style);
AdgStyle * adg_dim_style_get_tolerance_style AdgStyle * adg_dim_style_get_tolerance_style
(AdgDimStyle *dim_style) ; (AdgDimStyle *dim_style) ;
void adg_dim_style_set_tolerance_style void adg_dim_style_set_tolerance_style
(AdgDimStyle *dim_style, (AdgDimStyle *dim_style,
AdgFontStyle *style); AdgFontStyle *style);
AdgStyle * adg_dim_style_get_note_style (AdgDimStyle *dim_style) ; AdgStyle * adg_dim_style_get_note_style (AdgDimStyle *dim_style) ;
void adg_dim_style_set_note_style (AdgDimStyle *dim_style, void adg_dim_style_set_note_style (AdgDimStyle *dim_style,
AdgFontStyle *style); AdgFontStyle *style);
AdgStyle * adg_dim_style_get_line_style (AdgDimStyle *dim_style) ; AdgStyle * adg_dim_style_get_line_style (AdgDimStyle *dim_style) ;
skipping to change at line 81 skipping to change at line 81
AdgLineStyle *style); AdgLineStyle *style);
AdgStyle * adg_dim_style_get_arrow_style (AdgDimStyle *dim_style) ; AdgStyle * adg_dim_style_get_arrow_style (AdgDimStyle *dim_style) ;
void adg_dim_style_set_arrow_style (AdgDimStyle *dim_style, void adg_dim_style_set_arrow_style (AdgDimStyle *dim_style,
AdgArrowStyle *style); AdgArrowStyle *style);
gdouble adg_dim_style_get_from_offset (AdgDimStyle *dim_style) ; gdouble adg_dim_style_get_from_offset (AdgDimStyle *dim_style) ;
void adg_dim_style_set_from_offset (AdgDimStyle *dim_style, void adg_dim_style_set_from_offset (AdgDimStyle *dim_style,
gdouble offset); gdouble offset);
gdouble adg_dim_style_get_to_offset (AdgDimStyle *dim_style) ; gdouble adg_dim_style_get_to_offset (AdgDimStyle *dim_style) ;
void adg_dim_style_set_to_offset (AdgDimStyle *dim_style, void adg_dim_style_set_to_offset (AdgDimStyle *dim_style,
gdouble offset); gdouble offset);
gdouble adg_dim_style_beyond (AdgDimStyle *dim_style)
;
gdouble adg_dim_style_get_beyond (AdgDimStyle *dim_style)
;
void adg_dim_style_set_beyond (AdgDimStyle *dim_style,
gdouble length);
gdouble adg_dim_style_get_baseline_spacing gdouble adg_dim_style_get_baseline_spacing
(AdgDimStyle *dim_style) ; (AdgDimStyle *dim_style) ;
void adg_dim_style_set_baseline_spacing void adg_dim_style_set_baseline_spacing
(AdgDimStyle *dim_style, (AdgDimStyle *dim_style,
gdouble spacing); gdouble spacing);
gdouble adg_dim_style_get_tolerance_spacing gdouble adg_dim_style_get_tolerance_spacing
(AdgDimStyle *dim_style) ; (AdgDimStyle *dim_style) ;
void adg_dim_style_set_tolerance_spacing void adg_dim_style_set_tolerance_spacing
(AdgDimStyle *dim_style, (AdgDimStyle *dim_style,
gdouble spacing); gdouble spacing);
 End of changes. 8 change blocks. 
19 lines changed or deleted 25 lines changed or added


 adg-dim.h   adg-dim.h 
skipping to change at line 37 skipping to change at line 37
#define ADG_TYPE_DIM (adg_dim_get_type ()) #define ADG_TYPE_DIM (adg_dim_get_type ())
#define ADG_DIM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ADG_TY PE_DIM, AdgDim)) #define ADG_DIM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ADG_TY PE_DIM, AdgDim))
#define ADG_DIM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ADG_TYP E_DIM, AdgDimClass)) #define ADG_DIM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ADG_TYP E_DIM, AdgDimClass))
#define ADG_IS_DIM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ADG_TY PE_DIM)) #define ADG_IS_DIM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ADG_TY PE_DIM))
#define ADG_IS_DIM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ADG_TYP E_DIM)) #define ADG_IS_DIM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ADG_TYP E_DIM))
#define ADG_DIM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ADG_TYP E_DIM, AdgDimClass)) #define ADG_DIM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ADG_TYP E_DIM, AdgDimClass))
typedef struct _AdgDim AdgDim; typedef struct _AdgDim AdgDim;
typedef struct _AdgDimClass AdgDimClass; typedef struct _AdgDimClass AdgDimClass;
typedef struct _AdgDimPrivate AdgDimPrivate;
struct _AdgDim { struct _AdgDim {
AdgEntity entity;
/*< private >*/ /*< private >*/
AdgDimPrivate *priv; AdgEntity parent;
gpointer data;
}; };
struct _AdgDimClass { struct _AdgDimClass {
/*< private >*/
AdgEntityClass parent_class; AdgEntityClass parent_class;
/*< public >*/
/* Virtual Table */ /* Virtual Table */
gchar * (*default_quote) (AdgDim *dim); gchar * (*default_value) (AdgDim *dim);
void (*quote_layout) (AdgDim *dim, void (*quote_layout) (AdgDim *dim,
cairo_t *cr); cairo_t *cr);
}; };
GType adg_dim_get_type (void) G_GNUC_CONST; GType adg_dim_get_type (void) G_GNUC_CONST;
const AdgPair * adg_dim_get_org (AdgDim *dim); const AdgPair * adg_dim_get_org (AdgDim *dim);
void adg_dim_set_org (AdgDim *dim, void adg_dim_set_org (AdgDim *dim,
const AdgPair *org); const AdgPair *org);
void adg_dim_set_org_explicit (AdgDim *dim, void adg_dim_set_org_explicit (AdgDim *dim,
gdouble org_x, gdouble org_x,
skipping to change at line 86 skipping to change at line 87
AdgPair *pos1, AdgPair *pos1,
AdgPair *pos2); AdgPair *pos2);
void adg_dim_set_pos_explicit (AdgDim *dim, void adg_dim_set_pos_explicit (AdgDim *dim,
gdouble pos1_x, gdouble pos1_x,
gdouble pos1_y, gdouble pos1_y,
gdouble pos2_x, gdouble pos2_x,
gdouble pos2_y); gdouble pos2_y);
gdouble adg_dim_get_level (AdgDim *dim); gdouble adg_dim_get_level (AdgDim *dim);
void adg_dim_set_level (AdgDim *dim, void adg_dim_set_level (AdgDim *dim,
gdouble level); gdouble level);
const gchar * adg_dim_get_quote (AdgDim *dim); AdgThreeState adg_dim_get_outside (AdgDim *dim);
void adg_dim_set_quote (AdgDim *dim, void adg_dim_set_outside (AdgDim *dim,
const gchar *quote); AdgThreeState outside);
const gchar * adg_dim_get_tolerance_up (AdgDim *dim); const gchar * adg_dim_get_value (AdgDim *dim);
void adg_dim_set_tolerance_up (AdgDim *dim, void adg_dim_set_value (AdgDim *dim,
const gchar *tolerance_ const gchar *value);
up); const gchar * adg_dim_get_value_min (AdgDim *dim);
const gchar * adg_dim_get_tolerance_down (AdgDim *dim); void adg_dim_set_value_min (AdgDim *dim,
void adg_dim_set_tolerance_down (AdgDim *dim, const gchar *value_min)
const gchar *tolerance_ ;
down); const gchar * adg_dim_get_value_max (AdgDim *dim);
void adg_dim_set_value_max (AdgDim *dim,
const gchar *value_max)
;
void adg_dim_set_tolerances (AdgDim *dim, void adg_dim_set_tolerances (AdgDim *dim,
const gchar *tolerance_ const gchar *value_min,
up, const gchar *value_max)
const gchar *tolerance_ ;
down);
const gchar * adg_dim_get_note (AdgDim *dim); const gchar * adg_dim_get_note (AdgDim *dim);
void adg_dim_set_note (AdgDim *dim, void adg_dim_set_note (AdgDim *dim,
const gchar *note); const gchar *note);
void adg_dim_render_quote (AdgDim *dim, void adg_dim_render_quote (AdgDim *dim,
cairo_t *cr); cairo_t *cr);
G_END_DECLS G_END_DECLS
#endif /* __ADG_DIM_H__ */ #endif /* __ADG_DIM_H__ */
 End of changes. 8 change blocks. 
19 lines changed or deleted 22 lines changed or added


 adg-entity.h   adg-entity.h 
skipping to change at line 23 skipping to change at line 23
* *
* You should have received a copy of the GNU Lesser General Public * You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the * License along with this library; if not, write to the
* Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
*/ */
#ifndef __ADG_ENTITY_H__ #ifndef __ADG_ENTITY_H__
#define __ADG_ENTITY_H__ #define __ADG_ENTITY_H__
#include <adg/adg-util.h>
#include <adg/adg-context.h> #include <adg/adg-context.h>
#include <adg/adg-matrix.h> #include <adg/adg-matrix.h>
#include <adg/adg-point.h> #include <adg/adg-enums.h>
#include <adg/adg-line-style.h>
#include <adg/adg-font-style.h>
#include <adg/adg-arrow-style.h>
#include <adg/adg-dim-style.h>
G_BEGIN_DECLS G_BEGIN_DECLS
/* Forward declarations */
typedef struct _AdgCanvas AdgCanvas;
typedef struct _AdgContainer AdgContainer;
#define ADG_TYPE_ENTITY (adg_entity_get_type ()) #define ADG_TYPE_ENTITY (adg_entity_get_type ())
#define ADG_ENTITY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ADG _TYPE_ENTITY, AdgEntity)) #define ADG_ENTITY(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ADG _TYPE_ENTITY, AdgEntity))
#define ADG_ENTITY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ADG_ TYPE_ENTITY, AdgEntityClass)) #define ADG_ENTITY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ADG_ TYPE_ENTITY, AdgEntityClass))
#define ADG_IS_ENTITY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ADG _TYPE_ENTITY)) #define ADG_IS_ENTITY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ADG _TYPE_ENTITY))
#define ADG_IS_ENTITY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ADG_ TYPE_ENTITY)) #define ADG_IS_ENTITY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ADG_ TYPE_ENTITY))
#define ADG_ENTITY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ADG_ TYPE_ENTITY, AdgEntityClass)) #define ADG_ENTITY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ADG_ TYPE_ENTITY, AdgEntityClass))
typedef struct _AdgEntity AdgEntity; typedef struct _AdgEntity AdgEntity;
typedef struct _AdgEntityClass AdgEntityClass; typedef struct _AdgEntityClass AdgEntityClass;
typedef struct _AdgEntityPrivate AdgEntityPrivate;
struct _AdgEntity { ADG_FORWARD_DECL(AdgCanvas);
GInitiallyUnowned initially_unowned;
struct _AdgEntity {
/*< private >*/ /*< private >*/
AdgEntityPrivate *priv; GInitiallyUnowned parent;
gpointer data;
}; };
struct _AdgEntityClass { struct _AdgEntityClass {
/*< private >*/
GInitiallyUnownedClass parent_class; GInitiallyUnownedClass parent_class;
/*< public >*/
/* Signals */ /* Signals */
void (*parent_set) (AdgEntity *entity, void (*parent_set) (AdgEntity *entity,
AdgContainer *old_parent AdgEntity *old_parent
); );
void (*model_matrix_changed) (AdgEntity *entity, void (*context_set) (AdgEntity *entity,
AdgMatrix *parent_mat AdgContext *old_contex
rix); t);
void (*paper_matrix_changed) (AdgEntity *entity,
AdgMatrix *parent_mat
rix);
void (*invalidate) (AdgEntity *entity);
void (*render) (AdgEntity *entity,
cairo_t *cr);
/* Virtual Table */ /* Virtual Table */
AdgContainer * (*get_parent) (AdgEntity *entity); gboolean (*invalidate) (AdgEntity *entity);
void (*set_parent) (AdgEntity *entity, gboolean (*render) (AdgEntity *entity,
AdgContainer *parent); cairo_t *cr);
AdgContext * (*get_context) (AdgEntity *entity);
const AdgMatrix * (*get_model_matrix) (AdgEntity *entity);
const AdgMatrix * (*get_paper_matrix) (AdgEntity *entity);
}; };
#define ADG_CALLBACK(f) ((AdgCallback) (f))
typedef void (*AdgCallback)(AdgEntity *entity, cairo_t *cr, gpointer user_d
ata);
GType adg_entity_get_type (void) G_GNUC_CONST; GType adg_entity_get_type (void) G_GNUC_CONST;
AdgCanvas * adg_entity_get_canvas (AdgEntity *entity); AdgCanvas * adg_entity_get_canvas (AdgEntity *entity);
AdgContainer * adg_entity_get_parent (AdgEntity *entity); AdgEntity * adg_entity_get_parent (AdgEntity *entity);
void adg_entity_set_parent (AdgEntity *entity, void adg_entity_set_parent (AdgEntity *entity,
AdgContainer *parent); AdgEntity *parent);
void adg_entity_unparent (AdgEntity *entity); AdgContext * adg_entity_context (AdgEntity *entity);
void adg_entity_reparent (AdgEntity *entity, AdgContext * adg_entity_get_context (AdgEntity *entity);
AdgContainer *parent); void adg_entity_set_context (AdgEntity *entity,
AdgContext * adg_entity_get_context (AdgEntity *entity); AdgContext *context);
void adg_entity_set_context (AdgEntity *entity, gboolean adg_entity_get_rendered (AdgEntity *entity);
AdgContext *context); void adg_entity_set_rendered (AdgEntity *entity,
const AdgMatrix*adg_entity_get_model_matrix (AdgEntity *entity); gboolean rendered)
const AdgMatrix*adg_entity_get_paper_matrix (AdgEntity *entity); ;
gboolean adg_entity_build_paper2model (AdgEntity *entity, void adg_entity_get_global_map (AdgEntity *entity,
AdgMatrix *matrix); AdgMatrix *map);
gboolean adg_entity_build_model2paper (AdgEntity *entity, void adg_entity_set_global_map (AdgEntity *entity,
AdgMatrix *matrix); const AdgMatrix *map);
void adg_entity_scale_to_model (AdgEntity *entity, void adg_entity_transform_global_map (AdgEntity *entity,
cairo_t *cr); const AdgMatrix *transform
void adg_entity_scale_to_paper (AdgEntity *entity, ation);
cairo_t *cr); void adg_entity_get_global_matrix (AdgEntity *entity,
void adg_entity_model_matrix_changed (AdgEntity *entity, AdgMatrix *matrix);
const AdgMatrix*parent_mat void adg_entity_get_local_map (AdgEntity *entity,
rix); AdgMatrix *map);
void adg_entity_paper_matrix_changed (AdgEntity *entity, void adg_entity_set_local_map (AdgEntity *entity,
const AdgMatrix*parent_mat const AdgMatrix *map);
rix); void adg_entity_transform_local_map (AdgEntity *entity,
AdgStyle * adg_entity_get_style (AdgEntity *entity, const AdgMatrix *transform
AdgStyleSlot style_slot ation);
); void adg_entity_get_local_matrix (AdgEntity *entity,
void adg_entity_apply (AdgEntity *entity, AdgMatrix *matrix);
AdgStyleSlot style_slot AdgStyle * adg_entity_get_style (AdgEntity *entity,
, AdgStyleSlot style_slo
cairo_t *cr); t);
void adg_entity_point_to_pair (AdgEntity *entity, void adg_entity_apply (AdgEntity *entity,
const AdgPoint *point, AdgStyleSlot style_slo
AdgPair *pair, t,
cairo_t *cr); cairo_t *cr);
void adg_entity_point_to_model_pair (AdgEntity *entity, void adg_entity_apply_font (AdgEntity *entity,
const AdgPoint *point, AdgFontStyleId font_id,
AdgPair *pair); cairo_t *cr);
void adg_entity_point_to_paper_pair (AdgEntity *entity, void adg_entity_invalidate (AdgEntity *entity);
const AdgPoint *point, void adg_entity_render (AdgEntity *entity,
AdgPair *pair); cairo_t *cr);
gboolean adg_entity_model_matrix_applied (AdgEntity *entity);
gboolean adg_entity_paper_matrix_applied (AdgEntity *entity);
gboolean adg_entity_model_applied (AdgEntity *entity);
void adg_entity_invalidate (AdgEntity *entity);
void adg_entity_render (AdgEntity *entity,
cairo_t *cr);
G_END_DECLS G_END_DECLS
#endif /* __ADG_ENTITY_H__ */ #endif /* __ADG_ENTITY_H__ */
 End of changes. 14 change blocks. 
84 lines changed or deleted 60 lines changed or added


 adg-enums.h   adg-enums.h 
skipping to change at line 27 skipping to change at line 27
* Boston, MA 02110-1301, USA. * Boston, MA 02110-1301, USA.
*/ */
#ifndef __ADG_ENUMS_H__ #ifndef __ADG_ENUMS_H__
#define __ADG_ENUMS_H__ #define __ADG_ENUMS_H__
#include <glib-object.h> #include <glib-object.h>
G_BEGIN_DECLS G_BEGIN_DECLS
/**
* AdgLineStyleId:
* @ADG_LINE_STYLE_DRAW: normal drawing
* @ADG_LINE_STYLE_CENTER: axis and center-lines
* @ADG_LINE_STYLE_HIDDEN: covered entities
* @ADG_LINE_STYLE_HATCH: hatches
* @ADG_LINE_STYLE_DIM: extension and base lines of dimension entities
* @ADG_LINE_STYLE_LAST: start of user-defined styles
*
* Builtin id to get some predefined #AdgLineStyle instances.
*/
typedef enum { typedef enum {
ADG_LINE_STYLE_DRAW, ADG_LINE_STYLE_DRAW,
ADG_LINE_STYLE_CENTER, ADG_LINE_STYLE_CENTER,
ADG_LINE_STYLE_HIDDEN, ADG_LINE_STYLE_HIDDEN,
ADG_LINE_STYLE_HATCH, ADG_LINE_STYLE_HATCH,
ADG_LINE_STYLE_DIM, ADG_LINE_STYLE_DIM,
ADG_LINE_STYLE_LAST ADG_LINE_STYLE_LAST
} AdgLineStyleId; } AdgLineStyleId;
/**
* AdgFontStyleId:
* @ADG_FONT_STYLE_TEXT: generic text style
* @ADG_FONT_STYLE_QUOTE: text style for the quote number
* @ADG_FONT_STYLE_TOLERANCE: text style for quote tolerances
* @ADG_FONT_STYLE_NOTE: text style for additional notes appended to the qu
ote
* @ADG_FONT_STYLE_LAST: start of user defined font styles
*
* Builtin id to get some predefined #AdgFontStyle instances.
*/
typedef enum { typedef enum {
ADG_FONT_STYLE_TEXT, ADG_FONT_STYLE_TEXT,
ADG_FONT_STYLE_QUOTE, ADG_FONT_STYLE_VALUE,
ADG_FONT_STYLE_TOLERANCE, ADG_FONT_STYLE_TOLERANCE,
ADG_FONT_STYLE_NOTE, ADG_FONT_STYLE_NOTE,
ADG_FONT_STYLE_LAST ADG_FONT_STYLE_LAST
} AdgFontStyleId; } AdgFontStyleId;
/**
* AdgArrowStyleId:
* @ADG_ARROW_STYLE_ARROW: the classic arrow to use in technical drawings
* @ADG_ARROW_STYLE_TRIANGLE: same as above, but not filled
* @ADG_ARROW_STYLE_DOT: a filled circle
* @ADG_ARROW_STYLE_CIRCLE: an empty circle
* @ADG_ARROW_STYLE_BLOCK: a filled square
* @ADG_ARROW_STYLE_SQUARE: an empty square
* @ADG_ARROW_STYLE_TICK: an architetural tick
* @ADG_ARROW_STYLE_LAST: start of user-defined arrow styles
*
* Builtin id to get some predefined #AdgArrowStyle instances.
*/
typedef enum { typedef enum {
ADG_ARROW_STYLE_ARROW, ADG_ARROW_STYLE_ARROW,
ADG_ARROW_STYLE_TRIANGLE, ADG_ARROW_STYLE_TRIANGLE,
ADG_ARROW_STYLE_DOT, ADG_ARROW_STYLE_DOT,
ADG_ARROW_STYLE_CIRCLE, ADG_ARROW_STYLE_CIRCLE,
ADG_ARROW_STYLE_BLOCK, ADG_ARROW_STYLE_BLOCK,
ADG_ARROW_STYLE_SQUARE, ADG_ARROW_STYLE_SQUARE,
ADG_ARROW_STYLE_TICK, ADG_ARROW_STYLE_TICK,
ADG_ARROW_STYLE_LAST ADG_ARROW_STYLE_LAST
} AdgArrowStyleId; } AdgArrowStyleId;
/**
* AdgDimStyleId:
* @ADG_DIM_STYLE_ISO: the ISO standard
* @ADG_DIM_STYLE_LAST: start of user-defined dimension styles
*
* Builtin id to get some predefined #AdgDimStyle instances.
*/
typedef enum { typedef enum {
ADG_DIM_STYLE_ISO, ADG_DIM_STYLE_ISO,
ADG_DIM_STYLE_LAST ADG_DIM_STYLE_LAST
} AdgDimStyleId; } AdgDimStyleId;
typedef enum {
ADG_THREE_STATE_OFF,
ADG_THREE_STATE_ON,
ADG_THREE_STATE_UNKNOWN
} AdgThreeState;
G_END_DECLS G_END_DECLS
#endif /* __ADG_ENUMS_H__ */ #endif /* __ADG_ENUMS_H__ */
 End of changes. 6 change blocks. 
43 lines changed or deleted 7 lines changed or added


 adg-font-style.h   adg-font-style.h 
skipping to change at line 28 skipping to change at line 28
*/ */
#ifndef __ADG_FONT_STYLE_H__ #ifndef __ADG_FONT_STYLE_H__
#define __ADG_FONT_STYLE_H__ #define __ADG_FONT_STYLE_H__
#include <adg/adg-style.h> #include <adg/adg-style.h>
#include <adg/adg-enums.h> #include <adg/adg-enums.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define ADG_TYPE_FONT_STYLE (adg_font_style_get_type ()) #define ADG_TYPE_FONT_STYLE (adg_font_style_get_type())
#define ADG_SLOT_FONT_STYLE (adg_font_style_get_slot ()) #define ADG_FONT_STYLE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),
#define ADG_FONT_STYLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ADG_TYPE_FONT_STYLE, AdgFontStyle))
ADG_TYPE_FONT_STYLE, AdgFontStyle)) #define ADG_FONT_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), A
#define ADG_FONT_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DG_TYPE_FONT_STYLE, AdgFontStyleClass))
ADG_TYPE_FONT_STYLE, AdgFontStyleClass)) #define ADG_IS_FONT_STYLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),
#define ADG_IS_FONT_STYLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ADG_TYPE_FONT_STYLE))
ADG_TYPE_FONT_STYLE)) #define ADG_IS_FONT_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), A
#define ADG_IS_FONT_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DG_TYPE_FONT_STYLE))
ADG_TYPE_FONT_STYLE)) #define ADG_FONT_STYLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), A
#define ADG_FONT_STYLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DG_TYPE_FONT_STYLE, AdgFontStyleClass))
ADG_TYPE_FONT_STYLE, AdgFontStyleClass)) #define ADG_SLOT_FONT_STYLE (_adg_font_style_get_slot())
typedef struct _AdgFontStyle AdgFontStyle; typedef struct _AdgFontStyle AdgFontStyle;
typedef struct _AdgFontStyleClass AdgFontStyleClass; typedef struct _AdgFontStyleClass AdgFontStyleClass;
typedef struct _AdgFontStylePrivate AdgFontStylePrivate;
struct _AdgFontStyle { struct _AdgFontStyle {
AdgStyle style;
/*< private >*/ /*< private >*/
AdgFontStylePrivate *priv; AdgStyle parent;
gpointer data;
}; };
struct _AdgFontStyleClass { struct _AdgFontStyleClass {
/*< private >*/
AdgStyleClass parent_class; AdgStyleClass parent_class;
}; };
GType adg_font_style_get_type (void) G_GNUC_CONST; GType adg_font_style_get_type (void) G_GNUC_CONST;
AdgStyleSlot adg_font_style_get_slot (void) G_GNUC_CONST; AdgStyleSlot _adg_font_style_get_slot (void) G_GNUC_CONST;
AdgStyle * adg_font_style_new (void); AdgStyle * adg_font_style_new (void);
const gchar * adg_font_style_get_family (AdgFontStyle *font_style ); const gchar * adg_font_style_get_family (AdgFontStyle *font_style );
void adg_font_style_set_family (AdgFontStyle *font_style , void adg_font_style_set_family (AdgFontStyle *font_style ,
const gchar *family); const gchar *family);
cairo_font_slant_t cairo_font_slant_t
adg_font_style_get_slant (AdgFontStyle *font_style ); adg_font_style_get_slant (AdgFontStyle *font_style );
void adg_font_style_set_slant (AdgFontStyle *font_style , void adg_font_style_set_slant (AdgFontStyle *font_style ,
cairo_font_slant_t slant); cairo_font_slant_t slant);
cairo_font_weight_t cairo_font_weight_t
 End of changes. 6 change blocks. 
16 lines changed or deleted 16 lines changed or added


 adg-ldim.h   adg-ldim.h 
skipping to change at line 36 skipping to change at line 36
#define ADG_TYPE_LDIM (adg_ldim_get_type ()) #define ADG_TYPE_LDIM (adg_ldim_get_type ())
#define ADG_LDIM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ADG_T YPE_LDIM, AdgLDim)) #define ADG_LDIM(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ADG_T YPE_LDIM, AdgLDim))
#define ADG_LDIM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ADG_TY PE_LDIM, AdgLDimClass)) #define ADG_LDIM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ADG_TY PE_LDIM, AdgLDimClass))
#define ADG_IS_LDIM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ADG_T YPE_LDIM)) #define ADG_IS_LDIM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ADG_T YPE_LDIM))
#define ADG_IS_LDIM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ADG_TY PE_LDIM)) #define ADG_IS_LDIM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ADG_TY PE_LDIM))
#define ADG_LDIM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ADG_TY PE_LDIM, AdgLDimClass)) #define ADG_LDIM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ADG_TY PE_LDIM, AdgLDimClass))
typedef struct _AdgLDim AdgLDim; typedef struct _AdgLDim AdgLDim;
typedef struct _AdgLDimClass AdgLDimClass; typedef struct _AdgLDimClass AdgLDimClass;
typedef struct _AdgLDimPrivate AdgLDimPrivate;
struct _AdgLDim { struct _AdgLDim {
AdgDim dim;
/*< private >*/ /*< private >*/
AdgLDimPrivate *priv; AdgDim parent;
gpointer data;
}; };
struct _AdgLDimClass { struct _AdgLDimClass {
/*< private >*/
AdgDimClass parent_class; AdgDimClass parent_class;
}; };
GType adg_ldim_get_type (void) G_GNUC_CONST; GType adg_ldim_get_type (void) G_GNUC_CONST;
AdgEntity * adg_ldim_new (void); AdgEntity * adg_ldim_new (void);
AdgEntity * adg_ldim_new_full (const AdgPair *ref1, AdgEntity * adg_ldim_new_full (const AdgPair *ref1,
const AdgPair *ref2, const AdgPair *ref2,
gdouble direction, gdouble direction,
const AdgPair *pos); const AdgPair *pos);
 End of changes. 4 change blocks. 
3 lines changed or deleted 3 lines changed or added


 adg-line-style.h   adg-line-style.h 
skipping to change at line 28 skipping to change at line 28
*/ */
#ifndef __ADG_LINE_STYLE_H__ #ifndef __ADG_LINE_STYLE_H__
#define __ADG_LINE_STYLE_H__ #define __ADG_LINE_STYLE_H__
#include <adg/adg-style.h> #include <adg/adg-style.h>
#include <adg/adg-enums.h> #include <adg/adg-enums.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define ADG_TYPE_LINE_STYLE (adg_line_style_get_type ()) #define ADG_TYPE_LINE_STYLE (adg_line_style_get_type())
#define ADG_SLOT_LINE_STYLE (adg_line_style_get_slot ()) #define ADG_LINE_STYLE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),
#define ADG_LINE_STYLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ADG_TYPE_LINE_STYLE, AdgLineStyle))
ADG_TYPE_LINE_STYLE, AdgLineStyle)) #define ADG_LINE_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), A
#define ADG_LINE_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), DG_TYPE_LINE_STYLE, AdgLineStyleClass))
ADG_TYPE_LINE_STYLE, AdgLineStyleClass)) #define ADG_IS_LINE_STYLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),
#define ADG_IS_LINE_STYLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ADG_TYPE_LINE_STYLE))
ADG_TYPE_LINE_STYLE)) #define ADG_IS_LINE_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), A
#define ADG_IS_LINE_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), DG_TYPE_LINE_STYLE))
ADG_TYPE_LINE_STYLE)) #define ADG_LINE_STYLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), A
#define ADG_LINE_STYLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), DG_TYPE_LINE_STYLE, AdgLineStyleClass))
ADG_TYPE_LINE_STYLE, AdgLineStyleClass)) #define ADG_SLOT_LINE_STYLE (_adg_line_style_get_slot())
typedef struct _AdgLineStyle AdgLineStyle; typedef struct _AdgLineStyle AdgLineStyle;
typedef struct _AdgLineStyleClass AdgLineStyleClass; typedef struct _AdgLineStyleClass AdgLineStyleClass;
typedef struct _AdgLineStylePrivate AdgLineStylePrivate;
struct _AdgLineStyle { struct _AdgLineStyle {
AdgStyle style;
/*< private >*/ /*< private >*/
AdgLineStylePrivate *priv; AdgStyle parent;
gpointer data;
}; };
struct _AdgLineStyleClass { struct _AdgLineStyleClass {
/*< private >*/
AdgStyleClass parent_class; AdgStyleClass parent_class;
}; };
GType adg_line_style_get_type (void) G_GNUC_CONST; GType adg_line_style_get_type (void) G_GNUC_CONST;
AdgStyleSlot adg_line_style_get_slot (void) G_GNUC_CONST; AdgStyleSlot _adg_line_style_get_slot (void) G_GNUC_CONST;
AdgStyle * adg_line_style_new (void); AdgStyle * adg_line_style_new (void);
gdouble adg_line_style_get_width (AdgLineStyle *line_style ); gdouble adg_line_style_get_width (AdgLineStyle *line_style );
void adg_line_style_set_width (AdgLineStyle *line_style , void adg_line_style_set_width (AdgLineStyle *line_style ,
gdouble width); gdouble width);
cairo_line_cap_t cairo_line_cap_t
adg_line_style_get_cap (AdgLineStyle *line_style ); adg_line_style_get_cap (AdgLineStyle *line_style );
void adg_line_style_set_cap (AdgLineStyle *line_style , void adg_line_style_set_cap (AdgLineStyle *line_style ,
cairo_line_cap_t cap); cairo_line_cap_t cap);
cairo_line_join_t cairo_line_join_t
 End of changes. 6 change blocks. 
16 lines changed or deleted 16 lines changed or added


 adg-matrix.h   adg-matrix.h 
skipping to change at line 28 skipping to change at line 28
*/ */
#ifndef __ADG_MATRIX_H__ #ifndef __ADG_MATRIX_H__
#define __ADG_MATRIX_H__ #define __ADG_MATRIX_H__
#include <glib-object.h> #include <glib-object.h>
#include <cairo.h> #include <cairo.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define ADG_TYPE_MATRIX (adg_matrix_get_type ()) #define ADG_TYPE_MATRIX (adg_matrix_get_type())
typedef cairo_matrix_t AdgMatrix; typedef cairo_matrix_t AdgMatrix;
GType adg_matrix_get_type (void) G_GNUC_CONST; GType adg_matrix_get_type (void) G_GNUC_CONST;
AdgMatrix * adg_matrix_dup (const AdgMatrix *matrix); AdgMatrix * adg_matrix_dup (const AdgMatrix *matrix);
const AdgMatrix*adg_matrix_get_fallback (void) G_GNUC_CONST; const AdgMatrix*adg_matrix_get_fallback (void) G_GNUC_CONST;
AdgMatrix * adg_matrix_copy (AdgMatrix *matrix, AdgMatrix * adg_matrix_copy (AdgMatrix *matrix,
const AdgMatrix *src); const AdgMatrix *src);
void adg_matrix_init_null (AdgMatrix *matrix); void adg_matrix_init_null (AdgMatrix *matrix);
gboolean adg_matrix_is_null (const AdgMatrix *matrix); gboolean adg_matrix_is_null (const AdgMatrix *matrix);
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 adg-model.h   adg-model.h 
skipping to change at line 36 skipping to change at line 36
#define ADG_TYPE_MODEL (adg_model_get_type()) #define ADG_TYPE_MODEL (adg_model_get_type())
#define ADG_MODEL(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ADG_T YPE_MODEL, AdgModel)) #define ADG_MODEL(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ADG_T YPE_MODEL, AdgModel))
#define ADG_MODEL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), ADG_TY PE_MODEL, AdgModel)) #define ADG_MODEL_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), ADG_TY PE_MODEL, AdgModel))
#define ADG_IS_MODEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), ADG_T YPE_MODEL)) #define ADG_IS_MODEL(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), ADG_T YPE_MODEL))
#define ADG_IS_MODEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), ADG_TY PE_MODEL)) #define ADG_IS_MODEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), ADG_TY PE_MODEL))
#define ADG_MODEL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), ADG_TY PE_MODEL, AdgModelClass)) #define ADG_MODEL_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), ADG_TY PE_MODEL, AdgModelClass))
typedef struct _AdgModel AdgModel; typedef struct _AdgModel AdgModel;
typedef struct _AdgModelClass AdgModelClass; typedef struct _AdgModelClass AdgModelClass;
typedef struct _AdgModelPrivate AdgModelPrivate;
struct _AdgModel { struct _AdgModel {
/*< private >*/ /*< private >*/
GObject object; GObject parent;
AdgModelPrivate *priv; gpointer data;
}; };
struct _AdgModelClass { struct _AdgModelClass {
/*< private >*/
GObjectClass parent_class; GObjectClass parent_class;
/*< public >*/
/* Virtual Table */ /* Virtual Table */
void (*changed) (AdgModel *model); void (*changed) (AdgModel *model);
}; };
GType adg_model_get_type (void) G_GNUC_CONST; GType adg_model_get_type (void) G_GNUC_CONST;
void adg_model_changed (AdgModel *model); void adg_model_changed (AdgModel *model);
G_END_DECLS G_END_DECLS
#endif /* __ADG_MODEL_H__ */ #endif /* __ADG_MODEL_H__ */
 End of changes. 4 change blocks. 
4 lines changed or deleted 4 lines changed or added


 adg-path.h   adg-path.h 
skipping to change at line 39 skipping to change at line 39
#define ADG_TYPE_PATH (adg_path_get_type ()) #define ADG_TYPE_PATH (adg_path_get_type ())
#define ADG_PATH(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ADG_T YPE_PATH, AdgPath)) #define ADG_PATH(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ADG_T YPE_PATH, AdgPath))
#define ADG_PATH_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ADG_TY PE_PATH, AdgPathClass)) #define ADG_PATH_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ADG_TY PE_PATH, AdgPathClass))
#define ADG_IS_PATH(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ADG_T YPE_PATH)) #define ADG_IS_PATH(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ADG_T YPE_PATH))
#define ADG_IS_PATH_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ADG_TY PE_PATH)) #define ADG_IS_PATH_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ADG_TY PE_PATH))
#define ADG_PATH_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ADG_TY PE_PATH, AdgPathClass)) #define ADG_PATH_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ADG_TY PE_PATH, AdgPathClass))
typedef struct _AdgPath AdgPath; typedef struct _AdgPath AdgPath;
typedef struct _AdgPathClass AdgPathClass; typedef struct _AdgPathClass AdgPathClass;
typedef struct _AdgPathPrivate AdgPathPrivate;
struct _AdgPath { struct _AdgPath {
/*< private >*/ /*< private >*/
AdgModel model; AdgModel parent;
AdgPathPrivate *priv; gpointer data;
}; };
struct _AdgPathClass { struct _AdgPathClass {
/*< private >*/
AdgModelClass parent_class; AdgModelClass parent_class;
}; };
GType adg_path_get_type (void) G_GNUC_CONST; GType adg_path_get_type (void) G_GNUC_CONST;
AdgModel * adg_path_new (void); AdgModel * adg_path_new (void);
const cairo_path_t * const cairo_path_t *
adg_path_get_cairo_path (AdgPath *path); adg_path_get_cairo_path (AdgPath *path);
cairo_path_t * adg_path_get_cpml_path (AdgPath *path); cairo_path_t * adg_path_get_cpml_path (AdgPath *path);
void adg_path_get_current_point (AdgPath *path, void adg_path_get_current_point (AdgPath *path,
 End of changes. 3 change blocks. 
3 lines changed or deleted 3 lines changed or added


 adg-stroke.h   adg-stroke.h 
skipping to change at line 37 skipping to change at line 37
#define ADG_TYPE_STROKE (adg_stroke_get_type ()) #define ADG_TYPE_STROKE (adg_stroke_get_type ())
#define ADG_STROKE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ADG _TYPE_STROKE, AdgStroke)) #define ADG_STROKE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ADG _TYPE_STROKE, AdgStroke))
#define ADG_STROKE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ADG_ TYPE_STROKE, AdgStrokeClass)) #define ADG_STROKE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ADG_ TYPE_STROKE, AdgStrokeClass))
#define ADG_IS_STROKE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ADG _TYPE_STROKE)) #define ADG_IS_STROKE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ADG _TYPE_STROKE))
#define ADG_IS_STROKE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ADG_ TYPE_STROKE)) #define ADG_IS_STROKE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ADG_ TYPE_STROKE))
#define ADG_STROKE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ADG_ TYPE_STROKE, AdgStrokeClass)) #define ADG_STROKE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ADG_ TYPE_STROKE, AdgStrokeClass))
typedef struct _AdgStroke AdgStroke; typedef struct _AdgStroke AdgStroke;
typedef struct _AdgStrokeClass AdgStrokeClass; typedef struct _AdgStrokeClass AdgStrokeClass;
typedef struct _AdgStrokePrivate AdgStrokePrivate;
struct _AdgStroke { struct _AdgStroke {
/*< private >*/ /*< private >*/
AdgEntity entity; AdgEntity entity;
AdgStrokePrivate *priv; gpointer data;
}; };
struct _AdgStrokeClass { struct _AdgStrokeClass {
/*< private >*/
AdgEntityClass parent_class; AdgEntityClass parent_class;
}; };
GType adg_stroke_get_type (void) G_GNUC_CONST; GType adg_stroke_get_type (void) G_GNUC_CONST;
AdgEntity * adg_stroke_new (AdgPath *path); AdgEntity * adg_stroke_new (AdgPath *path);
AdgPath * adg_stroke_get_path (AdgStroke *stroke); AdgPath * adg_stroke_get_path (AdgStroke *stroke);
void adg_stroke_set_path (AdgStroke *stroke, void adg_stroke_set_path (AdgStroke *stroke,
AdgPath *path); AdgPath *path);
 End of changes. 3 change blocks. 
2 lines changed or deleted 2 lines changed or added


 adg-style.h   adg-style.h 
skipping to change at line 36 skipping to change at line 36
#define ADG_TYPE_STYLE (adg_style_get_type ()) #define ADG_TYPE_STYLE (adg_style_get_type ())
#define ADG_STYLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ADG_ TYPE_STYLE, AdgStyle)) #define ADG_STYLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), ADG_ TYPE_STYLE, AdgStyle))
#define ADG_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ADG_T YPE_STYLE, AdgStyleClass)) #define ADG_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ADG_T YPE_STYLE, AdgStyleClass))
#define ADG_IS_STYLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ADG_ TYPE_STYLE)) #define ADG_IS_STYLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ADG_ TYPE_STYLE))
#define ADG_IS_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ADG_T YPE_STYLE)) #define ADG_IS_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ADG_T YPE_STYLE))
#define ADG_STYLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ADG_T YPE_STYLE, AdgStyleClass)) #define ADG_STYLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ADG_T YPE_STYLE, AdgStyleClass))
typedef struct _AdgStyle AdgStyle; typedef struct _AdgStyle AdgStyle;
typedef struct _AdgStyleClass AdgStyleClass; typedef struct _AdgStyleClass AdgStyleClass;
typedef struct _AdgStylePrivate AdgStylePrivate;
typedef gint AdgStyleId; typedef gint AdgStyleId;
typedef gint AdgStyleSlot; typedef gint AdgStyleSlot;
struct _AdgStyle { struct _AdgStyle {
GObject object;
/*< private >*/ /*< private >*/
AdgStylePrivate *priv; GObject parent;
gpointer data;
}; };
struct _AdgStyleClass { struct _AdgStyleClass {
/*< private >*/
GObjectClass parent_class; GObjectClass parent_class;
/*< public >*/
/* Virtual table */ /* Virtual table */
GPtrArray * (*get_pool) (void); GPtrArray * (*get_pool) (void);
void (*apply) (AdgStyle *style, void (*apply) (AdgStyle *style,
cairo_t *cr); cairo_t *cr);
}; };
GType adg_style_get_type (void) G_GNUC_CONST; GType adg_style_get_type (void) G_GNUC_CONST;
AdgStyleId adg_style_register_id (AdgStyle *style); AdgStyleId adg_style_register_id (AdgStyle *style);
AdgStyle * adg_style_from_id (GType type, AdgStyle * adg_style_from_id (GType type,
AdgStyleId id); AdgStyleId id);
 End of changes. 5 change blocks. 
3 lines changed or deleted 4 lines changed or added


 adg-title-block.h   adg-title-block.h 
skipping to change at line 36 skipping to change at line 36
#define ADG_TYPE_TITLE_BLOCK (adg_title_block_get_type ()) #define ADG_TYPE_TITLE_BLOCK (adg_title_block_get_type ())
#define ADG_TITLE_BLOCK(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj) , ADG_TYPE_TITLE_BLOCK, AdgTitleBlock)) #define ADG_TITLE_BLOCK(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj) , ADG_TYPE_TITLE_BLOCK, AdgTitleBlock))
#define ADG_TITLE_BLOCK_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ADG_TYPE_TITLE_BLOCK, AdgTitleBlock)) #define ADG_TITLE_BLOCK_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ADG_TYPE_TITLE_BLOCK, AdgTitleBlock))
#define ADG_IS_TITLE_BLOCK(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj) , ADG_TYPE_TITLE_BLOCK)) #define ADG_IS_TITLE_BLOCK(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj) , ADG_TYPE_TITLE_BLOCK))
#define ADG_IS_TITLE_BLOCK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ADG_TYPE_TITLE_BLOCK)) #define ADG_IS_TITLE_BLOCK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ADG_TYPE_TITLE_BLOCK))
#define ADG_TITLE_BLOCK_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ADG_TYPE_TITLE_BLOCK, AdgTitleBlock)) #define ADG_TITLE_BLOCK_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ADG_TYPE_TITLE_BLOCK, AdgTitleBlock))
typedef struct _AdgTitleBlock AdgTitleBlock; typedef struct _AdgTitleBlock AdgTitleBlock;
typedef struct _AdgTitleBlockClass AdgTitleBlockClass; typedef struct _AdgTitleBlockClass AdgTitleBlockClass;
typedef struct _AdgTitleBlockPrivate AdgTitleBlockPrivate;
struct _AdgTitleBlock { struct _AdgTitleBlock {
/*< private >*/ /*< private >*/
AdgEntity entity; AdgEntity parent;
AdgTitleBlockPrivate *priv; gpointer data;
}; };
struct _AdgTitleBlockClass { struct _AdgTitleBlockClass {
/*< private >*/
AdgEntityClass parent_class; AdgEntityClass parent_class;
}; };
GType adg_title_block_get_type (void) G_GNUC_CONST; GType adg_title_block_get_type (void) G_GNUC_CONST;
gchar * adg_title_block_get_name (AdgTitleBlock *title_bloc k); gchar * adg_title_block_get_name (AdgTitleBlock *title_bloc k);
void adg_title_block_set_name (AdgTitleBlock *title_bloc k, void adg_title_block_set_name (AdgTitleBlock *title_bloc k,
const gchar *name); const gchar *name);
gchar * adg_title_block_get_material (AdgTitleBlock *title_bloc k); gchar * adg_title_block_get_material (AdgTitleBlock *title_bloc k);
void adg_title_block_set_material (AdgTitleBlock *title_bloc k, void adg_title_block_set_material (AdgTitleBlock *title_bloc k,
 End of changes. 3 change blocks. 
3 lines changed or deleted 3 lines changed or added


 adg-toy-text.h   adg-toy-text.h 
skipping to change at line 37 skipping to change at line 37
#define ADG_TYPE_TOY_TEXT (adg_toy_text_get_type ()) #define ADG_TYPE_TOY_TEXT (adg_toy_text_get_type ())
#define ADG_TOY_TEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), A DG_TYPE_TOY_TEXT, AdgToyText)) #define ADG_TOY_TEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), A DG_TYPE_TOY_TEXT, AdgToyText))
#define ADG_TOY_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), AD G_TYPE_TOY_TEXT, AdgToyTextClass)) #define ADG_TOY_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), AD G_TYPE_TOY_TEXT, AdgToyTextClass))
#define ADG_IS_TOY_TEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), A DG_TYPE_TOY_TEXT)) #define ADG_IS_TOY_TEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), A DG_TYPE_TOY_TEXT))
#define ADG_IS_TOY_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), AD G_TYPE_TOY_TEXT)) #define ADG_IS_TOY_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), AD G_TYPE_TOY_TEXT))
#define ADG_TOY_TEXT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), AD G_TYPE_TOY_TEXT, AdgToyTextClass)) #define ADG_TOY_TEXT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), AD G_TYPE_TOY_TEXT, AdgToyTextClass))
typedef struct _AdgToyText AdgToyText; typedef struct _AdgToyText AdgToyText;
typedef struct _AdgToyTextClass AdgToyTextClass; typedef struct _AdgToyTextClass AdgToyTextClass;
typedef struct _AdgToyTextPrivate AdgToyTextPrivate;
struct _AdgToyText { struct _AdgToyText {
AdgEntity entity;
/*< private >*/ /*< private >*/
AdgToyTextPrivate *priv; AdgEntity parent;
gpointer data;
}; };
struct _AdgToyTextClass { struct _AdgToyTextClass {
/*< private >*/
AdgEntityClass parent_class; AdgEntityClass parent_class;
}; };
GType adg_toy_text_get_type (void) G_GNUC_CONST; GType adg_toy_text_get_type (void) G_GNUC_CONST;
AdgEntity * adg_toy_text_new (const gchar *label); AdgEntity * adg_toy_text_new (const gchar *label);
const gchar * adg_toy_text_get_label (AdgToyText *toy_text); const gchar * adg_toy_text_get_label (AdgToyText *toy_text);
void adg_toy_text_set_label (AdgToyText *toy_text, void adg_toy_text_set_label (AdgToyText *toy_text,
const gchar *label); const gchar *label);
void adg_toy_text_get_extents (AdgToyText *toy_text,
cairo_t *cr,
cairo_text_extents_t *exte
nts);
G_END_DECLS G_END_DECLS
#endif /* __ADG_TOY_TEXT_H__ */ #endif /* __ADG_TOY_TEXT_H__ */
 End of changes. 5 change blocks. 
4 lines changed or deleted 7 lines changed or added


 adg-type-builtins.h   adg-type-builtins.h 
/* Generated data (by glib-mkenums) */
#ifndef __ADG_TYPE_BUILTINS_H__ #ifndef __ADG_TYPE_BUILTINS_H__
#define __ADG_TYPE_BUILTINS_H__ #define __ADG_TYPE_BUILTINS_H__
#include <glib-object.h> #include <glib-object.h>
G_BEGIN_DECLS G_BEGIN_DECLS
/* enumerations from "adg-enums.h" */ /* Enumerations from "./adg-enums.h" */
#define ADG_TYPE_LINE_STYLE_ID (adg_line_style_id_get_type()) #define ADG_TYPE_LINE_STYLE_ID (adg_line_style_id_get_type())
GType adg_line_style_id_get_type(void) G_GNUC_CONST; GType adg_line_style_id_get_type(void) G_GNUC_CONST;
#define ADG_TYPE_FONT_STYLE_ID (adg_font_style_id_get_type()) #define ADG_TYPE_FONT_STYLE_ID (adg_font_style_id_get_type())
GType adg_font_style_id_get_type(void) G_GNUC_CONST; GType adg_font_style_id_get_type(void) G_GNUC_CONST;
#define ADG_TYPE_ARROW_STYLE_ID (adg_arrow_style_id_get_type()) #define ADG_TYPE_ARROW_STYLE_ID (adg_arrow_style_id_get_type())
GType adg_arrow_style_id_get_type(void) G_GNUC_CONST; GType adg_arrow_style_id_get_type(void) G_GNUC_CONST;
#define ADG_TYPE_DIM_STYLE_ID (adg_dim_style_id_get_type()) #define ADG_TYPE_DIM_STYLE_ID (adg_dim_style_id_get_type())
GType adg_dim_style_id_get_type(void) G_GNUC_CONST; GType adg_dim_style_id_get_type(void) G_GNUC_CONST;
#define ADG_TYPE_THREE_STATE (adg_three_state_get_type())
GType adg_three_state_get_type(void) G_GNUC_CONST;
G_END_DECLS G_END_DECLS
#endif /* __ADG_TYPE_BUILTINS_H__ */ #endif /* __ADG_TYPE_BUILTINS_H__ */
/* Generated data ends here */
 End of changes. 8 change blocks. 
1 lines changed or deleted 12 lines changed or added


 adg-util.h   adg-util.h 
skipping to change at line 32 skipping to change at line 32
#include <glib.h> #include <glib.h>
#include <cairo.h> #include <cairo.h>
#include <math.h> #include <math.h>
#define ADG_DIR_RIGHT 0. #define ADG_DIR_RIGHT 0.
#define ADG_DIR_DOWN M_PI_2 #define ADG_DIR_DOWN M_PI_2
#define ADG_DIR_LEFT M_PI #define ADG_DIR_LEFT M_PI
#define ADG_DIR_UP (M_PI_2 * 3.) #define ADG_DIR_UP (M_PI_2 * 3.)
#define ADG_FORWARD_DECL(id) typedef struct _##id id
#define ADG_ISSET(flags,mask) (((flags) & (mask)) != 0 ? TRUE : FALSE) #define ADG_ISSET(flags,mask) (((flags) & (mask)) != 0 ? TRUE : FALSE)
#define ADG_SET(flags,mask) G_STMT_START{ (flags) |= (mask); }G_STMT_EN D #define ADG_SET(flags,mask) G_STMT_START{ (flags) |= (mask); }G_STMT_EN D
#define ADG_UNSET(flags,mask) G_STMT_START{ (flags) &= ~(mask); }G_STMT_E ND #define ADG_UNSET(flags,mask) G_STMT_START{ (flags) &= ~(mask); }G_STMT_E ND
#define ADG_CHECKPOINT_WITH_MESSAGE(message) \ #define ADG_CHECKPOINT_WITH_MESSAGE(message) \
g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, \ g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, \
"file `%s' at line %d: %s", \ "file `%s' at line %d: %s", \
__FILE__, __LINE__, #message) __FILE__, __LINE__, #message)
#define ADG_CHECKPOINT() ADG_CHECKPOINT_WITH_MESSAGE ("check point") #define ADG_CHECKPOINT() ADG_CHECKPOINT_WITH_MESSAGE ("check point")
#define ADG_STUB() ADG_CHECKPOINT_WITH_MESSAGE("stub") #define ADG_STUB() ADG_CHECKPOINT_WITH_MESSAGE("stub")
G_BEGIN_DECLS
int adg_strcmp (const char *s1,
const gchar *s2);
G_END_DECLS
#endif /* __ADG_UTIL_H__ */ #endif /* __ADG_UTIL_H__ */
 End of changes. 2 change blocks. 
0 lines changed or deleted 8 lines changed or added


 adg-widget.h   adg-widget.h 
skipping to change at line 37 skipping to change at line 37
#define ADG_TYPE_WIDGET (adg_widget_get_type()) #define ADG_TYPE_WIDGET (adg_widget_get_type())
#define ADG_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ADG_ TYPE_WIDGET, AdgWidget)) #define ADG_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ADG_ TYPE_WIDGET, AdgWidget))
#define ADG_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), ADG_T YPE_WIDGET, AdgWidget)) #define ADG_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), ADG_T YPE_WIDGET, AdgWidget))
#define ADG_IS_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), ADG_ TYPE_WIDGET)) #define ADG_IS_WIDGET(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), ADG_ TYPE_WIDGET))
#define ADG_IS_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), ADG_T YPE_WIDGET)) #define ADG_IS_WIDGET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), ADG_T YPE_WIDGET))
#define ADG_WIDGET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), ADG_T YPE_WIDGET, AdgWidgetClass)) #define ADG_WIDGET_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), ADG_T YPE_WIDGET, AdgWidgetClass))
typedef struct _AdgWidget AdgWidget; typedef struct _AdgWidget AdgWidget;
typedef struct _AdgWidgetClass AdgWidgetClass; typedef struct _AdgWidgetClass AdgWidgetClass;
typedef struct _AdgWidgetPrivate AdgWidgetPrivate;
struct _AdgWidget { struct _AdgWidget {
/*< private >*/ /*< private >*/
GtkDrawingArea object; GtkDrawingArea parent;
AdgWidgetPrivate *priv; gpointer data;
}; };
struct _AdgWidgetClass { struct _AdgWidgetClass {
/*< private >*/
GtkDrawingAreaClass parent_class; GtkDrawingAreaClass parent_class;
/*< public >*/
/* Virtual Table */ /* Virtual Table */
void (*canvas_changed) (AdgWidget *widget); void (*canvas_changed) (AdgWidget *widget);
}; };
GType adg_widget_get_type (void) G_GNUC_CONST; GType adg_widget_get_type (void) G_GNUC_CONST;
GtkWidget * adg_widget_new (AdgCanvas *canvas); GtkWidget * adg_widget_new (AdgCanvas *canvas);
AdgCanvas * adg_widget_get_canvas (AdgWidget *widget); AdgCanvas * adg_widget_get_canvas (AdgWidget *widget);
void adg_widget_set_canvas (AdgWidget *widget, void adg_widget_set_canvas (AdgWidget *widget,
 End of changes. 4 change blocks. 
4 lines changed or deleted 4 lines changed or added


 adg.h   adg.h 
skipping to change at line 35 skipping to change at line 35
#include <adg/adg-container.h> #include <adg/adg-container.h>
#include <adg/adg-dim.h> #include <adg/adg-dim.h>
#include <adg/adg-entity.h> #include <adg/adg-entity.h>
#include <adg/adg-enums.h> #include <adg/adg-enums.h>
#include <adg/adg-ldim.h> #include <adg/adg-ldim.h>
#include <adg/adg-matrix.h> #include <adg/adg-matrix.h>
#include <adg/adg-model.h> #include <adg/adg-model.h>
#include <adg/adg-pair.h> #include <adg/adg-pair.h>
#include <adg/adg-path.h> #include <adg/adg-path.h>
#include <adg/adg-primitive.h> #include <adg/adg-primitive.h>
#include <adg/adg-rotable.h>
#include <adg/adg-segment.h> #include <adg/adg-segment.h>
#include <adg/adg-stroke.h> #include <adg/adg-stroke.h>
#include <adg/adg-style.h> #include <adg/adg-style.h>
#include <adg/adg-title-block.h> #include <adg/adg-title-block.h>
#include <adg/adg-toy-text.h> #include <adg/adg-toy-text.h>
#include <adg/adg-translatable.h>
#include <adg/adg-type-builtins.h> #include <adg/adg-type-builtins.h>
#include <adg/adg-util.h> #include <adg/adg-util.h>
#include <adg/adg-widget.h> #include <adg/adg-widget.h>
#endif /* __ADG_H__ */ #endif /* __ADG_H__ */
 End of changes. 2 change blocks. 
2 lines changed or deleted 0 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/