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/seltrans.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/seltrans.cpp')
| -rw-r--r-- | src/seltrans.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/seltrans.cpp b/src/seltrans.cpp index 246dd82e0..ca190e5ad 100644 --- a/src/seltrans.cpp +++ b/src/seltrans.cpp @@ -48,7 +48,7 @@ #include "display/snap-indicator.h" #if !GTK_CHECK_VERSION(2,22,0) -#define GDK_KEY_space 0x020 +#include "compat-key-syms.h" #endif using Inkscape::DocumentUndo; @@ -157,7 +157,7 @@ Inkscape::SelTrans::SelTrans(SPDesktop *desktop) : sp_canvas_item_hide(_norm); for (int i = 0; i < 4; i++) { - _l[i] = sp_canvas_item_new(sp_desktop_controls(desktop), SP_TYPE_CTRLLINE, NULL); + _l[i] = SP_CTRLLINE(sp_canvas_item_new(sp_desktop_controls(desktop), SP_TYPE_CTRLLINE, NULL)); sp_canvas_item_hide(_l[i]); } @@ -202,7 +202,7 @@ Inkscape::SelTrans::~SelTrans() } for (int i = 0; i < 4; i++) { if (_l[i]) { - gtk_object_destroy(GTK_OBJECT(_l[i])); + gtk_object_destroy(_l[i]); _l[i] = NULL; } } @@ -404,7 +404,7 @@ void Inkscape::SelTrans::transform(Geom::Affine const &rel_affine, Geom::Point c p[i] = _bbox->corner(i) * affine; } for (unsigned i = 0 ; i < 4 ; i++) { - sp_ctrlline_set_coords(SP_CTRLLINE(_l[i]), p[i], p[(i+1)%4]); + _l[i]->setCoords(p[i], p[(i+1)%4]); } } } |