[dia/zbrown/test-build: 4/7] enums: move FillStyle into the Dia namespace
- From: Zander Brown <zbrown src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [dia/zbrown/test-build: 4/7] enums: move FillStyle into the Dia namespace
- Date: Mon, 27 Sep 2021 08:21:40 +0000 (UTC)
commit a8066c777ef9a74f5158ebdb54aaacaac6c873b2
Author: Zander Brown <zbrown gnome org>
Date: Sun Sep 26 19:51:41 2021 +0100
enums: move FillStyle into the Dia namespace
app/handle_ops.c | 2 +-
lib/dia-enums.h | 6 +++---
lib/diaimportrenderer.c | 4 ++--
lib/diaimportrenderer.h | 2 +-
lib/diapathrenderer.c | 2 +-
lib/diarenderer.c | 7 ++++---
lib/diarenderer.h | 4 ++--
lib/diasvgrenderer.c | 18 +++++++++---------
lib/diatransformrenderer.c | 7 +++----
lib/renderer/diacairo-renderer.c | 8 ++++----
objects/AADL/aadlbus.c | 3 +--
objects/AADL/aadldata.c | 2 +-
objects/AADL/aadldevice.c | 2 +-
objects/AADL/aadlmemory.c | 2 +-
objects/AADL/aadlpackage.c | 2 +-
objects/AADL/aadlprocess.c | 2 +-
objects/AADL/aadlprocessor.c | 2 +-
objects/AADL/aadlsubprogram.c | 2 +-
objects/AADL/aadlsystem.c | 2 +-
objects/Database/table.c | 4 ++--
objects/ER/attribute.c | 2 +-
objects/ER/entity.c | 4 ++--
objects/ER/relationship.c | 2 +-
objects/FS/function.c | 2 +-
objects/GRAFCET/step.c | 2 +-
objects/Istar/actor.c | 2 +-
objects/Istar/goal.c | 2 +-
objects/Istar/other.c | 2 +-
objects/Jackson/domain.c | 2 +-
objects/Jackson/requirement.c | 2 +-
objects/KAOS/goal.c | 4 ++--
objects/KAOS/other.c | 2 +-
objects/SADT/arrow.c | 2 +-
objects/SADT/box.c | 2 +-
objects/UML/activity.c | 2 +-
objects/UML/actor.c | 2 +-
objects/UML/association.c | 2 +-
objects/UML/branch.c | 2 +-
objects/UML/class.c | 2 +-
objects/UML/classicon.c | 2 +-
objects/UML/component.c | 2 +-
objects/UML/fork.c | 2 +-
objects/UML/large_package.c | 2 +-
objects/UML/node.c | 2 +-
objects/UML/note.c | 2 +-
objects/UML/object.c | 2 +-
objects/UML/small_package.c | 2 +-
objects/UML/state.c | 2 +-
objects/UML/state_term.c | 2 +-
objects/UML/usecase.c | 2 +-
objects/custom/custom_object.c | 2 +-
objects/flowchart/box.c | 2 +-
objects/flowchart/diamond.c | 2 +-
objects/flowchart/ellipse.c | 2 +-
objects/flowchart/parallelogram.c | 2 +-
objects/network/basestation.c | 2 +-
objects/network/radiocell.c | 2 +-
objects/standard/box.c | 2 +-
objects/standard/ellipse.c | 8 +++++++-
plug-ins/cgm/cgm.c | 4 ++--
plug-ins/drs/dia-render-script-import.c | 6 ++++--
plug-ins/drs/dia-render-script-renderer.c | 8 ++++----
plug-ins/dxf/dxf-export.c | 2 +-
plug-ins/hpgl/hpgl.c | 13 +++++++------
plug-ins/metapost/render_metapost.c | 8 ++++----
plug-ins/pgf/render_pgf.c | 17 +++++++++--------
plug-ins/postscript/diapsrenderer.c | 4 ++--
plug-ins/pstricks/render_pstricks.c | 15 ++++++++-------
plug-ins/python/pydia-render.c | 8 ++++----
plug-ins/vdx/vdx-export.c | 4 ++--
plug-ins/wmf/wmf.cpp | 17 +++++++++--------
plug-ins/wpg/wpg.c | 14 +++++++-------
plug-ins/xfig/xfig-export.c | 4 ++--
73 files changed, 153 insertions(+), 142 deletions(-)
---
diff --git a/app/handle_ops.c b/app/handle_ops.c
index 0b1a72792..8ec0cb910 100644
--- a/app/handle_ops.c
+++ b/app/handle_ops.c
@@ -69,7 +69,7 @@ handle_draw (Handle *handle, DDisplay *ddisp)
dia_renderer_set_linewidth (renderer, 0.0);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
- dia_renderer_set_fillstyle (renderer, FILLSTYLE_SOLID);
+ dia_renderer_set_fillstyle (renderer, DIA_FILL_STYLE_SOLID);
dia_interactive_renderer_fill_pixel_rect (DIA_INTERACTIVE_RENDERER (renderer),
diff --git a/lib/dia-enums.h b/lib/dia-enums.h
index 36fa2d475..da9f9985f 100644
--- a/lib/dia-enums.h
+++ b/lib/dia-enums.h
@@ -47,9 +47,9 @@ typedef enum /*< enum >*/ {
DIA_LINE_STYLE_DOTTED
} DiaLineStyle;
-typedef enum {
- FILLSTYLE_SOLID
-} FillStyle;
+typedef enum /*< enum >*/ {
+ DIA_FILL_STYLE_SOLID
+} DiaFillStyle;
typedef enum {
ALIGN_LEFT,
diff --git a/lib/diaimportrenderer.c b/lib/diaimportrenderer.c
index 1ed232318..161ec455a 100644
--- a/lib/diaimportrenderer.c
+++ b/lib/diaimportrenderer.c
@@ -37,7 +37,7 @@ static void set_linewidth (DiaRenderer *renderer, real linewidth);
static void set_linecaps (DiaRenderer *renderer, DiaLineCaps mode);
static void set_linejoin (DiaRenderer *renderer, DiaLineJoin mode);
static void set_linestyle (DiaRenderer *renderer, DiaLineStyle mode, double dash_length);
-static void set_fillstyle (DiaRenderer *renderer, FillStyle mode);
+static void set_fillstyle (DiaRenderer *renderer, DiaFillStyle mode);
static void draw_line (DiaRenderer *renderer,
Point *start, Point *end,
@@ -261,7 +261,7 @@ set_linestyle (DiaRenderer *renderer, DiaLineStyle mode, double dash_length)
static void
-set_fillstyle (DiaRenderer *renderer, FillStyle mode)
+set_fillstyle (DiaRenderer *renderer, DiaFillStyle mode)
{
DiaImportRenderer *self = DIA_IMPORT_RENDERER (renderer);
self->fill_style = mode;
diff --git a/lib/diaimportrenderer.h b/lib/diaimportrenderer.h
index a452e3a09..127998202 100644
--- a/lib/diaimportrenderer.h
+++ b/lib/diaimportrenderer.h
@@ -31,7 +31,7 @@ struct _DiaImportRenderer {
/*! \protected state variables should not be set directly but with the rendering interface */
DiaLineStyle line_style;
- FillStyle fill_style;
+ DiaFillStyle fill_style;
double dash_length;
double line_width;
diff --git a/lib/diapathrenderer.c b/lib/diapathrenderer.c
index 9f7ce8b20..d4712285a 100644
--- a/lib/diapathrenderer.c
+++ b/lib/diapathrenderer.c
@@ -229,7 +229,7 @@ set_linestyle (DiaRenderer *self, DiaLineStyle mode, double dash_length)
static void
-set_fillstyle(DiaRenderer *self, FillStyle mode)
+set_fillstyle (DiaRenderer *self, DiaFillStyle mode)
{
}
diff --git a/lib/diarenderer.c b/lib/diarenderer.c
index 13aa36806..503ca8440 100644
--- a/lib/diarenderer.c
+++ b/lib/diarenderer.c
@@ -84,7 +84,8 @@ static void set_linejoin (DiaRenderer *renderer,
static void set_linestyle (DiaRenderer *renderer,
DiaLineStyle mode,
double length);
-static void set_fillstyle (DiaRenderer *renderer, FillStyle mode);
+static void set_fillstyle (DiaRenderer *renderer,
+ DiaFillStyle mode);
static void draw_line (DiaRenderer *renderer,
Point *start, Point *end,
@@ -511,7 +512,7 @@ set_linestyle (DiaRenderer *renderer, DiaLineStyle mode, double dash_length)
* \memberof _DiaRenderer \pure
*/
static void
-set_fillstyle (DiaRenderer *renderer, FillStyle mode)
+set_fillstyle (DiaRenderer *renderer, DiaFillStyle mode)
{
g_warning ("%s::set_fill_style not implemented!",
G_OBJECT_CLASS_NAME (G_OBJECT_GET_CLASS (renderer)));
@@ -2258,7 +2259,7 @@ dia_renderer_set_linestyle (DiaRenderer *self,
void
dia_renderer_set_fillstyle (DiaRenderer *self,
- FillStyle mode)
+ DiaFillStyle mode)
{
g_return_if_fail (DIA_IS_RENDERER (self));
diff --git a/lib/diarenderer.h b/lib/diarenderer.h
index 16819f8db..7d6e98ae3 100644
--- a/lib/diarenderer.h
+++ b/lib/diarenderer.h
@@ -140,7 +140,7 @@ struct _DiaRendererClass
DiaLineStyle mode,
double length);
void (*set_fillstyle) (DiaRenderer *renderer,
- FillStyle mode);
+ DiaFillStyle mode);
void (*draw_line) (DiaRenderer *renderer,
Point *start,
@@ -303,7 +303,7 @@ void dia_renderer_set_linestyle (DiaRenderer *self,
DiaLineStyle mode,
double length);
void dia_renderer_set_fillstyle (DiaRenderer *self,
- FillStyle mode);
+ DiaFillStyle mode);
void dia_renderer_set_font (DiaRenderer *self,
DiaFont *font,
double height);
diff --git a/lib/diasvgrenderer.c b/lib/diasvgrenderer.c
index d757e7357..43333c76d 100644
--- a/lib/diasvgrenderer.c
+++ b/lib/diasvgrenderer.c
@@ -346,21 +346,21 @@ set_linestyle (DiaRenderer *self, DiaLineStyle mode, double dash_length)
}
-/*!
- * \brief Set fill style
- * \memberof _DiaSvgRenderer
+/*
+ * Set fill style
*/
static void
-set_fillstyle(DiaRenderer *self, FillStyle mode)
+set_fillstyle (DiaRenderer *self, DiaFillStyle mode)
{
- switch(mode) {
- case FILLSTYLE_SOLID:
- break;
- default:
- g_warning("svg_renderer: Unsupported fill mode specified!\n");
+ switch (mode) {
+ case DIA_FILL_STYLE_SOLID:
+ break;
+ default:
+ g_warning ("svg_renderer: Unsupported fill mode specified!\n");
}
}
+
/*!
* \brief Remember the pattern for later use
* \memberof _DiaSvgRenderer
diff --git a/lib/diatransformrenderer.c b/lib/diatransformrenderer.c
index b7360e3e0..158290d24 100644
--- a/lib/diatransformrenderer.c
+++ b/lib/diatransformrenderer.c
@@ -198,12 +198,11 @@ set_linestyle (DiaRenderer *self, DiaLineStyle mode, double dash_length)
}
-/*!
- * \brief Pass through fill style
- * \memberof _DiaTransformRenderer
+/*
+ * Pass through fill style
*/
static void
-set_fillstyle(DiaRenderer *self, FillStyle mode)
+set_fillstyle (DiaRenderer *self, DiaFillStyle mode)
{
DiaTransformRenderer *renderer = DIA_TRANSFORM_RENDERER (self);
diff --git a/lib/renderer/diacairo-renderer.c b/lib/renderer/diacairo-renderer.c
index 3fd2efea1..c29fe82a1 100644
--- a/lib/renderer/diacairo-renderer.c
+++ b/lib/renderer/diacairo-renderer.c
@@ -522,18 +522,18 @@ dia_cairo_renderer_set_linestyle (DiaRenderer *self,
* \memberof _DiaCairoRenderer
*/
static void
-dia_cairo_renderer_set_fillstyle (DiaRenderer *self, FillStyle mode)
+dia_cairo_renderer_set_fillstyle (DiaRenderer *self, DiaFillStyle mode)
{
DIAG_NOTE (g_message ("set_fillstyle %d", mode));
- switch(mode) {
- case FILLSTYLE_SOLID:
+ switch (mode) {
+ case DIA_FILL_STYLE_SOLID:
/* FIXME: how to set _no_ pattern ?
* cairo_set_pattern (renderer->cr, NULL);
*/
break;
default:
- g_warning("DiaCairoRenderer : Unsupported fill mode specified!\n");
+ g_warning ("DiaCairoRenderer : Unsupported fill mode specified!\n");
}
DIAG_STATE (DIA_CAIRO_RENDERER (self)->cr)
diff --git a/objects/AADL/aadlbus.c b/objects/AADL/aadlbus.c
index a8b5250ff..436f4eefd 100644
--- a/objects/AADL/aadlbus.c
+++ b/objects/AADL/aadlbus.c
@@ -73,8 +73,7 @@ aadlbus_draw_borders (Aadlbox *aadlbox, DiaRenderer *renderer)
points[9].x = x + w*AADL_BUS_ARROW_SIZE_FACTOR;
points[9].y = y + h;
-
- dia_renderer_set_fillstyle (renderer, FILLSTYLE_SOLID);
+ dia_renderer_set_fillstyle (renderer, DIA_FILL_STYLE_SOLID);
dia_renderer_set_linewidth (renderer, AADLBOX_BORDERWIDTH);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
diff --git a/objects/AADL/aadldata.c b/objects/AADL/aadldata.c
index cf067b355..84554a74e 100644
--- a/objects/AADL/aadldata.c
+++ b/objects/AADL/aadldata.c
@@ -44,7 +44,7 @@ aadldata_draw_borders (Aadlbox *aadlbox, DiaRenderer *renderer)
w = elem->width;
h = elem->height;
- dia_renderer_set_fillstyle (renderer, FILLSTYLE_SOLID);
+ dia_renderer_set_fillstyle (renderer, DIA_FILL_STYLE_SOLID);
dia_renderer_set_linewidth (renderer, AADLBOX_BORDERWIDTH);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
diff --git a/objects/AADL/aadldevice.c b/objects/AADL/aadldevice.c
index a3eb7c8bc..2c4487f42 100644
--- a/objects/AADL/aadldevice.c
+++ b/objects/AADL/aadldevice.c
@@ -44,7 +44,7 @@ aadldevice_draw_borders (Aadlbox *aadlbox, DiaRenderer *renderer)
w = elem->width;
h = elem->height;
- dia_renderer_set_fillstyle (renderer, FILLSTYLE_SOLID);
+ dia_renderer_set_fillstyle (renderer, DIA_FILL_STYLE_SOLID);
dia_renderer_set_linewidth (renderer, AADLBOX_BORDERWIDTH);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
diff --git a/objects/AADL/aadlmemory.c b/objects/AADL/aadlmemory.c
index 6394d7800..7051a8fc4 100644
--- a/objects/AADL/aadlmemory.c
+++ b/objects/AADL/aadlmemory.c
@@ -70,7 +70,7 @@ aadlmemory_draw_borders (Aadlbox *aadlbox, DiaRenderer *renderer)
point_copy(&bez[4].p1, &bez[0].p1);
- dia_renderer_set_fillstyle (renderer, FILLSTYLE_SOLID);
+ dia_renderer_set_fillstyle (renderer, DIA_FILL_STYLE_SOLID);
dia_renderer_set_linewidth (renderer, AADLBOX_BORDERWIDTH);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
diff --git a/objects/AADL/aadlpackage.c b/objects/AADL/aadlpackage.c
index 9d7be649b..83d5edfd3 100644
--- a/objects/AADL/aadlpackage.c
+++ b/objects/AADL/aadlpackage.c
@@ -48,7 +48,7 @@ aadlpackage_draw_borders (Aadlbox *aadlbox, DiaRenderer *renderer)
w = elem->width;
h = elem->height;
- dia_renderer_set_fillstyle (renderer, FILLSTYLE_SOLID);
+ dia_renderer_set_fillstyle (renderer, DIA_FILL_STYLE_SOLID);
dia_renderer_set_linewidth (renderer, AADLBOX_BORDERWIDTH);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
diff --git a/objects/AADL/aadlprocess.c b/objects/AADL/aadlprocess.c
index 46d04b3d5..0acb4b67e 100644
--- a/objects/AADL/aadlprocess.c
+++ b/objects/AADL/aadlprocess.c
@@ -54,7 +54,7 @@ aadlbox_draw_inclined_box (Aadlbox *aadlbox,
points[2].x = x + w - w * AADLBOX_INCLINE_FACTOR;
points[3].y = points[2].y = y + h;
- dia_renderer_set_fillstyle (renderer, FILLSTYLE_SOLID);
+ dia_renderer_set_fillstyle (renderer, DIA_FILL_STYLE_SOLID);
dia_renderer_set_linewidth (renderer, AADLBOX_BORDERWIDTH);
dia_renderer_set_linestyle (renderer, linestyle, AADLBOX_DASH_LENGTH);
diff --git a/objects/AADL/aadlprocessor.c b/objects/AADL/aadlprocessor.c
index 0d67263c1..08bbde649 100644
--- a/objects/AADL/aadlprocessor.c
+++ b/objects/AADL/aadlprocessor.c
@@ -44,7 +44,7 @@ aadlprocessor_draw_borders (Aadlbox *aadlbox, DiaRenderer *renderer)
w = elem->width;
h = elem->height;
- dia_renderer_set_fillstyle (renderer, FILLSTYLE_SOLID);
+ dia_renderer_set_fillstyle (renderer, DIA_FILL_STYLE_SOLID);
dia_renderer_set_linewidth (renderer, AADLBOX_BORDERWIDTH);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
diff --git a/objects/AADL/aadlsubprogram.c b/objects/AADL/aadlsubprogram.c
index fdc75389b..cf325730f 100644
--- a/objects/AADL/aadlsubprogram.c
+++ b/objects/AADL/aadlsubprogram.c
@@ -46,7 +46,7 @@ aadlsubprogram_draw_borders (Aadlbox *aadlbox, DiaRenderer *renderer)
center.x = x + 0.5*w;
center.y = y + 0.5*h;
- dia_renderer_set_fillstyle (renderer, FILLSTYLE_SOLID);
+ dia_renderer_set_fillstyle (renderer, DIA_FILL_STYLE_SOLID);
dia_renderer_set_linewidth (renderer, AADLBOX_BORDERWIDTH);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
diff --git a/objects/AADL/aadlsystem.c b/objects/AADL/aadlsystem.c
index 085597513..e626be01d 100644
--- a/objects/AADL/aadlsystem.c
+++ b/objects/AADL/aadlsystem.c
@@ -86,7 +86,7 @@ aadlbox_draw_rounded_box (Aadlbox *aadlbox,
bez[8].p1.y = bez[8].p2.y = bez[8].p3.y = y;
bez[8].p3.x = x + w * AADL_ROUNDEDBOX_CORNER_SIZE_FACTOR;
- dia_renderer_set_fillstyle (renderer, FILLSTYLE_SOLID);
+ dia_renderer_set_fillstyle (renderer, DIA_FILL_STYLE_SOLID);
dia_renderer_set_linewidth (renderer, AADLBOX_BORDERWIDTH);
dia_renderer_set_linestyle (renderer, linestyle, AADLBOX_DASH_LENGTH);
diff --git a/objects/Database/table.c b/objects/Database/table.c
index 3af711beb..1d9b6dbcf 100644
--- a/objects/Database/table.c
+++ b/objects/Database/table.c
@@ -558,7 +558,7 @@ table_draw (Table *table, DiaRenderer *renderer)
Element * elem;
dia_renderer_set_linewidth (renderer, table->border_width);
- dia_renderer_set_fillstyle (renderer, FILLSTYLE_SOLID);
+ dia_renderer_set_fillstyle (renderer, DIA_FILL_STYLE_SOLID);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
elem = &table->element;
@@ -690,7 +690,7 @@ fill_diamond (DiaRenderer *renderer,
poly[3].x = poly[1].x;
poly[3].y = lower_midpoint->y - half_height;
- dia_renderer_set_fillstyle (renderer, FILLSTYLE_SOLID);
+ dia_renderer_set_fillstyle (renderer, DIA_FILL_STYLE_SOLID);
dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
dia_renderer_draw_polygon (renderer, poly, 4, color, NULL);
diff --git a/objects/ER/attribute.c b/objects/ER/attribute.c
index 0a400d2f8..aaa3559e5 100644
--- a/objects/ER/attribute.c
+++ b/objects/ER/attribute.c
@@ -267,7 +267,7 @@ attribute_draw (Attribute *attribute, DiaRenderer *renderer)
center.x = elem->corner.x + elem->width/2;
center.y = elem->corner.y + elem->height/2;
- dia_renderer_set_fillstyle (renderer, FILLSTYLE_SOLID);
+ dia_renderer_set_fillstyle (renderer, DIA_FILL_STYLE_SOLID);
dia_renderer_draw_ellipse (renderer,
¢er,
elem->width,
diff --git a/objects/ER/entity.c b/objects/ER/entity.c
index ac0367c62..b00a9dce9 100644
--- a/objects/ER/entity.c
+++ b/objects/ER/entity.c
@@ -243,7 +243,7 @@ entity_draw (Entity *entity, DiaRenderer *renderer)
lr_corner.x = elem->corner.x + elem->width;
lr_corner.y = elem->corner.y + elem->height;
- dia_renderer_set_fillstyle (renderer, FILLSTYLE_SOLID);
+ dia_renderer_set_fillstyle (renderer, DIA_FILL_STYLE_SOLID);
dia_renderer_set_linewidth (renderer, entity->border_width);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
@@ -277,7 +277,7 @@ entity_draw (Entity *entity, DiaRenderer *renderer)
corners[2].y = elem->corner.y + elem->height / 2;
corners[3].x = elem->corner.x + elem->width / 2;
corners[3].y = elem->corner.y + elem->height;
- dia_renderer_set_fillstyle (renderer, FILLSTYLE_SOLID);
+ dia_renderer_set_fillstyle (renderer, DIA_FILL_STYLE_SOLID);
dia_renderer_set_linewidth (renderer, entity->border_width);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
diff --git a/objects/ER/relationship.c b/objects/ER/relationship.c
index fdc95b588..b9db86114 100644
--- a/objects/ER/relationship.c
+++ b/objects/ER/relationship.c
@@ -272,7 +272,7 @@ relationship_draw (Relationship *relationship, DiaRenderer *renderer)
corners[3].x = elem->corner.x + elem->width / 2;
corners[3].y = elem->corner.y + elem->height;
- dia_renderer_set_fillstyle (renderer, FILLSTYLE_SOLID);
+ dia_renderer_set_fillstyle (renderer, DIA_FILL_STYLE_SOLID);
dia_renderer_set_linewidth (renderer, relationship->border_width);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
diff --git a/objects/FS/function.c b/objects/FS/function.c
index 226398130..23e479f39 100644
--- a/objects/FS/function.c
+++ b/objects/FS/function.c
@@ -343,7 +343,7 @@ function_draw (Function *pkg, DiaRenderer *renderer)
font_height = pkg->text->height ;
- dia_renderer_set_fillstyle (renderer, FILLSTYLE_SOLID);
+ dia_renderer_set_fillstyle (renderer, DIA_FILL_STYLE_SOLID);
dia_renderer_set_linewidth (renderer,
font_height / FUNCTION_BORDERWIDTH_SCALE);
if (pkg->is_wish) {
diff --git a/objects/GRAFCET/step.c b/objects/GRAFCET/step.c
index cd378fc4d..4a45165d4 100644
--- a/objects/GRAFCET/step.c
+++ b/objects/GRAFCET/step.c
@@ -393,7 +393,7 @@ step_draw (Step *step, DiaRenderer *renderer)
g_return_if_fail (step != NULL);
g_return_if_fail (renderer != NULL);
- dia_renderer_set_fillstyle (renderer, FILLSTYLE_SOLID);
+ dia_renderer_set_fillstyle (renderer, DIA_FILL_STYLE_SOLID);
dia_renderer_set_linewidth (renderer, STEP_LINE_WIDTH);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0);
dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
diff --git a/objects/Istar/actor.c b/objects/Istar/actor.c
index 815f9c100..88111aa04 100644
--- a/objects/Istar/actor.c
+++ b/objects/Istar/actor.c
@@ -302,7 +302,7 @@ actor_draw (Actor *actor, DiaRenderer *renderer)
center.y = elem->corner.y + elem->height/2;
/* background */
- dia_renderer_set_fillstyle (renderer, FILLSTYLE_SOLID);
+ dia_renderer_set_fillstyle (renderer, DIA_FILL_STYLE_SOLID);
/* foreground */
dia_renderer_set_linewidth (renderer, ACTOR_BORDER_WIDTH);
dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
diff --git a/objects/Istar/goal.c b/objects/Istar/goal.c
index 11fca1de8..51c193eb8 100644
--- a/objects/Istar/goal.c
+++ b/objects/Istar/goal.c
@@ -370,7 +370,7 @@ goal_draw (Goal *goal, DiaRenderer *renderer)
elem->height/2.0);
} else { /* softgoal */
compute_cloud (goal,bpl);
- dia_renderer_set_fillstyle (renderer, FILLSTYLE_SOLID);
+ dia_renderer_set_fillstyle (renderer, DIA_FILL_STYLE_SOLID);
dia_renderer_draw_beziergon (renderer, bpl, 5, &GOAL_BG_COLOR, &GOAL_FG_COLOR);
}
diff --git a/objects/Istar/other.c b/objects/Istar/other.c
index ff95f872c..5c3b1e0df 100644
--- a/objects/Istar/other.c
+++ b/objects/Istar/other.c
@@ -353,7 +353,7 @@ other_draw (Other *other, DiaRenderer *renderer)
break;
case TASK:
compute_task (other, pl);
- dia_renderer_set_fillstyle (renderer, FILLSTYLE_SOLID);
+ dia_renderer_set_fillstyle (renderer, DIA_FILL_STYLE_SOLID);
dia_renderer_set_linewidth (renderer, OTHER_LINE_WIDTH);
dia_renderer_draw_polygon (renderer, pl, 6,
&OTHER_BG_COLOR, &OTHER_FG_COLOR);
diff --git a/objects/Jackson/domain.c b/objects/Jackson/domain.c
index 3dc84ffa5..805003d2d 100644
--- a/objects/Jackson/domain.c
+++ b/objects/Jackson/domain.c
@@ -389,7 +389,7 @@ jackson_box_draw (Box *box, DiaRenderer *renderer)
p2b.y= p1b.y;
/* drawing main box */
- dia_renderer_set_fillstyle (renderer, FILLSTYLE_SOLID);
+ dia_renderer_set_fillstyle (renderer, DIA_FILL_STYLE_SOLID);
dia_renderer_set_linewidth (renderer, JACKSON_BOX_LINE_WIDTH);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
diff --git a/objects/Jackson/requirement.c b/objects/Jackson/requirement.c
index e683b25a6..c1417c85e 100644
--- a/objects/Jackson/requirement.c
+++ b/objects/Jackson/requirement.c
@@ -236,7 +236,7 @@ req_draw (Requirement *req, DiaRenderer *renderer)
c.x = x + w/2.0;
c.y = y + h/2.0;
- dia_renderer_set_fillstyle (renderer, FILLSTYLE_SOLID);
+ dia_renderer_set_fillstyle (renderer, DIA_FILL_STYLE_SOLID);
dia_renderer_set_linewidth (renderer, REQ_LINEWIDTH);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_DASHED, REQ_DASHLEN);
diff --git a/objects/KAOS/goal.c b/objects/KAOS/goal.c
index 3facef8b6..4366efa0a 100644
--- a/objects/KAOS/goal.c
+++ b/objects/KAOS/goal.c
@@ -462,7 +462,7 @@ goal_draw (Goal *goal, DiaRenderer *renderer)
dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
if (goal->type != SOFTGOAL) {
- dia_renderer_set_fillstyle (renderer, FILLSTYLE_SOLID);
+ dia_renderer_set_fillstyle (renderer, DIA_FILL_STYLE_SOLID);
if ((goal->type == REQUIREMENT) || (goal->type == ASSUMPTION)) {
dia_renderer_set_linewidth (renderer, GOAL_LINE_DOUBLE_WIDTH);
@@ -487,7 +487,7 @@ goal_draw (Goal *goal, DiaRenderer *renderer)
}
} else { /* SOFTGOAL IS HERE */
compute_cloud (goal,bpl);
- dia_renderer_set_fillstyle (renderer, FILLSTYLE_SOLID);
+ dia_renderer_set_fillstyle (renderer, DIA_FILL_STYLE_SOLID);
dia_renderer_draw_beziergon (renderer, bpl, 9, &GOAL_BG_COLOR, &GOAL_FG_COLOR);
}
diff --git a/objects/KAOS/other.c b/objects/KAOS/other.c
index 478f8efb5..0833ac2bc 100644
--- a/objects/KAOS/other.c
+++ b/objects/KAOS/other.c
@@ -394,7 +394,7 @@ other_draw (Other *other, DiaRenderer *renderer)
if (other->type==AGENT) {
compute_agent (other,pl);
- dia_renderer_set_fillstyle (renderer, FILLSTYLE_SOLID);
+ dia_renderer_set_fillstyle (renderer, DIA_FILL_STYLE_SOLID);
dia_renderer_set_linewidth (renderer, OTHER_LINE_SIMPLE_WIDTH);
dia_renderer_draw_polygon (renderer,
pl,
diff --git a/objects/SADT/arrow.c b/objects/SADT/arrow.c
index b374d4fa4..477bf5869 100644
--- a/objects/SADT/arrow.c
+++ b/objects/SADT/arrow.c
@@ -329,7 +329,7 @@ draw_dot (DiaRenderer *renderer,
point_scale (&vt,-ARROW_DOT_LOFFSET);
point_add (&pt,&vt);
- dia_renderer_set_fillstyle (renderer,FILLSTYLE_SOLID);
+ dia_renderer_set_fillstyle (renderer, DIA_FILL_STYLE_SOLID);
dia_renderer_draw_ellipse (renderer,
&pt,
ARROW_DOT_RADIUS,
diff --git a/objects/SADT/box.c b/objects/SADT/box.c
index f8ae93f7d..91db72625 100644
--- a/objects/SADT/box.c
+++ b/objects/SADT/box.c
@@ -305,7 +305,7 @@ sadtbox_draw (Box *box, DiaRenderer *renderer)
lr_corner.x = elem->corner.x + elem->width;
lr_corner.y = elem->corner.y + elem->height;
- dia_renderer_set_fillstyle (renderer, FILLSTYLE_SOLID);
+ dia_renderer_set_fillstyle (renderer, DIA_FILL_STYLE_SOLID);
dia_renderer_set_linewidth (renderer, SADTBOX_LINE_WIDTH);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
diff --git a/objects/UML/activity.c b/objects/UML/activity.c
index b19fe3592..dbbaaaf9c 100644
--- a/objects/UML/activity.c
+++ b/objects/UML/activity.c
@@ -220,7 +220,7 @@ state_draw(State *state, DiaRenderer *renderer)
w = elem->width;
h = elem->height;
- dia_renderer_set_fillstyle (renderer, FILLSTYLE_SOLID);
+ dia_renderer_set_fillstyle (renderer, DIA_FILL_STYLE_SOLID);
dia_renderer_set_linewidth (renderer, STATE_LINEWIDTH);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
diff --git a/objects/UML/actor.c b/objects/UML/actor.c
index 12432ab18..1731ad2d9 100644
--- a/objects/UML/actor.c
+++ b/objects/UML/actor.c
@@ -234,7 +234,7 @@ actor_draw(Actor *actor, DiaRenderer *renderer)
w = elem->width;
actor_height = elem->height - actor->text->height;
- dia_renderer_set_fillstyle (renderer, FILLSTYLE_SOLID);
+ dia_renderer_set_fillstyle (renderer, DIA_FILL_STYLE_SOLID);
dia_renderer_set_linewidth (renderer, actor->line_width);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
diff --git a/objects/UML/association.c b/objects/UML/association.c
index c734f9316..bf367bc93 100644
--- a/objects/UML/association.c
+++ b/objects/UML/association.c
@@ -479,7 +479,7 @@ association_draw (Association *assoc, DiaRenderer *renderer)
}
/* Direction: */
- dia_renderer_set_fillstyle (renderer, FILLSTYLE_SOLID);
+ dia_renderer_set_fillstyle (renderer, DIA_FILL_STYLE_SOLID);
if (assoc_get_direction_poly (assoc, poly)) {
dia_renderer_draw_polygon (renderer, poly, 3, &assoc->line_color, NULL);
diff --git a/objects/UML/branch.c b/objects/UML/branch.c
index b54aa3b65..b40acbdee 100644
--- a/objects/UML/branch.c
+++ b/objects/UML/branch.c
@@ -212,7 +212,7 @@ branch_draw (Branch *branch, DiaRenderer *renderer)
points[2].x = elem->corner.x + 2*w, points[2].y = elem->corner.y + h;
points[3].x = elem->corner.x + w, points[3].y = elem->corner.y + 2*h;
- dia_renderer_set_fillstyle (renderer, FILLSTYLE_SOLID);
+ dia_renderer_set_fillstyle (renderer, DIA_FILL_STYLE_SOLID);
dia_renderer_set_linewidth (renderer, BRANCH_BORDERWIDTH);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
diff --git a/objects/UML/class.c b/objects/UML/class.c
index 6916df1d1..702d0865b 100644
--- a/objects/UML/class.c
+++ b/objects/UML/class.c
@@ -1245,7 +1245,7 @@ umlclass_draw (UMLClass *umlclass, DiaRenderer *renderer)
g_return_if_fail (umlclass != NULL);
g_return_if_fail (renderer != NULL);
- dia_renderer_set_fillstyle (renderer, FILLSTYLE_SOLID);
+ dia_renderer_set_fillstyle (renderer, DIA_FILL_STYLE_SOLID);
dia_renderer_set_linewidth (renderer, umlclass->line_width);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
diff --git a/objects/UML/classicon.c b/objects/UML/classicon.c
index 2060fd89d..6d555e993 100644
--- a/objects/UML/classicon.c
+++ b/objects/UML/classicon.c
@@ -261,7 +261,7 @@ classicon_draw (Classicon *icon, DiaRenderer *renderer)
center.x += r/2.0;
}
- dia_renderer_set_fillstyle (renderer, FILLSTYLE_SOLID);
+ dia_renderer_set_fillstyle (renderer, DIA_FILL_STYLE_SOLID);
dia_renderer_set_linewidth (renderer, icon->line_width);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
diff --git a/objects/UML/component.c b/objects/UML/component.c
index 5e166f389..357aa22ee 100644
--- a/objects/UML/component.c
+++ b/objects/UML/component.c
@@ -237,7 +237,7 @@ component_draw (Component *cmp, DiaRenderer *renderer)
w = elem->width;
h = elem->height;
- dia_renderer_set_fillstyle (renderer, FILLSTYLE_SOLID);
+ dia_renderer_set_fillstyle (renderer, DIA_FILL_STYLE_SOLID);
dia_renderer_set_linewidth (renderer, COMPONENT_BORDERWIDTH);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
diff --git a/objects/UML/fork.c b/objects/UML/fork.c
index 8dbc16c48..79948f5ee 100644
--- a/objects/UML/fork.c
+++ b/objects/UML/fork.c
@@ -215,7 +215,7 @@ fork_draw (Fork *branch, DiaRenderer *renderer)
w = elem->width;
h = elem->height;
- dia_renderer_set_fillstyle (renderer, FILLSTYLE_SOLID);
+ dia_renderer_set_fillstyle (renderer, DIA_FILL_STYLE_SOLID);
dia_renderer_set_linewidth (renderer, FORK_BORDERWIDTH);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
diff --git a/objects/UML/large_package.c b/objects/UML/large_package.c
index 9f5eea3c2..b401051c9 100644
--- a/objects/UML/large_package.c
+++ b/objects/UML/large_package.c
@@ -255,7 +255,7 @@ largepackage_draw (LargePackage *pkg, DiaRenderer *renderer)
w = elem->width;
h = elem->height;
- dia_renderer_set_fillstyle (renderer, FILLSTYLE_SOLID);
+ dia_renderer_set_fillstyle (renderer, DIA_FILL_STYLE_SOLID);
dia_renderer_set_linewidth (renderer, pkg->line_width);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
diff --git a/objects/UML/node.c b/objects/UML/node.c
index 1d9b61a57..f771faa6a 100644
--- a/objects/UML/node.c
+++ b/objects/UML/node.c
@@ -241,7 +241,7 @@ node_draw (Node *node, DiaRenderer *renderer)
w = elem->width;
h = elem->height;
- dia_renderer_set_fillstyle (renderer, FILLSTYLE_SOLID);
+ dia_renderer_set_fillstyle (renderer, DIA_FILL_STYLE_SOLID);
dia_renderer_set_linewidth (renderer, node->line_width);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
diff --git a/objects/UML/note.c b/objects/UML/note.c
index af6be1530..f42567874 100644
--- a/objects/UML/note.c
+++ b/objects/UML/note.c
@@ -225,7 +225,7 @@ note_draw (Note *note, DiaRenderer *renderer)
w = elem->width;
h = elem->height;
- dia_renderer_set_fillstyle (renderer, FILLSTYLE_SOLID);
+ dia_renderer_set_fillstyle (renderer, DIA_FILL_STYLE_SOLID);
dia_renderer_set_linewidth (renderer, note->line_width);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
diff --git a/objects/UML/object.c b/objects/UML/object.c
index 331338a2e..237dba64c 100644
--- a/objects/UML/object.c
+++ b/objects/UML/object.c
@@ -291,7 +291,7 @@ objet_draw (Objet *ob, DiaRenderer *renderer)
bw = (ob->is_active) ? OBJET_ACTIVEBORDERWIDTH: ob->line_width;
- dia_renderer_set_fillstyle (renderer, FILLSTYLE_SOLID);
+ dia_renderer_set_fillstyle (renderer, DIA_FILL_STYLE_SOLID);
dia_renderer_set_linewidth (renderer, bw);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
diff --git a/objects/UML/small_package.c b/objects/UML/small_package.c
index d4b5d0f73..752b591d2 100644
--- a/objects/UML/small_package.c
+++ b/objects/UML/small_package.c
@@ -249,7 +249,7 @@ smallpackage_draw (SmallPackage *pkg, DiaRenderer *renderer)
w = elem->width;
h = elem->height;
- dia_renderer_set_fillstyle (renderer, FILLSTYLE_SOLID);
+ dia_renderer_set_fillstyle (renderer, DIA_FILL_STYLE_SOLID);
dia_renderer_set_linewidth (renderer, pkg->line_width);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
diff --git a/objects/UML/state.c b/objects/UML/state.c
index 550da5f04..32208f13f 100644
--- a/objects/UML/state.c
+++ b/objects/UML/state.c
@@ -282,7 +282,7 @@ state_draw (State *state, DiaRenderer *renderer)
w = elem->width;
h = elem->height;
- dia_renderer_set_fillstyle (renderer, FILLSTYLE_SOLID);
+ dia_renderer_set_fillstyle (renderer, DIA_FILL_STYLE_SOLID);
dia_renderer_set_linewidth (renderer, state->line_width);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0.0);
diff --git a/objects/UML/state_term.c b/objects/UML/state_term.c
index 33d45c20f..b75ed2f6f 100644
--- a/objects/UML/state_term.c
+++ b/objects/UML/state_term.c
@@ -208,7 +208,7 @@ state_draw (State *state, DiaRenderer *renderer)
w = elem->width;
h = elem->height;
- dia_renderer_set_fillstyle (renderer, FILLSTYLE_SOLID);
+ dia_renderer_set_fillstyle (renderer, DIA_FILL_STYLE_SOLID);
dia_renderer_set_linewidth (renderer, STATE_LINEWIDTH);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0);
diff --git a/objects/UML/usecase.c b/objects/UML/usecase.c
index 40bdc4c35..429af7cb1 100644
--- a/objects/UML/usecase.c
+++ b/objects/UML/usecase.c
@@ -257,7 +257,7 @@ usecase_draw (Usecase *usecase, DiaRenderer *renderer)
}
- dia_renderer_set_fillstyle (renderer, FILLSTYLE_SOLID);
+ dia_renderer_set_fillstyle (renderer, DIA_FILL_STYLE_SOLID);
dia_renderer_set_linewidth (renderer, usecase->line_width);
if (usecase->collaboration)
diff --git a/objects/custom/custom_object.c b/objects/custom/custom_object.c
index 436ddf99f..16bb33a4a 100644
--- a/objects/custom/custom_object.c
+++ b/objects/custom/custom_object.c
@@ -939,7 +939,7 @@ custom_draw (Custom *custom, DiaRenderer *renderer)
barr = g_array_new (FALSE, FALSE, sizeof(BezPoint));
}
- dia_renderer_set_fillstyle (renderer, FILLSTYLE_SOLID);
+ dia_renderer_set_fillstyle (renderer, DIA_FILL_STYLE_SOLID);
dia_renderer_set_linewidth (renderer, custom->border_width);
cur_line = custom->border_width;
dia_renderer_set_linestyle (renderer, cur_style, custom->dashlength);
diff --git a/objects/flowchart/box.c b/objects/flowchart/box.c
index 873d101b4..f11c595cb 100644
--- a/objects/flowchart/box.c
+++ b/objects/flowchart/box.c
@@ -366,7 +366,7 @@ box_draw (Box *box, DiaRenderer *renderer)
lr_corner.y = elem->corner.y + elem->height;
if (box->show_background) {
- dia_renderer_set_fillstyle (renderer, FILLSTYLE_SOLID);
+ dia_renderer_set_fillstyle (renderer, DIA_FILL_STYLE_SOLID);
}
dia_renderer_set_linewidth (renderer, box->border_width);
diff --git a/objects/flowchart/diamond.c b/objects/flowchart/diamond.c
index 541d11092..7b004e595 100644
--- a/objects/flowchart/diamond.c
+++ b/objects/flowchart/diamond.c
@@ -383,7 +383,7 @@ diamond_draw(Diamond *diamond, DiaRenderer *renderer)
pts[3].y += elem->height / 2.0;
if (diamond->show_background) {
- dia_renderer_set_fillstyle (renderer, FILLSTYLE_SOLID);
+ dia_renderer_set_fillstyle (renderer, DIA_FILL_STYLE_SOLID);
}
dia_renderer_set_linewidth (renderer, diamond->border_width);
diff --git a/objects/flowchart/ellipse.c b/objects/flowchart/ellipse.c
index 82a5c8dd2..fab04d5aa 100644
--- a/objects/flowchart/ellipse.c
+++ b/objects/flowchart/ellipse.c
@@ -377,7 +377,7 @@ ellipse_draw (Ellipse *ellipse, DiaRenderer *renderer)
center.y = elem->corner.y + elem->height/2;
if (ellipse->show_background) {
- dia_renderer_set_fillstyle (renderer, FILLSTYLE_SOLID);
+ dia_renderer_set_fillstyle (renderer, DIA_FILL_STYLE_SOLID);
}
dia_renderer_set_linewidth (renderer, ellipse->border_width);
dia_renderer_set_linestyle (renderer, ellipse->line_style, ellipse->dashlength);
diff --git a/objects/flowchart/parallelogram.c b/objects/flowchart/parallelogram.c
index 45fc95ae1..ffb29a103 100644
--- a/objects/flowchart/parallelogram.c
+++ b/objects/flowchart/parallelogram.c
@@ -388,7 +388,7 @@ pgram_draw (Pgram *pgram, DiaRenderer *renderer)
}
if (pgram->show_background) {
- dia_renderer_set_fillstyle (renderer, FILLSTYLE_SOLID);
+ dia_renderer_set_fillstyle (renderer, DIA_FILL_STYLE_SOLID);
}
dia_renderer_set_linewidth (renderer, pgram->border_width);
diff --git a/objects/network/basestation.c b/objects/network/basestation.c
index c2ac501aa..731fddf0c 100644
--- a/objects/network/basestation.c
+++ b/objects/network/basestation.c
@@ -247,7 +247,7 @@ basestation_draw (Basestation *basestation, DiaRenderer *renderer)
w = elem->width;
h = elem->height - r;
- dia_renderer_set_fillstyle (renderer, FILLSTYLE_SOLID);
+ dia_renderer_set_fillstyle (renderer, DIA_FILL_STYLE_SOLID);
dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_ROUND);
dia_renderer_set_linestyle (renderer, DIA_LINE_STYLE_SOLID, 0);
dia_renderer_set_linewidth (renderer, BASESTATION_LINEWIDTH);
diff --git a/objects/network/radiocell.c b/objects/network/radiocell.c
index cab122d71..c01274e54 100644
--- a/objects/network/radiocell.c
+++ b/objects/network/radiocell.c
@@ -256,7 +256,7 @@ radiocell_draw (RadioCell *radiocell, DiaRenderer *renderer)
n = poly->numpoints;
if (radiocell->show_background) {
- dia_renderer_set_fillstyle (renderer, FILLSTYLE_SOLID);
+ dia_renderer_set_fillstyle (renderer, DIA_FILL_STYLE_SOLID);
}
dia_renderer_set_linecaps (renderer, DIA_LINE_CAPS_BUTT);
dia_renderer_set_linejoin (renderer, DIA_LINE_JOIN_MITER);
diff --git a/objects/standard/box.c b/objects/standard/box.c
index 3f23cbd97..394854fee 100644
--- a/objects/standard/box.c
+++ b/objects/standard/box.c
@@ -386,7 +386,7 @@ box_draw (Box *box, DiaRenderer *renderer)
if (box->show_background) {
Color fill = box->inner_color;
- dia_renderer_set_fillstyle (renderer, FILLSTYLE_SOLID);
+ dia_renderer_set_fillstyle (renderer, DIA_FILL_STYLE_SOLID);
if (box->pattern) {
dia_pattern_get_fallback_color (box->pattern, &fill);
if (dia_renderer_is_capable_of (renderer, RENDER_PATTERN)) {
diff --git a/objects/standard/ellipse.c b/objects/standard/ellipse.c
index 1700eacb9..3957d2834 100644
--- a/objects/standard/ellipse.c
+++ b/objects/standard/ellipse.c
@@ -373,15 +373,20 @@ ellipse_draw (Ellipse *ellipse, DiaRenderer *renderer)
dia_renderer_set_linewidth (renderer, ellipse->border_width);
dia_renderer_set_linestyle (renderer, ellipse->line_style, ellipse->dashlength);
+
if (ellipse->show_background) {
Color fill = ellipse->inner_color;
- dia_renderer_set_fillstyle (renderer, FILLSTYLE_SOLID);
+
+ dia_renderer_set_fillstyle (renderer, DIA_FILL_STYLE_SOLID);
+
if (ellipse->pattern) {
dia_pattern_get_fallback_color (ellipse->pattern, &fill);
+
if (dia_renderer_is_capable_of (renderer, RENDER_PATTERN)) {
dia_renderer_set_pattern (renderer, ellipse->pattern);
}
}
+
if (!path) {
dia_renderer_draw_ellipse (renderer,
¢er,
@@ -395,6 +400,7 @@ ellipse_draw (Ellipse *ellipse, DiaRenderer *renderer)
path->len,
&fill, &ellipse->border_color);
}
+
if (dia_renderer_is_capable_of (renderer, RENDER_PATTERN)) {
dia_renderer_set_pattern (renderer, NULL);
}
diff --git a/plug-ins/cgm/cgm.c b/plug-ins/cgm/cgm.c
index 04a50b51f..cb7600c9a 100644
--- a/plug-ins/cgm/cgm.c
+++ b/plug-ins/cgm/cgm.c
@@ -667,11 +667,11 @@ set_linestyle (DiaRenderer *self, DiaLineStyle mode, double dash_length)
static void
-set_fillstyle(DiaRenderer *self, FillStyle mode)
+set_fillstyle (DiaRenderer *self, DiaFillStyle mode)
{
#if 0
switch(mode) {
- case FILLSTYLE_SOLID:
+ case DIA_FILL_STYLE_SOLID:
write_elhead(renderer->file, CGM_ATTRIB, CGM_INTERIOR_STYLE, 2);
write_int16(renderer->file, 1);
break;
diff --git a/plug-ins/drs/dia-render-script-import.c b/plug-ins/drs/dia-render-script-import.c
index 0863ee36a..143bbc249 100644
--- a/plug-ins/drs/dia-render-script-import.c
+++ b/plug-ins/drs/dia-render-script-import.c
@@ -222,12 +222,14 @@ _parse_linejoin (xmlNodePtr node, const char *attrib)
}
-static FillStyle
+static DiaFillStyle
_parse_fillstyle (xmlNodePtr node, const char *attrib)
{
/* ToDo: complain about everything but */
- return FILLSTYLE_SOLID;
+ return DIA_FILL_STYLE_SOLID;
}
+
+
static Alignment
_parse_alignment (xmlNodePtr node, const char *attrib)
{
diff --git a/plug-ins/drs/dia-render-script-renderer.c b/plug-ins/drs/dia-render-script-renderer.c
index 3bfba1637..cec32f05d 100644
--- a/plug-ins/drs/dia-render-script-renderer.c
+++ b/plug-ins/drs/dia-render-script-renderer.c
@@ -482,14 +482,14 @@ set_linestyle (DiaRenderer *self, DiaLineStyle mode, double dash_length)
static void
-set_fillstyle (DiaRenderer *self, FillStyle mode)
+set_fillstyle (DiaRenderer *self, DiaFillStyle mode)
{
DrsRenderer *renderer = DRS_RENDERER (self);
xmlNodePtr node;
- const gchar *value = NULL;
+ const char *value = NULL;
- switch(mode) {
- case FILLSTYLE_SOLID:
+ switch (mode) {
+ case DIA_FILL_STYLE_SOLID:
value = "solid";
break;
default:
diff --git a/plug-ins/dxf/dxf-export.c b/plug-ins/dxf/dxf-export.c
index 3c80bba56..fd561f0e3 100644
--- a/plug-ins/dxf/dxf-export.c
+++ b/plug-ins/dxf/dxf-export.c
@@ -296,7 +296,7 @@ set_linestyle (DiaRenderer *self, DiaLineStyle mode, double dash_length)
static void
-set_fillstyle(DiaRenderer *self, FillStyle mode)
+set_fillstyle (DiaRenderer *self, DiaFillStyle mode)
{
}
diff --git a/plug-ins/hpgl/hpgl.c b/plug-ins/hpgl/hpgl.c
index 36e2ed68f..de6673c20 100644
--- a/plug-ins/hpgl/hpgl.c
+++ b/plug-ins/hpgl/hpgl.c
@@ -282,18 +282,19 @@ set_linestyle (DiaRenderer *object, DiaLineStyle mode, double dash_length)
static void
-set_fillstyle(DiaRenderer *object, FillStyle mode)
+set_fillstyle (DiaRenderer *object, DiaFillStyle mode)
{
- DIAG_NOTE(g_message("set_fillstyle %d", mode));
+ DIAG_NOTE (g_message ("set_fillstyle %d", mode));
- switch(mode) {
- case FILLSTYLE_SOLID:
- break;
+ switch (mode) {
+ case DIA_FILL_STYLE_SOLID:
+ break;
default:
- g_warning("HpglRenderer : Unsupported fill mode specified!");
+ g_warning ("HpglRenderer : Unsupported fill mode specified!");
}
}
+
static void
set_font (DiaRenderer *object, DiaFont *font, real height)
{
diff --git a/plug-ins/metapost/render_metapost.c b/plug-ins/metapost/render_metapost.c
index 9ae6d2050..3d67d0c53 100644
--- a/plug-ins/metapost/render_metapost.c
+++ b/plug-ins/metapost/render_metapost.c
@@ -377,17 +377,17 @@ draw_with_linestyle (MetapostRenderer *renderer)
static void
-set_fillstyle (DiaRenderer *self, FillStyle mode)
+set_fillstyle (DiaRenderer *self, DiaFillStyle mode)
{
/*MetapostRenderer *renderer = METAPOST_RENDERER (self);*/
- switch(mode) {
- case FILLSTYLE_SOLID:
+ switch (mode) {
+ case DIA_FILL_STYLE_SOLID:
break;
default:
g_warning ("%s: Unsupported fill mode specified!",
G_OBJECT_CLASS_NAME (G_OBJECT_GET_CLASS (self)));
- }
+ }
}
diff --git a/plug-ins/pgf/render_pgf.c b/plug-ins/pgf/render_pgf.c
index 63130739b..8ccee50d5 100644
--- a/plug-ins/pgf/render_pgf.c
+++ b/plug-ins/pgf/render_pgf.c
@@ -84,7 +84,7 @@ static void set_linewidth(DiaRenderer *self, real linewidth);
static void set_linecaps (DiaRenderer *self, DiaLineCaps mode);
static void set_linejoin (DiaRenderer *self, DiaLineJoin mode);
static void set_linestyle(DiaRenderer *self, DiaLineStyle mode, double dash_length);
-static void set_fillstyle(DiaRenderer *self, FillStyle mode);
+static void set_fillstyle(DiaRenderer *self, DiaFillStyle mode);
static void set_font(DiaRenderer *self, DiaFont *font, real height);
static void draw_line(DiaRenderer *self,
Point *start, Point *end,
@@ -521,17 +521,18 @@ set_linestyle (DiaRenderer *self, DiaLineStyle mode, double dash_length)
static void
-set_fillstyle(DiaRenderer *self, FillStyle mode)
+set_fillstyle (DiaRenderer *self, DiaFillStyle mode)
{
- switch(mode) {
- case FILLSTYLE_SOLID:
- break;
+ switch (mode) {
+ case DIA_FILL_STYLE_SOLID:
+ break;
default:
- g_warning ("%s: Unsupported fill mode specified!",
- G_OBJECT_CLASS_NAME (G_OBJECT_GET_CLASS (self)));
- }
+ g_warning ("%s: Unsupported fill mode specified!",
+ G_OBJECT_CLASS_NAME (G_OBJECT_GET_CLASS (self)));
+ }
}
+
static void
set_font(DiaRenderer *self, DiaFont *font, real height)
{
diff --git a/plug-ins/postscript/diapsrenderer.c b/plug-ins/postscript/diapsrenderer.c
index 87f61094f..8e23710cb 100644
--- a/plug-ins/postscript/diapsrenderer.c
+++ b/plug-ins/postscript/diapsrenderer.c
@@ -270,10 +270,10 @@ set_linestyle (DiaRenderer *self, DiaLineStyle mode, double dash_length)
static void
-set_fillstyle (DiaRenderer *self, FillStyle mode)
+set_fillstyle (DiaRenderer *self, DiaFillStyle mode)
{
switch (mode) {
- case FILLSTYLE_SOLID:
+ case DIA_FILL_STYLE_SOLID:
break;
default:
g_warning ("%s: Unsupported fill mode specified!",
diff --git a/plug-ins/pstricks/render_pstricks.c b/plug-ins/pstricks/render_pstricks.c
index 5f2da5c6f..da006df85 100644
--- a/plug-ins/pstricks/render_pstricks.c
+++ b/plug-ins/pstricks/render_pstricks.c
@@ -79,7 +79,7 @@ static void set_linewidth(DiaRenderer *self, real linewidth);
static void set_linecaps (DiaRenderer *self, DiaLineCaps mode);
static void set_linejoin (DiaRenderer *self, DiaLineJoin mode);
static void set_linestyle(DiaRenderer *self, DiaLineStyle mode, double dash_length);
-static void set_fillstyle(DiaRenderer *self, FillStyle mode);
+static void set_fillstyle(DiaRenderer *self, DiaFillStyle mode);
static void set_font(DiaRenderer *self, DiaFont *font, real height);
static void draw_line(DiaRenderer *self,
Point *start, Point *end,
@@ -438,16 +438,17 @@ set_linestyle (DiaRenderer *self, DiaLineStyle mode, double dash_length)
static void
-set_fillstyle(DiaRenderer *self, FillStyle mode)
+set_fillstyle (DiaRenderer *self, DiaFillStyle mode)
{
- switch(mode) {
- case FILLSTYLE_SOLID:
- break;
+ switch (mode) {
+ case DIA_FILL_STYLE_SOLID:
+ break;
default:
- g_warning("pstricks_renderer: Unsupported fill mode specified!\n");
- }
+ g_warning("pstricks_renderer: Unsupported fill mode specified!\n");
+ }
}
+
static void
set_font (DiaRenderer *self, DiaFont *font, real height)
{
diff --git a/plug-ins/python/pydia-render.c b/plug-ins/python/pydia-render.c
index 84ee95d2a..37ae853a1 100644
--- a/plug-ins/python/pydia-render.c
+++ b/plug-ins/python/pydia-render.c
@@ -340,19 +340,19 @@ set_linestyle (DiaRenderer *renderer, DiaLineStyle mode, double dash_length)
/**
* set_fillstyle:
* @renderer: the #DiaRenderer
- * @mode: the #FillStyle to fill with
+ * @mode: the #DiaFillStyle to fill with
*
* Set fillstyle for later use
*
* Optional on the PyDia side.
*/
static void
-set_fillstyle (DiaRenderer *renderer, FillStyle mode)
+set_fillstyle (DiaRenderer *renderer, DiaFillStyle mode)
{
PyObject *func, *res, *arg, *self = PYDIA_RENDERER (renderer);
- switch(mode) {
- case FILLSTYLE_SOLID:
+ switch (mode) {
+ case DIA_FILL_STYLE_SOLID:
break;
default:
PyErr_Warn (PyExc_RuntimeWarning,
diff --git a/plug-ins/vdx/vdx-export.c b/plug-ins/vdx/vdx-export.c
index 9c562e0cb..84e07d176 100644
--- a/plug-ins/vdx/vdx-export.c
+++ b/plug-ins/vdx/vdx-export.c
@@ -90,7 +90,7 @@ struct _VDXRenderer
DiaLineJoin joinmode;
DiaLineStyle stylemode;
double dashlength;
- FillStyle fillmode;
+ DiaFillStyle fillmode;
DiaFont *font;
double fontheight;
@@ -357,7 +357,7 @@ set_linestyle (DiaRenderer *self, DiaLineStyle mode, double dash_length)
* Set fill style
*/
static void
-set_fillstyle (DiaRenderer *self, FillStyle mode)
+set_fillstyle (DiaRenderer *self, DiaFillStyle mode)
{
VDXRenderer *renderer = VDX_RENDERER (self);
diff --git a/plug-ins/wmf/wmf.cpp b/plug-ins/wmf/wmf.cpp
index 68871509c..45d179ee6 100644
--- a/plug-ins/wmf/wmf.cpp
+++ b/plug-ins/wmf/wmf.cpp
@@ -522,20 +522,21 @@ set_linestyle (DiaRenderer *self, DiaLineStyle mode, double dash_length)
static void
-set_fillstyle(DiaRenderer *self, FillStyle mode)
+set_fillstyle (DiaRenderer *self, DiaFillStyle mode)
{
- WmfRenderer *renderer = WMF_RENDERER (self);
+ WmfRenderer *renderer = WMF_RENDERER (self);
- DIAG_NOTE(renderer, "set_fillstyle %d\n", mode);
+ DIAG_NOTE (renderer, "set_fillstyle %d\n", mode);
- switch(mode) {
- case FILLSTYLE_SOLID:
- break;
+ switch (mode) {
+ case DIA_FILL_STYLE_SOLID:
+ break;
default:
- g_warning("WmfRenderer : Unsupported fill mode specified!\n");
- }
+ g_warning ("WmfRenderer : Unsupported fill mode specified!\n");
+ }
}
+
static void
set_font (DiaRenderer *self, DiaFont *font, real height)
{
diff --git a/plug-ins/wpg/wpg.c b/plug-ins/wpg/wpg.c
index 65ebfd283..048326965 100644
--- a/plug-ins/wpg/wpg.c
+++ b/plug-ins/wpg/wpg.c
@@ -421,18 +421,18 @@ set_linestyle (DiaRenderer *self, DiaLineStyle mode, double dash_length)
static void
-set_fillstyle(DiaRenderer *self, FillStyle mode)
+set_fillstyle (DiaRenderer *self, DiaFillStyle mode)
{
WpgRenderer *renderer = WPG_RENDERER (self);
- DIAG_NOTE(g_message("set_fillstyle %d", mode));
+ DIAG_NOTE (g_message ("set_fillstyle %d", mode));
switch(mode) {
- case FILLSTYLE_SOLID:
- renderer->FillAttr.Type = WPG_FA_SOLID;
- break;
- default:
- g_warning("WpgRenderer : Unsupported fill mode specified!\n");
+ case DIA_FILL_STYLE_SOLID:
+ renderer->FillAttr.Type = WPG_FA_SOLID;
+ break;
+ default:
+ g_warning ("WpgRenderer : Unsupported fill mode specified!\n");
}
}
diff --git a/plug-ins/xfig/xfig-export.c b/plug-ins/xfig/xfig-export.c
index f64ed9550..6b33416bc 100644
--- a/plug-ins/xfig/xfig-export.c
+++ b/plug-ins/xfig/xfig-export.c
@@ -73,7 +73,7 @@ struct _DiaXfigRenderer {
DiaLineJoin joinmode;
DiaLineStyle stylemode;
double dashlength;
- FillStyle fillmode;
+ DiaFillStyle fillmode;
DiaFont *font;
double fontheight;
@@ -518,7 +518,7 @@ set_linestyle (DiaRenderer *self, DiaLineStyle mode, double dash_length)
static void
-set_fillstyle (DiaRenderer *self, FillStyle mode)
+set_fillstyle (DiaRenderer *self, DiaFillStyle mode)
{
DiaXfigRenderer *renderer = DIA_XFIG_RENDERER (self);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
