| adg-adim.h | | adg-adim.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_ADIM_H__ | | #ifndef __ADG_ADIM_H__ | |
| #define __ADG_ADIM_H__ | | #define __ADG_ADIM_H__ | |
| | | | |
| #include <adg/adg-dim.h> | | #include <adg/adg-dim.h> | |
| | | | |
| G_BEGIN_DECLS | | G_BEGIN_DECLS | |
| | | | |
|
| #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 | | #define ADG_ADIM(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ADG_TY | |
| YPE_ADIM, AdgADim)) | | PE_ADIM, AdgADim)) | |
| #define ADG_ADIM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ADG_TY | | #define ADG_ADIM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), ADG_TYP | |
| PE_ADIM, AdgADimClass)) | | E_ADIM, AdgADimClass)) | |
| #define ADG_IS_ADIM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ADG_T | | #define ADG_IS_ADIM(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), ADG_TY | |
| YPE_ADIM)) | | PE_ADIM)) | |
| #define ADG_IS_ADIM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ADG_TY | | #define ADG_IS_ADIM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), ADG_TYP | |
| PE_ADIM)) | | E_ADIM)) | |
| #define ADG_ADIM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ADG_TY | | #define ADG_ADIM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), ADG_TYP | |
| PE_ADIM, AdgADimClass)) | | E_ADIM, AdgADimClass)) | |
| | | | |
| typedef struct _AdgADim AdgADim; | | typedef struct _AdgADim AdgADim; | |
| typedef struct _AdgADimClass AdgADimClass; | | typedef struct _AdgADimClass AdgADimClass; | |
| | | | |
| struct _AdgADim { | | struct _AdgADim { | |
| /*< private >*/ | | /*< private >*/ | |
| AdgDim parent; | | AdgDim parent; | |
| gpointer data; | | gpointer data; | |
| }; | | }; | |
| | | | |
| struct _AdgADimClass { | | struct _AdgADimClass { | |
| /*< private >*/ | | /*< 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); | | AdgADim * adg_adim_new (void); | |
| | | | |
| gdouble adg_adim_get_angle1 (AdgADim *adim); | | gdouble adg_adim_get_angle1 (AdgADim *adim); | |
| void adg_adim_set_angle1 (AdgADim *adim, | | void adg_adim_set_angle1 (AdgADim *adim, | |
| gdouble angle); | | gdouble angle); | |
| gdouble adg_adim_get_angle2 (AdgADim *adim); | | gdouble adg_adim_get_angle2 (AdgADim *adim); | |
| void adg_adim_set_angle2 (AdgADim *adim, | | void adg_adim_set_angle2 (AdgADim *adim, | |
| gdouble angle); | | gdouble angle); | |
| | | | |
| G_END_DECLS | | G_END_DECLS | |
| | | | |
| | | | |
End of changes. 2 change blocks. |
| 12 lines changed or deleted | | 12 lines changed or added | |
|
| adg-canvas.h | | adg-canvas.h | |
| | | | |
| skipping to change at line 28 | | skipping to change at line 28 | |
| */ | | */ | |
| | | | |
| #ifndef __ADG_CANVAS_H__ | | #ifndef __ADG_CANVAS_H__ | |
| #define __ADG_CANVAS_H__ | | #define __ADG_CANVAS_H__ | |
| | | | |
| #include <adg/adg-container.h> | | #include <adg/adg-container.h> | |
| #include <adg/adg-style.h> | | #include <adg/adg-style.h> | |
| | | | |
| 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 | | #define ADG_CANVAS(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ADG_ | |
| _TYPE_CANVAS, AdgCanvas)) | | TYPE_CANVAS, AdgCanvas)) | |
| #define ADG_CANVAS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ADG_ | | #define ADG_CANVAS_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), ADG_T | |
| TYPE_CANVAS, AdgCanvasClass)) | | YPE_CANVAS, AdgCanvasClass)) | |
| #define ADG_IS_CANVAS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ADG | | #define ADG_IS_CANVAS(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), ADG_ | |
| _TYPE_CANVAS)) | | TYPE_CANVAS)) | |
| #define ADG_IS_CANVAS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ADG_ | | #define ADG_IS_CANVAS_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), ADG_T | |
| TYPE_CANVAS)) | | YPE_CANVAS)) | |
| #define ADG_CANVAS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ADG_ | | #define ADG_CANVAS_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), ADG_T | |
| TYPE_CANVAS, AdgCanvasClass)) | | YPE_CANVAS, AdgCanvasClass)) | |
| | | | |
| #if 0 | | #if 0 | |
| /* AdgCanvas declared in adg-entity.h */ | | /* AdgCanvas declared in adg-entity.h */ | |
| typedef struct _AdgCanvas AdgCanvas; | | typedef struct _AdgCanvas AdgCanvas; | |
| #endif | | #endif | |
| typedef struct _AdgCanvasClass AdgCanvasClass; | | typedef struct _AdgCanvasClass AdgCanvasClass; | |
| | | | |
| struct _AdgCanvas { | | struct _AdgCanvas { | |
| /*< private >*/ | | /*< private >*/ | |
| AdgContainer parent; | | AdgContainer parent; | |
| | | | |
End of changes. 1 change blocks. |
| 11 lines changed or deleted | | 11 lines changed or added | |
|
| adg-container.h | | adg-container.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_CONTAINER_H__ | | #ifndef __ADG_CONTAINER_H__ | |
| #define __ADG_CONTAINER_H__ | | #define __ADG_CONTAINER_H__ | |
| | | | |
| #include <adg/adg-entity.h> | | #include <adg/adg-entity.h> | |
| | | | |
| 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), | | #define ADG_CONTAINER(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), A | |
| ADG_TYPE_CONTAINER, AdgContainer)) | | DG_TYPE_CONTAINER, AdgContainer)) | |
| #define ADG_CONTAINER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), A | | #define ADG_CONTAINER_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), AD | |
| DG_TYPE_CONTAINER, AdgContainerClass)) | | G_TYPE_CONTAINER, AdgContainerClass)) | |
| #define ADG_IS_CONTAINER(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), | | #define ADG_IS_CONTAINER(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), A | |
| ADG_TYPE_CONTAINER)) | | DG_TYPE_CONTAINER)) | |
| #define ADG_IS_CONTAINER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), A | | #define ADG_IS_CONTAINER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), AD | |
| DG_TYPE_CONTAINER)) | | G_TYPE_CONTAINER)) | |
| #define ADG_CONTAINER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), A | | #define ADG_CONTAINER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), AD | |
| DG_TYPE_CONTAINER, AdgContainerClass)) | | G_TYPE_CONTAINER, AdgContainerClass)) | |
| | | | |
| typedef struct _AdgContainer AdgContainer; | | typedef struct _AdgContainer AdgContainer; | |
| typedef struct _AdgContainerClass AdgContainerClass; | | typedef struct _AdgContainerClass AdgContainerClass; | |
| | | | |
| struct _AdgContainer { | | struct _AdgContainer { | |
| /*< private >*/ | | /*< private >*/ | |
| AdgEntity parent; | | AdgEntity parent; | |
| gpointer data; | | gpointer data; | |
| }; | | }; | |
| | | | |
| | | | |
| skipping to change at line 58 | | skipping to change at line 58 | |
| /* Virtual Table */ | | /* Virtual Table */ | |
| GSList * (*get_children) (AdgContainer *container)
; | | GSList * (*get_children) (AdgContainer *container)
; | |
| void (*add) (AdgContainer *container, | | void (*add) (AdgContainer *container, | |
| AdgEntity *entity); | | AdgEntity *entity); | |
| void (*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); | | AdgContainer * 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
, | |
| AdgEntity *entity); | | AdgEntity *entity); | |
| | | | |
| void adg_container_foreach (AdgContainer *container
, | | void adg_container_foreach (AdgContainer *container
, | |
| GCallback callback, | | GCallback callback, | |
| gpointer user_data
); | | gpointer user_data
); | |
| void adg_container_propagate (AdgContainer *container
, | | void adg_container_propagate (AdgContainer *container
, | |
| | | | |
End of changes. 2 change blocks. |
| 12 lines changed or deleted | | 12 lines changed or added | |
|
| adg-dim-style.h | | adg-dim-style.h | |
| | | | |
| skipping to change at line 24 | | skipping to change at line 24 | |
| * 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_DIM_STYLE_H__ | | #ifndef __ADG_DIM_STYLE_H__ | |
| #define __ADG_DIM_STYLE_H__ | | #define __ADG_DIM_STYLE_H__ | |
| | | | |
| #include <adg/adg-style.h> | | #include <adg/adg-style.h> | |
|
| #include <adg/adg-font-style.h> | | #include <adg/adg-dress.h> | |
| #include <adg/adg-line-style.h> | | #include <adg/adg-marker.h> | |
| #include <adg/adg-arrow-style.h> | | | |
| #include <adg/adg-pair.h> | | #include <adg/adg-pair.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_DIM_STYLE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), A
DG_TYPE_DIM_STYLE, AdgDimStyle)) | | #define ADG_DIM_STYLE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), A
DG_TYPE_DIM_STYLE, AdgDimStyle)) | |
| #define ADG_DIM_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), AD
G_TYPE_DIM_STYLE, AdgDimStyleClass)) | | #define ADG_DIM_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), AD
G_TYPE_DIM_STYLE, AdgDimStyleClass)) | |
| #define ADG_IS_DIM_STYLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), A
DG_TYPE_DIM_STYLE)) | | #define ADG_IS_DIM_STYLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), A
DG_TYPE_DIM_STYLE)) | |
| #define ADG_IS_DIM_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), AD
G_TYPE_DIM_STYLE)) | | #define ADG_IS_DIM_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), AD
G_TYPE_DIM_STYLE)) | |
| #define ADG_DIM_STYLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), AD
G_TYPE_DIM_STYLE, AdgDimStyleClass)) | | #define ADG_DIM_STYLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), AD
G_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; | |
| | | | |
| struct _AdgDimStyle { | | struct _AdgDimStyle { | |
| /*< private >*/ | | /*< private >*/ | |
| AdgStyle parent; | | AdgStyle parent; | |
| gpointer data; | | gpointer data; | |
| }; | | }; | |
| | | | |
| struct _AdgDimStyleClass { | | struct _AdgDimStyleClass { | |
| /*< private >*/ | | /*< 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; | | | |
| AdgStyle * adg_dim_style_new (void); | | AdgStyle * adg_dim_style_new (void); | |
| | | | |
|
| AdgStyle * adg_dim_style_get_value_style (AdgDimStyle *dim_style) | | AdgMarker * adg_dim_style_marker1_new (AdgDimStyle *dim_style) | |
| ; | | ; | |
| void adg_dim_style_set_value_style (AdgDimStyle *dim_style, | | AdgMarker * adg_dim_style_marker2_new (AdgDimStyle *dim_style) | |
| AdgFontStyle *style); | | ; | |
| AdgStyle * adg_dim_style_get_tolerance_style | | void adg_dim_style_use_marker1 (AdgDimStyle *dim_style, | |
| (AdgDimStyle *dim_style) | | AdgMarker *marker); | |
| ; | | void adg_dim_style_use_marker2 (AdgDimStyle *dim_style, | |
| void adg_dim_style_set_tolerance_style | | AdgMarker *marker); | |
| (AdgDimStyle *dim_style, | | AdgDress adg_dim_style_get_color_dress (AdgDimStyle *dim_style) | |
| AdgFontStyle *style); | | ; | |
| AdgStyle * adg_dim_style_get_note_style (AdgDimStyle *dim_style) | | void adg_dim_style_set_color_dress (AdgDimStyle *dim_style, | |
| ; | | AdgDress dress); | |
| void adg_dim_style_set_note_style (AdgDimStyle *dim_style, | | AdgDress adg_dim_style_get_value_dress (AdgDimStyle *dim_style) | |
| AdgFontStyle *style); | | ; | |
| AdgStyle * adg_dim_style_get_line_style (AdgDimStyle *dim_style) | | void adg_dim_style_set_value_dress (AdgDimStyle *dim_style, | |
| ; | | AdgDress dress); | |
| void adg_dim_style_set_line_style (AdgDimStyle *dim_style, | | AdgDress adg_dim_style_get_up_dress (AdgDimStyle *dim_style) | |
| AdgLineStyle *style); | | ; | |
| AdgStyle * adg_dim_style_get_arrow_style (AdgDimStyle *dim_style) | | void adg_dim_style_set_up_dress (AdgDimStyle *dim_style, | |
| ; | | AdgDress dress); | |
| void adg_dim_style_set_arrow_style (AdgDimStyle *dim_style, | | AdgDress adg_dim_style_get_down_dress (AdgDimStyle *dim_style) | |
| AdgArrowStyle *style); | | ; | |
| | | void adg_dim_style_set_down_dress (AdgDimStyle *dim_style, | |
| | | AdgDress dress); | |
| | | AdgDress adg_dim_style_get_note_dress (AdgDimStyle *dim_style) | |
| | | ; | |
| | | void adg_dim_style_set_note_dress (AdgDimStyle *dim_style, | |
| | | AdgDress dress); | |
| | | AdgDress adg_dim_style_get_line_dress (AdgDimStyle *dim_style) | |
| | | ; | |
| | | void adg_dim_style_set_line_dress (AdgDimStyle *dim_style, | |
| | | AdgDress dress); | |
| 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_beyond (AdgDimStyle *dim_style)
; | |
| gdouble adg_dim_style_get_beyond (AdgDimStyle *dim_style)
; | | gdouble adg_dim_style_get_beyond (AdgDimStyle *dim_style)
; | |
| void adg_dim_style_set_beyond (AdgDimStyle *dim_style, | | void adg_dim_style_set_beyond (AdgDimStyle *dim_style, | |
| gdouble length); | | gdouble length); | |
| | | | |
End of changes. 5 change blocks. |
| 28 lines changed or deleted | | 34 lines changed or added | |
|
| adg-dim.h | | adg-dim.h | |
| | | | |
| skipping to change at line 25 | | skipping to change at line 25 | |
| * 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_DIM_H__ | | #ifndef __ADG_DIM_H__ | |
| #define __ADG_DIM_H__ | | #define __ADG_DIM_H__ | |
| | | | |
| #include <adg/adg-entity.h> | | #include <adg/adg-entity.h> | |
| #include <adg/adg-pair.h> | | #include <adg/adg-pair.h> | |
|
| | | #include <adg/adg-enums.h> | |
| | | | |
| G_BEGIN_DECLS | | G_BEGIN_DECLS | |
| | | | |
|
| #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 | | #define ADG_DIM(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ADG_TYP | |
| PE_DIM, AdgDim)) | | E_DIM, AdgDim)) | |
| #define ADG_DIM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ADG_TYP | | #define ADG_DIM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), ADG_TYPE | |
| E_DIM, AdgDimClass)) | | _DIM, AdgDimClass)) | |
| #define ADG_IS_DIM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ADG_TY | | #define ADG_IS_DIM(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), ADG_TYP | |
| PE_DIM)) | | E_DIM)) | |
| #define ADG_IS_DIM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ADG_TYP | | #define ADG_IS_DIM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), ADG_TYPE | |
| E_DIM)) | | _DIM)) | |
| #define ADG_DIM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ADG_TYP | | #define ADG_DIM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), ADG_TYPE | |
| E_DIM, AdgDimClass)) | | _DIM, AdgDimClass)) | |
| | | | |
| typedef struct _AdgDim AdgDim; | | typedef struct _AdgDim AdgDim; | |
| typedef struct _AdgDimClass AdgDimClass; | | typedef struct _AdgDimClass AdgDimClass; | |
| | | | |
| struct _AdgDim { | | struct _AdgDim { | |
| /*< private >*/ | | /*< private >*/ | |
| AdgEntity parent; | | AdgEntity parent; | |
| gpointer data; | | gpointer data; | |
| }; | | }; | |
| | | | |
| | | | |
| skipping to change at line 55 | | skipping to change at line 56 | |
| /*< private >*/ | | /*< private >*/ | |
| AdgEntityClass parent_class; | | AdgEntityClass parent_class; | |
| /*< public >*/ | | /*< public >*/ | |
| /* Virtual Table */ | | /* Virtual Table */ | |
| gchar * (*default_value) (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; | |
|
| | | AdgDress adg_dim_get_dress (AdgDim *dim); | |
| | | void adg_dim_set_dress (AdgDim *dim, | |
| | | AdgDress dress); | |
| 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, | |
| gdouble org_y); | | gdouble org_y); | |
| gdouble adg_dim_get_angle (AdgDim *dim); | | gdouble adg_dim_get_angle (AdgDim *dim); | |
| void adg_dim_set_angle (AdgDim *dim, | | void adg_dim_set_angle (AdgDim *dim, | |
| gdouble angle); | | gdouble angle); | |
| const AdgPair * adg_dim_get_ref1 (AdgDim *dim); | | const AdgPair * adg_dim_get_ref1 (AdgDim *dim); | |
| | | | |
End of changes. 3 change blocks. |
| 11 lines changed or deleted | | 15 lines changed or added | |
|
| adg-entity.h | | adg-entity.h | |
| | | | |
| skipping to change at line 24 | | skipping to change at line 24 | |
| * 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-util.h> | |
|
| #include <adg/adg-context.h> | | | |
| #include <adg/adg-matrix.h> | | #include <adg/adg-matrix.h> | |
|
| #include <adg/adg-enums.h> | | #include <adg/adg-dress.h> | |
| | | | |
| G_BEGIN_DECLS | | G_BEGIN_DECLS | |
| | | | |
|
| #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 | | #define ADG_ENTITY(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ADG_ | |
| _TYPE_ENTITY, AdgEntity)) | | TYPE_ENTITY, AdgEntity)) | |
| #define ADG_ENTITY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ADG_ | | #define ADG_ENTITY_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), ADG_T | |
| TYPE_ENTITY, AdgEntityClass)) | | YPE_ENTITY, AdgEntityClass)) | |
| #define ADG_IS_ENTITY(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ADG | | #define ADG_IS_ENTITY(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), ADG_ | |
| _TYPE_ENTITY)) | | TYPE_ENTITY)) | |
| #define ADG_IS_ENTITY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ADG_ | | #define ADG_IS_ENTITY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), ADG_T | |
| TYPE_ENTITY)) | | YPE_ENTITY)) | |
| #define ADG_ENTITY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ADG_ | | #define ADG_ENTITY_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), ADG_T | |
| TYPE_ENTITY, AdgEntityClass)) | | YPE_ENTITY, AdgEntityClass)) | |
| | | | |
| typedef struct _AdgEntity AdgEntity; | | typedef struct _AdgEntity AdgEntity; | |
| typedef struct _AdgEntityClass AdgEntityClass; | | typedef struct _AdgEntityClass AdgEntityClass; | |
| | | | |
| ADG_FORWARD_DECL(AdgCanvas); | | ADG_FORWARD_DECL(AdgCanvas); | |
| | | | |
| struct _AdgEntity { | | struct _AdgEntity { | |
| /*< private >*/ | | /*< private >*/ | |
| GInitiallyUnowned parent; | | GInitiallyUnowned parent; | |
| gpointer data; | | gpointer data; | |
| | | | |
| skipping to change at line 51 | | skipping to change at line 50 | |
| | | | |
| struct _AdgEntity { | | struct _AdgEntity { | |
| /*< private >*/ | | /*< private >*/ | |
| GInitiallyUnowned parent; | | GInitiallyUnowned parent; | |
| gpointer data; | | gpointer data; | |
| }; | | }; | |
| | | | |
| struct _AdgEntityClass { | | struct _AdgEntityClass { | |
| /*< private >*/ | | /*< private >*/ | |
| GInitiallyUnownedClass parent_class; | | GInitiallyUnownedClass parent_class; | |
|
| | | | |
| /*< public >*/ | | /*< public >*/ | |
| /* Signals */ | | /* Signals */ | |
| void (*parent_set) (AdgEntity *entity, | | void (*parent_set) (AdgEntity *entity, | |
| AdgEntity *old_parent
); | | AdgEntity *old_parent
); | |
|
| void (*context_set) (AdgEntity *entity, | | | |
| AdgContext *old_contex | | | |
| t); | | | |
| | | | |
| /* Virtual Table */ | | /* Virtual Table */ | |
|
| | | void (*get_global_matrix) (AdgEntity *entity, | |
| | | AdgMatrix *matrix); | |
| | | void (*get_local_matrix) (AdgEntity *entity, | |
| | | AdgMatrix *matrix); | |
| gboolean (*invalidate) (AdgEntity *entity); | | gboolean (*invalidate) (AdgEntity *entity); | |
| gboolean (*render) (AdgEntity *entity, | | gboolean (*render) (AdgEntity *entity, | |
| cairo_t *cr); | | cairo_t *cr); | |
| }; | | }; | |
| | | | |
| 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); | |
| | | | |
| AdgEntity * 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, | |
| AdgEntity *parent); | | AdgEntity *parent); | |
|
| AdgContext * adg_entity_context (AdgEntity *entity); | | | |
| AdgContext * adg_entity_get_context (AdgEntity *entity); | | | |
| void adg_entity_set_context (AdgEntity *entity, | | | |
| AdgContext *context); | | | |
| gboolean adg_entity_get_rendered (AdgEntity *entity); | | gboolean adg_entity_get_rendered (AdgEntity *entity); | |
| void adg_entity_set_rendered (AdgEntity *entity, | | void adg_entity_set_rendered (AdgEntity *entity, | |
| gboolean rendered)
; | | gboolean rendered)
; | |
| void adg_entity_get_global_map (AdgEntity *entity, | | void adg_entity_get_global_map (AdgEntity *entity, | |
| AdgMatrix *map); | | AdgMatrix *map); | |
| void adg_entity_set_global_map (AdgEntity *entity, | | void adg_entity_set_global_map (AdgEntity *entity, | |
| const AdgMatrix *map); | | const AdgMatrix *map); | |
| void adg_entity_transform_global_map (AdgEntity *entity, | | void adg_entity_transform_global_map (AdgEntity *entity, | |
| const AdgMatrix *transform
ation); | | const AdgMatrix *transform
ation); | |
| void adg_entity_get_global_matrix (AdgEntity *entity, | | void adg_entity_get_global_matrix (AdgEntity *entity, | |
| AdgMatrix *matrix); | | AdgMatrix *matrix); | |
| void adg_entity_get_local_map (AdgEntity *entity, | | void adg_entity_get_local_map (AdgEntity *entity, | |
| AdgMatrix *map); | | AdgMatrix *map); | |
| void adg_entity_set_local_map (AdgEntity *entity, | | void adg_entity_set_local_map (AdgEntity *entity, | |
| const AdgMatrix *map); | | const AdgMatrix *map); | |
| void adg_entity_transform_local_map (AdgEntity *entity, | | void adg_entity_transform_local_map (AdgEntity *entity, | |
| const AdgMatrix *transform
ation); | | const AdgMatrix *transform
ation); | |
| void adg_entity_get_local_matrix (AdgEntity *entity, | | void adg_entity_get_local_matrix (AdgEntity *entity, | |
| AdgMatrix *matrix); | | AdgMatrix *matrix); | |
|
| AdgStyle * adg_entity_get_style (AdgEntity *entity, | | void adg_entity_apply_local_matrix (AdgEntity *entity, | |
| AdgStyleSlot style_slo | | | |
| t); | | | |
| void adg_entity_apply (AdgEntity *entity, | | | |
| AdgStyleSlot style_slo | | | |
| t, | | | |
| cairo_t *cr); | | cairo_t *cr); | |
|
| void adg_entity_apply_font (AdgEntity *entity, | | AdgStyle * adg_entity_style (AdgEntity *entity, | |
| AdgFontStyleId font_id, | | AdgDress dress); | |
| | | AdgStyle * adg_entity_get_style (AdgEntity *entity, | |
| | | AdgDress dress); | |
| | | void adg_entity_set_style (AdgEntity *entity, | |
| | | AdgDress dress, | |
| | | AdgStyle *style); | |
| | | void adg_entity_apply_dress (AdgEntity *entity, | |
| | | AdgDress dress, | |
| cairo_t *cr); | | cairo_t *cr); | |
| void adg_entity_invalidate (AdgEntity *entity); | | void adg_entity_invalidate (AdgEntity *entity); | |
| void adg_entity_render (AdgEntity *entity, | | void adg_entity_render (AdgEntity *entity, | |
| cairo_t *cr); | | cairo_t *cr); | |
| | | | |
| G_END_DECLS | | G_END_DECLS | |
| | | | |
| #endif /* __ADG_ENTITY_H__ */ | | #endif /* __ADG_ENTITY_H__ */ | |
| | | | |
End of changes. 9 change blocks. |
| 30 lines changed or deleted | | 26 lines changed or added | |
|
| adg-font-style.h | | adg-font-style.h | |
| | | | |
| skipping to change at line 24 | | skipping to change at line 24 | |
| * 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_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> | | | |
| | | | |
| 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_FONT_STYLE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),
ADG_TYPE_FONT_STYLE, AdgFontStyle)) | | #define ADG_FONT_STYLE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),
ADG_TYPE_FONT_STYLE, AdgFontStyle)) | |
| #define ADG_FONT_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), A
DG_TYPE_FONT_STYLE, AdgFontStyleClass)) | | #define ADG_FONT_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), A
DG_TYPE_FONT_STYLE, AdgFontStyleClass)) | |
| #define ADG_IS_FONT_STYLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),
ADG_TYPE_FONT_STYLE)) | | #define ADG_IS_FONT_STYLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),
ADG_TYPE_FONT_STYLE)) | |
| #define ADG_IS_FONT_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), A
DG_TYPE_FONT_STYLE)) | | #define ADG_IS_FONT_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), A
DG_TYPE_FONT_STYLE)) | |
| #define ADG_FONT_STYLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), A
DG_TYPE_FONT_STYLE, AdgFontStyleClass)) | | #define ADG_FONT_STYLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), A
DG_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; | |
| | | | |
| struct _AdgFontStyle { | | struct _AdgFontStyle { | |
| /*< private >*/ | | /*< private >*/ | |
| AdgStyle parent; | | AdgStyle parent; | |
| gpointer data; | | gpointer data; | |
| }; | | }; | |
| | | | |
| struct _AdgFontStyleClass { | | struct _AdgFontStyleClass { | |
| /*< private >*/ | | /*< 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; | | | |
| 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. 3 change blocks. |
| 3 lines changed or deleted | | 0 lines changed or added | |
|
| adg-ldim.h | | adg-ldim.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_LDIM_H__ | | #ifndef __ADG_LDIM_H__ | |
| #define __ADG_LDIM_H__ | | #define __ADG_LDIM_H__ | |
| | | | |
| #include <adg/adg-dim.h> | | #include <adg/adg-dim.h> | |
| | | | |
| G_BEGIN_DECLS | | G_BEGIN_DECLS | |
| | | | |
|
| #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 | | #define ADG_LDIM(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ADG_TY | |
| YPE_LDIM, AdgLDim)) | | PE_LDIM, AdgLDim)) | |
| #define ADG_LDIM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ADG_TY | | #define ADG_LDIM_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), ADG_TYP | |
| PE_LDIM, AdgLDimClass)) | | E_LDIM, AdgLDimClass)) | |
| #define ADG_IS_LDIM(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ADG_T | | #define ADG_IS_LDIM(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), ADG_TY | |
| YPE_LDIM)) | | PE_LDIM)) | |
| #define ADG_IS_LDIM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ADG_TY | | #define ADG_IS_LDIM_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), ADG_TYP | |
| PE_LDIM)) | | E_LDIM)) | |
| #define ADG_LDIM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ADG_TY | | #define ADG_LDIM_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), ADG_TYP | |
| PE_LDIM, AdgLDimClass)) | | E_LDIM, AdgLDimClass)) | |
| | | | |
| typedef struct _AdgLDim AdgLDim; | | typedef struct _AdgLDim AdgLDim; | |
| typedef struct _AdgLDimClass AdgLDimClass; | | typedef struct _AdgLDimClass AdgLDimClass; | |
| | | | |
| struct _AdgLDim { | | struct _AdgLDim { | |
| /*< private >*/ | | /*< private >*/ | |
| AdgDim parent; | | AdgDim parent; | |
| gpointer data; | | gpointer data; | |
| }; | | }; | |
| | | | |
| struct _AdgLDimClass { | | struct _AdgLDimClass { | |
| /*< private >*/ | | /*< 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); | | AdgLDim * adg_ldim_new (void); | |
| AdgEntity * adg_ldim_new_full (const AdgPair *ref1, | | AdgLDim * adg_ldim_new_full (const AdgPair *ref1, | |
| const AdgPair *ref2, | | const AdgPair *ref2, | |
| gdouble direction, | | gdouble direction, | |
| const AdgPair *pos); | | const AdgPair *pos); | |
|
| AdgEntity * adg_ldim_new_full_explicit (gdouble ref1_x, | | AdgLDim * adg_ldim_new_full_explicit (gdouble ref1_x, | |
| gdouble ref1_y, | | gdouble ref1_y, | |
| gdouble ref2_x, | | gdouble ref2_x, | |
| gdouble ref2_y, | | gdouble ref2_y, | |
| gdouble direction, | | gdouble direction, | |
| gdouble pos_x, | | gdouble pos_x, | |
| gdouble pos_y); | | gdouble pos_y); | |
| | | | |
| void adg_ldim_set_pos (AdgLDim *ldim, | | void adg_ldim_set_pos (AdgLDim *ldim, | |
| const AdgPair *pos); | | const AdgPair *pos); | |
| void adg_ldim_set_pos_explicit (AdgLDim *ldim, | | void adg_ldim_set_pos_explicit (AdgLDim *ldim, | |
| gdouble pos_x, | | gdouble pos_x, | |
| gdouble pos_y); | | gdouble pos_y); | |
| gdouble adg_ldim_get_direction (AdgLDim *ldim); | | gdouble adg_ldim_get_direction (AdgLDim *ldim); | |
| void adg_ldim_set_direction (AdgLDim *ldim, | | void adg_ldim_set_direction (AdgLDim *ldim, | |
| gdouble direction)
; | | gdouble direction)
; | |
|
| | | gboolean adg_ldim_has_extension1 (AdgLDim *ldim); | |
| | | void adg_ldim_switch_extension1 (AdgLDim *ldim, | |
| | | gboolean state); | |
| | | gboolean adg_ldim_has_extension2 (AdgLDim *ldim); | |
| | | void adg_ldim_switch_extension2 (AdgLDim *ldim, | |
| | | gboolean state); | |
| | | | |
| G_END_DECLS | | G_END_DECLS | |
| | | | |
| #endif /* __ADG_LDIM_H__ */ | | #endif /* __ADG_LDIM_H__ */ | |
| | | | |
End of changes. 4 change blocks. |
| 14 lines changed or deleted | | 20 lines changed or added | |
|
| adg-line-style.h | | adg-line-style.h | |
| | | | |
| skipping to change at line 24 | | skipping to change at line 24 | |
| * 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_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-dress.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_LINE_STYLE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),
ADG_TYPE_LINE_STYLE, AdgLineStyle)) | | #define ADG_LINE_STYLE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),
ADG_TYPE_LINE_STYLE, AdgLineStyle)) | |
| #define ADG_LINE_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), A
DG_TYPE_LINE_STYLE, AdgLineStyleClass)) | | #define ADG_LINE_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), A
DG_TYPE_LINE_STYLE, AdgLineStyleClass)) | |
| #define ADG_IS_LINE_STYLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),
ADG_TYPE_LINE_STYLE)) | | #define ADG_IS_LINE_STYLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),
ADG_TYPE_LINE_STYLE)) | |
| #define ADG_IS_LINE_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), A
DG_TYPE_LINE_STYLE)) | | #define ADG_IS_LINE_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), A
DG_TYPE_LINE_STYLE)) | |
| #define ADG_LINE_STYLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), A
DG_TYPE_LINE_STYLE, AdgLineStyleClass)) | | #define ADG_LINE_STYLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), A
DG_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; | |
| | | | |
| struct _AdgLineStyle { | | struct _AdgLineStyle { | |
| /*< private >*/ | | /*< private >*/ | |
| AdgStyle parent; | | AdgStyle parent; | |
| gpointer data; | | gpointer data; | |
| }; | | }; | |
| | | | |
| struct _AdgLineStyleClass { | | struct _AdgLineStyleClass { | |
| /*< private >*/ | | /*< 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; | | AdgLineStyle * 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 | |
| adg_line_style_get_join (AdgLineStyle *line_style
); | | adg_line_style_get_join (AdgLineStyle *line_style
); | |
| | | | |
End of changes. 3 change blocks. |
| 4 lines changed or deleted | | 2 lines changed or added | |
|
| adg-model.h | | adg-model.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_MODEL_H__ | | #ifndef __ADG_MODEL_H__ | |
| #define __ADG_MODEL_H__ | | #define __ADG_MODEL_H__ | |
| | | | |
|
| #include <glib-object.h> | | #include <adg/adg-entity.h> | |
| | | | |
| G_BEGIN_DECLS | | G_BEGIN_DECLS | |
| | | | |
| #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)) | |
| | | | |
| | | | |
| skipping to change at line 47 | | skipping to change at line 47 | |
| struct _AdgModel { | | struct _AdgModel { | |
| /*< private >*/ | | /*< private >*/ | |
| GObject parent; | | GObject parent; | |
| gpointer data; | | gpointer data; | |
| }; | | }; | |
| | | | |
| struct _AdgModelClass { | | struct _AdgModelClass { | |
| /*< private >*/ | | /*< private >*/ | |
| GObjectClass parent_class; | | GObjectClass parent_class; | |
| /*< public >*/ | | /*< public >*/ | |
|
| /* Virtual Table */ | | GSList * (*get_dependencies) (AdgModel *model); | |
| | | void (*add_dependency) (AdgModel *model, | |
| | | AdgEntity *entity); | |
| | | void (*remove_dependency) (AdgModel *model, | |
| | | AdgEntity *entity); | |
| 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_add_dependency (AdgModel *model, | |
| | | AdgEntity *entity); | |
| | | void adg_model_remove_dependency (AdgModel *model, | |
| | | AdgEntity *entity); | |
| | | GSList * adg_model_get_dependencies (AdgModel *model); | |
| | | void adg_model_foreach_dependency (AdgModel *model, | |
| | | GCallback callback, | |
| | | gpointer user_data) | |
| | | ; | |
| | | | |
| | | void adg_model_changed (AdgModel *model); | |
| | | | |
| G_END_DECLS | | G_END_DECLS | |
| | | | |
| #endif /* __ADG_MODEL_H__ */ | | #endif /* __ADG_MODEL_H__ */ | |
| | | | |
End of changes. 3 change blocks. |
| 4 lines changed or deleted | | 19 lines changed or added | |
|
| adg-path.h | | adg-path.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_PATH_H__ | | #ifndef __ADG_PATH_H__ | |
| #define __ADG_PATH_H__ | | #define __ADG_PATH_H__ | |
| | | | |
|
| #include <adg/adg-model.h> | | #include <adg/adg-trail.h> | |
| #include <adg/adg-primitive.h> | | #include <adg/adg-primitive.h> | |
| #include <adg/adg-segment.h> | | #include <adg/adg-segment.h> | |
| #include <cpml/cpml.h> | | #include <cpml/cpml.h> | |
| | | | |
| G_BEGIN_DECLS | | G_BEGIN_DECLS | |
| | | | |
|
| #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 | | #define ADG_PATH(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ADG_TY | |
| YPE_PATH, AdgPath)) | | PE_PATH, AdgPath)) | |
| #define ADG_PATH_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ADG_TY | | #define ADG_PATH_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), ADG_TYP | |
| PE_PATH, AdgPathClass)) | | E_PATH, AdgPathClass)) | |
| #define ADG_IS_PATH(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ADG_T | | #define ADG_IS_PATH(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), ADG_TY | |
| YPE_PATH)) | | PE_PATH)) | |
| #define ADG_IS_PATH_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ADG_TY | | #define ADG_IS_PATH_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), ADG_TYP | |
| PE_PATH)) | | E_PATH)) | |
| #define ADG_PATH_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ADG_TY | | #define ADG_PATH_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), ADG_TYP | |
| PE_PATH, AdgPathClass)) | | E_PATH, AdgPathClass)) | |
| | | | |
| typedef struct _AdgPath AdgPath; | | typedef struct _AdgPath AdgPath; | |
| typedef struct _AdgPathClass AdgPathClass; | | typedef struct _AdgPathClass AdgPathClass; | |
| | | | |
| struct _AdgPath { | | struct _AdgPath { | |
| /*< private >*/ | | /*< private >*/ | |
|
| AdgModel parent; | | AdgTrail parent; | |
| gpointer data; | | gpointer data; | |
| }; | | }; | |
| | | | |
| struct _AdgPathClass { | | struct _AdgPathClass { | |
| /*< private >*/ | | /*< private >*/ | |
|
| AdgModelClass parent_class; | | AdgTrailClass 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); | | AdgPath * adg_path_new (void); | |
| | | | |
|
| const cairo_path_t * | | | |
| adg_path_get_cairo_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, | |
| gdouble *x, | | gdouble *x, | |
| gdouble *y); | | gdouble *y); | |
| gboolean adg_path_has_current_point (AdgPath *path); | | gboolean adg_path_has_current_point (AdgPath *path); | |
| void adg_path_clear (AdgPath *path); | | void adg_path_clear (AdgPath *path); | |
| | | | |
| void adg_path_append (AdgPath *path, | | void adg_path_append (AdgPath *path, | |
| cairo_path_data_type_t | | cairo_path_data_type_t | |
| type, | | type, | |
| ...); | | ...); | |
| void adg_path_append_valist (AdgPath *path, | | void adg_path_append_valist (AdgPath *path, | |
| cairo_path_data_type_t | | cairo_path_data_type_t | |
| type, | | type, | |
|
| va_list var_args); | | va_list var_args); | |
| void adg_path_append_primitive (AdgPath *path, | | void adg_path_append_primitive (AdgPath *path, | |
| const AdgPrimitive | | const AdgPrimitive | |
| *primitive)
; | | *primitive)
; | |
| void adg_path_append_segment (AdgPath *path, | | void adg_path_append_segment (AdgPath *path, | |
| const AdgSegment | | const AdgSegment | |
| *segment); | | *segment); | |
| void adg_path_append_cairo_path (AdgPath *path, | | void adg_path_append_cairo_path (AdgPath *path, | |
| const cairo_path_t | | const cairo_path_t | |
| *cairo_path
); | | *cairo_path
); | |
| void adg_path_move_to (AdgPath *path, | | void adg_path_move_to (AdgPath *path, | |
| | | | |
| skipping to change at line 112 | | skipping to change at line 109 | |
| gdouble yc, | | gdouble yc, | |
| gdouble r, | | gdouble r, | |
| gdouble start, | | gdouble start, | |
| gdouble end); | | gdouble end); | |
| void adg_path_chamfer (AdgPath *path, | | void adg_path_chamfer (AdgPath *path, | |
| gdouble delta1, | | gdouble delta1, | |
| gdouble delta2); | | gdouble delta2); | |
| void adg_path_fillet (AdgPath *path, | | void adg_path_fillet (AdgPath *path, | |
| gdouble radius); | | gdouble radius); | |
| | | | |
|
| void adg_path_dump (AdgPath *path); | | | |
| | | | |
| G_END_DECLS | | G_END_DECLS | |
| | | | |
| #endif /* __ADG_PATH_H__ */ | | #endif /* __ADG_PATH_H__ */ | |
| | | | |
End of changes. 8 change blocks. |
| 21 lines changed or deleted | | 16 lines changed or added | |
|
| adg-stroke.h | | adg-stroke.h | |
| | | | |
| skipping to change at line 24 | | skipping to change at line 24 | |
| * 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_STROKE_H__ | | #ifndef __ADG_STROKE_H__ | |
| #define __ADG_STROKE_H__ | | #define __ADG_STROKE_H__ | |
| | | | |
| #include <adg/adg-entity.h> | | #include <adg/adg-entity.h> | |
|
| #include <adg/adg-path.h> | | #include <adg/adg-trail.h> | |
| | | | |
| G_BEGIN_DECLS | | G_BEGIN_DECLS | |
| | | | |
|
| #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 | | #define ADG_STROKE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ADG_ | |
| _TYPE_STROKE, AdgStroke)) | | TYPE_STROKE, AdgStroke)) | |
| #define ADG_STROKE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ADG_ | | #define ADG_STROKE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), ADG_T | |
| TYPE_STROKE, AdgStrokeClass)) | | YPE_STROKE, AdgStrokeClass)) | |
| #define ADG_IS_STROKE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ADG | | #define ADG_IS_STROKE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), ADG_ | |
| _TYPE_STROKE)) | | TYPE_STROKE)) | |
| #define ADG_IS_STROKE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ADG_ | | #define ADG_IS_STROKE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), ADG_T | |
| TYPE_STROKE)) | | YPE_STROKE)) | |
| #define ADG_STROKE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ADG_ | | #define ADG_STROKE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), ADG_T | |
| TYPE_STROKE, AdgStrokeClass)) | | YPE_STROKE, AdgStrokeClass)) | |
| | | | |
| typedef struct _AdgStroke AdgStroke; | | typedef struct _AdgStroke AdgStroke; | |
| typedef struct _AdgStrokeClass AdgStrokeClass; | | typedef struct _AdgStrokeClass AdgStrokeClass; | |
| | | | |
| struct _AdgStroke { | | struct _AdgStroke { | |
| /*< private >*/ | | /*< private >*/ | |
|
| AdgEntity entity; | | AdgEntity parent; | |
| gpointer data; | | gpointer data; | |
| }; | | }; | |
| | | | |
| struct _AdgStrokeClass { | | struct _AdgStrokeClass { | |
| /*< private >*/ | | /*< 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); | | AdgStroke * adg_stroke_new (AdgTrail *trail); | |
| | | | |
|
| AdgPath * adg_stroke_get_path (AdgStroke *stroke); | | AdgDress adg_stroke_get_dress (AdgStroke *stroke); | |
| void adg_stroke_set_path (AdgStroke *stroke, | | void adg_stroke_set_dress (AdgStroke *stroke, | |
| AdgPath *path); | | AdgDress dress); | |
| | | AdgTrail * adg_stroke_get_trail (AdgStroke *stroke); | |
| | | void adg_stroke_set_trail (AdgStroke *stroke, | |
| | | AdgTrail *trail); | |
| | | | |
| G_END_DECLS | | G_END_DECLS | |
| | | | |
| #endif /* __ADG_STROKE_H__ */ | | #endif /* __ADG_STROKE_H__ */ | |
| | | | |
End of changes. 6 change blocks. |
| 19 lines changed or deleted | | 22 lines changed or added | |
|
| adg-style.h | | adg-style.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_STYLE_H__ | | #ifndef __ADG_STYLE_H__ | |
| #define __ADG_STYLE_H__ | | #define __ADG_STYLE_H__ | |
| | | | |
|
| #include <adg/adg-pattern.h> | | #include <glib-object.h> | |
| | | #include <cairo.h> | |
| | | | |
| G_BEGIN_DECLS | | G_BEGIN_DECLS | |
| | | | |
|
| #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_ | | #define ADG_STYLE(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), ADG_T | |
| TYPE_STYLE, AdgStyle)) | | YPE_STYLE, AdgStyle)) | |
| #define ADG_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), ADG_T | | #define ADG_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), ADG_TY | |
| YPE_STYLE, AdgStyleClass)) | | PE_STYLE, AdgStyleClass)) | |
| #define ADG_IS_STYLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), ADG_ | | #define ADG_IS_STYLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), ADG_T | |
| TYPE_STYLE)) | | YPE_STYLE)) | |
| #define ADG_IS_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), ADG_T | | #define ADG_IS_STYLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), ADG_TY | |
| YPE_STYLE)) | | PE_STYLE)) | |
| #define ADG_STYLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), ADG_T | | #define ADG_STYLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), ADG_TY | |
| YPE_STYLE, AdgStyleClass)) | | PE_STYLE, AdgStyleClass)) | |
| | | | |
| typedef struct _AdgStyle AdgStyle; | | typedef struct _AdgStyle AdgStyle; | |
| typedef struct _AdgStyleClass AdgStyleClass; | | typedef struct _AdgStyleClass AdgStyleClass; | |
|
| typedef gint AdgStyleId; | | | |
| typedef gint AdgStyleSlot; | | | |
| | | | |
| struct _AdgStyle { | | struct _AdgStyle { | |
| /*< private >*/ | | /*< private >*/ | |
| GObject parent; | | GObject parent; | |
|
| gpointer data; | | | |
| }; | | }; | |
| | | | |
| struct _AdgStyleClass { | | struct _AdgStyleClass { | |
| /*< private >*/ | | /*< private >*/ | |
| GObjectClass parent_class; | | GObjectClass parent_class; | |
| /*< public >*/ | | /*< public >*/ | |
|
| /* Virtual table */ | | | |
| 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); | | | |
| AdgStyle * adg_style_from_id (GType type, | | | |
| AdgStyleId id); | | | |
| AdgStyle * adg_style_get_default (AdgStyleClass *klass); | | | |
| | | | |
| void adg_style_apply (AdgStyle *style, | | void adg_style_apply (AdgStyle *style, | |
| cairo_t *cr); | | cairo_t *cr); | |
|
| const AdgPattern * adg_style_get_pattern (AdgStyle *style); | | | |
| void adg_style_set_pattern (AdgStyle *style, | | | |
| AdgPattern *pattern); | | | |
| | | | |
| G_END_DECLS | | G_END_DECLS | |
| | | | |
| #endif /* __ADG_STYLE_H__ */ | | #endif /* __ADG_STYLE_H__ */ | |
| | | | |
End of changes. 7 change blocks. |
| 24 lines changed or deleted | | 13 lines changed or added | |
|
| adg-title-block.h | | adg-title-block.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_TITLE_BLOCK_H__ | | #ifndef __ADG_TITLE_BLOCK_H__ | |
| #define __ADG_TITLE_BLOCK_H__ | | #define __ADG_TITLE_BLOCK_H__ | |
| | | | |
| #include <adg/adg-entity.h> | | #include <adg/adg-entity.h> | |
| | | | |
| G_BEGIN_DECLS | | G_BEGIN_DECLS | |
| | | | |
|
| #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) | | #define ADG_TITLE_BLOCK(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), | |
| , ADG_TYPE_TITLE_BLOCK, AdgTitleBlock)) | | ADG_TYPE_TITLE_BLOCK, AdgTitleBlock)) | |
| #define ADG_TITLE_BLOCK_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), | | #define ADG_TITLE_BLOCK_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), | |
| ADG_TYPE_TITLE_BLOCK, AdgTitleBlock)) | | ADG_TYPE_TITLE_BLOCK, AdgTitleBlockClass)) | |
| #define ADG_IS_TITLE_BLOCK(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj) | | #define ADG_IS_TITLE_BLOCK(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), | |
| , ADG_TYPE_TITLE_BLOCK)) | | ADG_TYPE_TITLE_BLOCK)) | |
| #define ADG_IS_TITLE_BLOCK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), | | #define ADG_IS_TITLE_BLOCK_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), | |
| ADG_TYPE_TITLE_BLOCK)) | | ADG_TYPE_TITLE_BLOCK)) | |
| #define ADG_TITLE_BLOCK_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), | | #define ADG_TITLE_BLOCK_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), | |
| ADG_TYPE_TITLE_BLOCK, AdgTitleBlock)) | | ADG_TYPE_TITLE_BLOCK, AdgTitleBlockClass)) | |
| | | | |
| typedef struct _AdgTitleBlock AdgTitleBlock; | | typedef struct _AdgTitleBlock AdgTitleBlock; | |
| typedef struct _AdgTitleBlockClass AdgTitleBlockClass; | | typedef struct _AdgTitleBlockClass AdgTitleBlockClass; | |
| | | | |
| struct _AdgTitleBlock { | | struct _AdgTitleBlock { | |
| /*< private >*/ | | /*< private >*/ | |
| AdgEntity parent; | | AdgEntity parent; | |
| gpointer data; | | gpointer data; | |
| }; | | }; | |
| | | | |
| | | | |
End of changes. 1 change blocks. |
| 11 lines changed or deleted | | 11 lines changed or added | |
|
| adg-toy-text.h | | adg-toy-text.h | |
| | | | |
| skipping to change at line 28 | | skipping to change at line 28 | |
| */ | | */ | |
| | | | |
| #ifndef __ADG_TOY_TEXT_H__ | | #ifndef __ADG_TOY_TEXT_H__ | |
| #define __ADG_TOY_TEXT_H__ | | #define __ADG_TOY_TEXT_H__ | |
| | | | |
| #include <adg/adg-entity.h> | | #include <adg/adg-entity.h> | |
| #include <adg/adg-pair.h> | | #include <adg/adg-pair.h> | |
| | | | |
| G_BEGIN_DECLS | | G_BEGIN_DECLS | |
| | | | |
|
| #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 | | #define ADG_TOY_TEXT(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), AD | |
| DG_TYPE_TOY_TEXT, AdgToyText)) | | G_TYPE_TOY_TEXT, AdgToyText)) | |
| #define ADG_TOY_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), AD | | #define ADG_TOY_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), ADG | |
| G_TYPE_TOY_TEXT, AdgToyTextClass)) | | _TYPE_TOY_TEXT, AdgToyTextClass)) | |
| #define ADG_IS_TOY_TEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), A | | #define ADG_IS_TOY_TEXT(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), AD | |
| DG_TYPE_TOY_TEXT)) | | G_TYPE_TOY_TEXT)) | |
| #define ADG_IS_TOY_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), AD | | #define ADG_IS_TOY_TEXT_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), ADG | |
| G_TYPE_TOY_TEXT)) | | _TYPE_TOY_TEXT)) | |
| #define ADG_TOY_TEXT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), AD | | #define ADG_TOY_TEXT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), ADG | |
| G_TYPE_TOY_TEXT, AdgToyTextClass)) | | _TYPE_TOY_TEXT, AdgToyTextClass)) | |
| | | | |
| typedef struct _AdgToyText AdgToyText; | | typedef struct _AdgToyText AdgToyText; | |
| typedef struct _AdgToyTextClass AdgToyTextClass; | | typedef struct _AdgToyTextClass AdgToyTextClass; | |
| | | | |
| struct _AdgToyText { | | struct _AdgToyText { | |
| /*< private >*/ | | /*< private >*/ | |
| AdgEntity parent; | | AdgEntity parent; | |
| gpointer data; | | gpointer data; | |
| }; | | }; | |
| | | | |
| struct _AdgToyTextClass { | | struct _AdgToyTextClass { | |
| /*< private >*/ | | /*< 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); | | AdgToyText * adg_toy_text_new (const gchar *label); | |
| | | AdgDress adg_toy_text_get_dress (AdgToyText *toy_text); | |
| | | void adg_toy_text_set_dress (AdgToyText *toy_text, | |
| | | AdgDress dress); | |
| 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, | | void adg_toy_text_get_extents (AdgToyText *toy_text, | |
| cairo_t *cr, | | cairo_t *cr, | |
| cairo_text_extents_t *exte
nts); | | 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. 2 change blocks. |
| 12 lines changed or deleted | | 15 lines changed or added | |
|
| adg.h | | adg.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_H__ | | #ifndef __ADG_H__ | |
| #define __ADG_H__ | | #define __ADG_H__ | |
| | | | |
| #include <adg/adg-adim.h> | | #include <adg/adg-adim.h> | |
| #include <adg/adg-canvas.h> | | #include <adg/adg-canvas.h> | |
| #include <adg/adg-container.h> | | #include <adg/adg-container.h> | |
| #include <adg/adg-dim.h> | | #include <adg/adg-dim.h> | |
|
| | | #include <adg/adg-dress.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-segment.h> | | #include <adg/adg-segment.h> | |
| #include <adg/adg-stroke.h> | | #include <adg/adg-stroke.h> | |
| | | | |
End of changes. 1 change blocks. |
| 0 lines changed or deleted | | 1 lines changed or added | |
|
| cpml-curve.h | | cpml-curve.h | |
| | | | |
| skipping to change at line 24 | | skipping to change at line 24 | |
| * 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 __CPML_CURVE_H__ | | #ifndef __CPML_CURVE_H__ | |
| #define __CPML_CURVE_H__ | | #define __CPML_CURVE_H__ | |
| | | | |
| #include <cpml/cpml-primitive.h> | | #include <cpml/cpml-primitive.h> | |
|
| #include <cpml/cpml-macros.h> | | #include <cpml/cpml-util.h> | |
| | | | |
| CAIRO_BEGIN_DECLS | | CAIRO_BEGIN_DECLS | |
| | | | |
| int cpml_curve_type_get_npoints (void) CPML_GNUC_CONST; | | int cpml_curve_type_get_npoints (void) CPML_GNUC_CONST; | |
| double cpml_curve_length (const CpmlPrimitive *curve); | | double cpml_curve_length (const CpmlPrimitive *curve); | |
| void cpml_curve_pair_at_time (const CpmlPrimitive *curve, | | void cpml_curve_pair_at_time (const CpmlPrimitive *curve, | |
| CpmlPair *pair, | | CpmlPair *pair, | |
| double time); | | double time); | |
| void cpml_curve_pair_at (const CpmlPrimitive *curve, | | void cpml_curve_pair_at (const CpmlPrimitive *curve, | |
| CpmlPair *pair, | | CpmlPair *pair, | |
| | | | |
End of changes. 1 change blocks. |
| 1 lines changed or deleted | | 1 lines changed or added | |
|
| cpml-line.h | | cpml-line.h | |
| | | | |
| skipping to change at line 24 | | skipping to change at line 24 | |
| * 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 __CPML_LINE_H__ | | #ifndef __CPML_LINE_H__ | |
| #define __CPML_LINE_H__ | | #define __CPML_LINE_H__ | |
| | | | |
| #include <cpml/cpml-primitive.h> | | #include <cpml/cpml-primitive.h> | |
|
| #include <cpml/cpml-macros.h> | | #include <cpml/cpml-util.h> | |
| | | | |
| CAIRO_BEGIN_DECLS | | CAIRO_BEGIN_DECLS | |
| | | | |
| int cpml_line_type_get_npoints (void) CPML_GNUC_CONST; | | int cpml_line_type_get_npoints (void) CPML_GNUC_CONST; | |
| double cpml_line_length (const CpmlPrimitive *line); | | double cpml_line_length (const CpmlPrimitive *line); | |
| void cpml_line_pair_at (const CpmlPrimitive *line, | | void cpml_line_pair_at (const CpmlPrimitive *line, | |
| CpmlPair *pair, | | CpmlPair *pair, | |
| double pos); | | double pos); | |
| void cpml_line_vector_at (const CpmlPrimitive *line, | | void cpml_line_vector_at (const CpmlPrimitive *line, | |
| CpmlVector *vector, | | CpmlVector *vector, | |
| | | | |
End of changes. 1 change blocks. |
| 1 lines changed or deleted | | 1 lines changed or added | |
|
| cpml-segment.h | | cpml-segment.h | |
| | | | |
| skipping to change at line 52 | | skipping to change at line 52 | |
| const CpmlSegment *src); | | const CpmlSegment *src); | |
| | | | |
| void cpml_segment_to_cairo (const CpmlSegment *segment, | | void cpml_segment_to_cairo (const CpmlSegment *segment, | |
| cairo_t *cr); | | cairo_t *cr); | |
| void cpml_segment_dump (const CpmlSegment *segment); | | void cpml_segment_dump (const CpmlSegment *segment); | |
| | | | |
| void cpml_segment_reset (CpmlSegment *segment); | | void cpml_segment_reset (CpmlSegment *segment); | |
| cairo_bool_t | | cairo_bool_t | |
| cpml_segment_next (CpmlSegment *segment); | | cpml_segment_next (CpmlSegment *segment); | |
| | | | |
|
| | | double cpml_segment_length (const CpmlSegment *segment); | |
| | | void cpml_segment_pair_at (const CpmlSegment *segment, | |
| | | CpmlPair *pair, | |
| | | double pos); | |
| | | void cpml_segment_vector_at (const CpmlSegment *segment, | |
| | | CpmlVector *vector, | |
| | | double pos); | |
| | | | |
| void cpml_segment_reverse (CpmlSegment *segment); | | void cpml_segment_reverse (CpmlSegment *segment); | |
| void cpml_segment_transform (CpmlSegment *segment, | | void cpml_segment_transform (CpmlSegment *segment, | |
| const cairo_matrix_t *matrix); | | const cairo_matrix_t *matrix); | |
| int cpml_segment_intersection (const CpmlSegment *segment, | | int cpml_segment_intersection (const CpmlSegment *segment, | |
| const CpmlSegment *segment2, | | const CpmlSegment *segment2, | |
| CpmlPair *dest, | | CpmlPair *dest, | |
| int max); | | int max); | |
| void cpml_segment_offset (CpmlSegment *segment, | | void cpml_segment_offset (CpmlSegment *segment, | |
| double offset); | | double offset); | |
| | | | |
| | | | |
End of changes. 1 change blocks. |
| 0 lines changed or deleted | | 8 lines changed or added | |
|