diff options
| author | Denis Declara <declara91@gmail.com> | 2012-05-05 13:32:42 +0000 |
|---|---|---|
| committer | Denis Declara <declara91@gmail.com> | 2012-05-05 13:32:42 +0000 |
| commit | aeb9c1bde66de096910757abb17dedb94ad74207 (patch) | |
| tree | c0adf97685b0fa8af1553b14d20601f280492762 /src/ui/tool/node.cpp | |
| parent | Fixed some math, so that the objects now line up correctly (diff) | |
| parent | Adding checks to prevent null pointer dereferences (diff) | |
| download | inkscape-aeb9c1bde66de096910757abb17dedb94ad74207.tar.gz inkscape-aeb9c1bde66de096910757abb17dedb94ad74207.zip | |
Trunk merge
(bzr r11073.1.29)
Diffstat (limited to 'src/ui/tool/node.cpp')
| -rw-r--r-- | src/ui/tool/node.cpp | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/src/ui/tool/node.cpp b/src/ui/tool/node.cpp index 1d3acb4a5..ad48b523b 100644 --- a/src/ui/tool/node.cpp +++ b/src/ui/tool/node.cpp @@ -4,6 +4,7 @@ */ /* Authors: * Krzysztof Kosiński <tweenk.pl@gmail.com> + * Jon A. Cruz <jon@joncruz.org> * * Copyright (C) 2009 Authors * Released under GNU GPL, read the file 'COPYING' for more information @@ -34,12 +35,7 @@ #include <gdk/gdkkeysyms.h> #if !GTK_CHECK_VERSION(2,22,0) -#define GDK_KEY_s 0x073 -#define GDK_KEY_S 0x053 -#define GDK_KEY_Page_Up 0xff55 -#define GDK_KEY_KP_Page_Up 0xff9a -#define GDK_KEY_Page_Down 0xff56 -#define GDK_KEY_KP_Page_Down 0xff9b +#include "compat-key-syms.h" #endif namespace Inkscape { @@ -96,20 +92,23 @@ Handle::Handle(NodeSharedData const &data, Geom::Point const &initial_pos, Node , _degenerate(true) { _cset = &handle_colors; - _handle_line = sp_canvas_item_new(data.handle_line_group, SP_TYPE_CTRLLINE, NULL); + _handle_line = SP_CTRLLINE(sp_canvas_item_new(data.handle_line_group, SP_TYPE_CTRLLINE, NULL)); setVisible(false); } Handle::~Handle() { //sp_canvas_item_hide(_handle_line); - gtk_object_destroy(GTK_OBJECT(_handle_line)); + gtk_object_destroy(_handle_line); } void Handle::setVisible(bool v) { ControlPoint::setVisible(v); - if (v) sp_canvas_item_show(_handle_line); - else sp_canvas_item_hide(_handle_line); + if (v) { + sp_canvas_item_show(_handle_line); + } else { + sp_canvas_item_hide(_handle_line); + } } void Handle::move(Geom::Point const &new_pos) @@ -186,7 +185,7 @@ void Handle::move(Geom::Point const &new_pos) void Handle::setPosition(Geom::Point const &p) { ControlPoint::setPosition(p); - sp_ctrlline_set_coords(SP_CTRLLINE(_handle_line), _parent->position(), position()); + _handle_line->setCoords(_parent->position(), position()); // update degeneration info and visibility if (Geom::are_near(position(), _parent->position())) |