summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKrzysztof Kosi??ski <tweenk.pl@gmail.com>2011-08-06 13:45:04 +0000
committerKrzysztof KosiƄski <tweenk.pl@gmail.com>2011-08-06 13:45:04 +0000
commit456dddb2670686427c60497702e86648635ce42e (patch)
tree2a9f168da4a873d5a3fd991747824db3770746db /src
parentPlug a giant gaping memory leak in Gaussian blur filter (diff)
downloadinkscape-456dddb2670686427c60497702e86648635ce42e.tar.gz
inkscape-456dddb2670686427c60497702e86648635ce42e.zip
Fix compilation (oops).
(bzr r10347.1.24)
Diffstat (limited to 'src')
-rw-r--r--src/display/drawing-group.h2
-rw-r--r--src/display/drawing-item.cpp2
-rw-r--r--src/display/drawing-item.h2
-rw-r--r--src/display/drawing-text.cpp4
4 files changed, 5 insertions, 5 deletions
diff --git a/src/display/drawing-group.h b/src/display/drawing-group.h
index f7d6a2be3..072944b6c 100644
--- a/src/display/drawing-group.h
+++ b/src/display/drawing-group.h
@@ -36,7 +36,7 @@ protected:
unsigned flags, unsigned reset);
virtual void _renderItem(DrawingContext &ct, Geom::IntRect const &area, unsigned flags);
virtual void _clipItem(DrawingContext &ct, Geom::IntRect const &area);
- virtual DrawingItem *_pickItem(Geom::Point const &p, double delta);
+ virtual DrawingItem *_pickItem(Geom::Point const &p, double delta, bool sticky);
virtual bool _canClip();
SPStyle *_style;
diff --git a/src/display/drawing-item.cpp b/src/display/drawing-item.cpp
index caed08e6f..53639f765 100644
--- a/src/display/drawing-item.cpp
+++ b/src/display/drawing-item.cpp
@@ -611,7 +611,7 @@ DrawingItem::pick(Geom::Point const &p, double delta, bool sticky)
expanded.expandBy(delta);
if (expanded.contains(p)) {
- return _pickItem(p, delta);
+ return _pickItem(p, delta, sticky);
}
return NULL;
}
diff --git a/src/display/drawing-item.h b/src/display/drawing-item.h
index 87b9ba048..f26c65df5 100644
--- a/src/display/drawing-item.h
+++ b/src/display/drawing-item.h
@@ -109,7 +109,7 @@ protected:
unsigned flags, unsigned reset) { return 0; }
virtual void _renderItem(DrawingContext &ct, Geom::IntRect const &area, unsigned flags) {}
virtual void _clipItem(DrawingContext &ct, Geom::IntRect const &area) {}
- virtual DrawingItem *_pickItem(Geom::Point const &p, double delta, bool sticky) { return NULL; }
+ virtual DrawingItem *_pickItem(Geom::Point const &p, double delta, bool sticky = false) { return NULL; }
virtual bool _canClip() { return false; }
Drawing *_drawing;
diff --git a/src/display/drawing-text.cpp b/src/display/drawing-text.cpp
index e03a91b39..5fc732779 100644
--- a/src/display/drawing-text.cpp
+++ b/src/display/drawing-text.cpp
@@ -248,9 +248,9 @@ DrawingText::_clipItem(DrawingContext &ct, Geom::IntRect const &area)
}
DrawingItem *
-DrawingText::_pickItem(Geom::Point const &p, double delta, bool /*sticky*/)
+DrawingText::_pickItem(Geom::Point const &p, double delta, bool sticky)
{
- DrawingItem *picked = DrawingGroup::_pickItem(p, delta);
+ DrawingItem *picked = DrawingGroup::_pickItem(p, delta, sticky);
if (picked) return this;
return NULL;
}