summaryrefslogtreecommitdiffstats
path: root/src/widgets
diff options
context:
space:
mode:
authorTavmjong Bah <tavmjong@free.fr>2014-04-24 12:53:30 +0000
committertavmjong-free <tavmjong@free.fr>2014-04-24 12:53:30 +0000
commit20452bbd40fe1d93b2093cb5dea8e4cb8ae967d3 (patch)
treece0ca88db9385121a88ce92d2b407ebb7e9734c7 /src/widgets
parentClean up of style code, removal of SPFontStyle. Step 2. (diff)
downloadinkscape-20452bbd40fe1d93b2093cb5dea8e4cb8ae967d3.tar.gz
inkscape-20452bbd40fe1d93b2093cb5dea8e4cb8ae967d3.zip
Clean up of style code: refactor marker properties. Step 3.
(bzr r13301)
Diffstat (limited to 'src/widgets')
-rw-r--r--src/widgets/stroke-style.cpp7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/widgets/stroke-style.cpp b/src/widgets/stroke-style.cpp
index a4cca9472..0e0a4fd72 100644
--- a/src/widgets/stroke-style.cpp
+++ b/src/widgets/stroke-style.cpp
@@ -581,7 +581,8 @@ StrokeStyle::forkMarker(SPObject *marker, int loc, SPItem *item)
Glib::ustring urlId = Glib::ustring::format("url(#", marker->getRepr()->attribute("id"), ")");
unsigned int refs = 0;
for (int i = SP_MARKER_LOC_START; i < SP_MARKER_LOC_QTY; i++) {
- if (item->style->marker[i].set && !strcmp(urlId.c_str(), item->style->marker[i].value)) {
+ if (item->style->marker_ptrs[i]->set &&
+ !strcmp(urlId.c_str(), item->style->marker_ptrs[i]->value)) {
refs++;
}
}
@@ -1176,11 +1177,11 @@ StrokeStyle::updateAllMarkers(GSList const *objects)
combo->setDesktop(desktop);
- if (object->style->marker[keyloc[i].loc].value != NULL && !all_texts) {
+ if (object->style->marker_ptrs[keyloc[i].loc]->value != NULL && !all_texts) {
// If the object has this type of markers,
// Extract the name of the marker that the object uses
- SPObject *marker = getMarkerObj(object->style->marker[keyloc[i].loc].value, object->document);
+ SPObject *marker = getMarkerObj(object->style->marker_ptrs[keyloc[i].loc]->value, object->document);
// Scroll the combobox to that marker
combo->set_current(marker);