diff options
| author | Marc Jeanmougin <marc@jeanmougin.fr> | 2015-12-08 08:29:33 +0000 |
|---|---|---|
| committer | Marc Jeanmougin <marcjeanmougin@free.fr> | 2015-12-08 08:29:33 +0000 |
| commit | 5e5f10dfcca24194acdcb4b301f9e989ddc6e209 (patch) | |
| tree | 9287d4cdc6ff3281620a65091fb9a3ccd13c9b79 /src/sp-guide.h | |
| parent | fix crash (oops) (diff) | |
| parent | merge lp:~inkscape.dev/inkscape/lock_guides (diff) | |
| download | inkscape-5e5f10dfcca24194acdcb4b301f9e989ddc6e209.tar.gz inkscape-5e5f10dfcca24194acdcb4b301f9e989ddc6e209.zip | |
update to trunk + resolve conflicts
(bzr r14504.1.9)
Diffstat (limited to 'src/sp-guide.h')
| -rw-r--r-- | src/sp-guide.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/sp-guide.h b/src/sp-guide.h index bcd1e57b6..720c83d36 100644 --- a/src/sp-guide.h +++ b/src/sp-guide.h @@ -53,6 +53,9 @@ public: void set_label(const char* label, bool const commit); char const* getLabel() const { return label; } + void set_locked(const bool locked, bool const commit); + bool getLocked() const { return locked; } + static SPGuide *createSPGuide(SPDocument *doc, Geom::Point const &pt1, Geom::Point const &pt2); void showSPGuide(SPCanvasGroup *group, GCallback handler); @@ -78,6 +81,7 @@ protected: char* label; std::vector<SPGuideLine *> views; // contains an object of type SPGuideline (see display/guideline.cpp for definition) + bool locked; Geom::Point normal_to_line; Geom::Point point_on_line; |