Disable the page selector when there's only one page

[inkscape.git] / src / libnr / nr-macros.h

diff --git a/src/libnr/nr-macros.h b/src/libnr/nr-macros.h
index 74a627ae7c2a1cc3ee4f6c3927aa0c3ab506afaa..0ccad30c4a48b5d0846fba6dcc0ccaae4335e9c4 100644 (file)
--- a/src/libnr/nr-macros.h
+++ b/src/libnr/nr-macros.h
@@ -17,10 +17,6 @@
 #endif
 #include <assert.h>
 
-#define nr_new(t,n) ((t *) malloc ((n) * sizeof (t)))
-#define nr_free free
-#define nr_renew(p,t,n) ((t *) realloc (p, (n) * sizeof (t)))
-
 #ifndef TRUE
 #define TRUE (!0)
 #endif
@@ -64,6 +60,7 @@
 #define NR_RECT_DFLS_TEST_INTERSECT(a,b) (((a)->x0 < (b)->x1) && ((a)->x1 > (b)->x0) && ((a)->y0 < (b)->y1) && ((a)->y1 > (b)->y0))
 #define NR_RECT_DF_POINT_DF_TEST_INSIDE(r,p) (((p)->x >= (r)->x0) && ((p)->x < (r)->x1) && ((p)->y >= (r)->y0) && ((p)->y < (r)->y1))
 #define NR_RECT_LS_POINT_LS_TEST_INSIDE(r,p) (((p)->x >= (r)->x0) && ((p)->x < (r)->x1) && ((p)->y >= (r)->y0) && ((p)->y < (r)->y1))
+#define NR_RECT_LS_TEST_INSIDE(r,x,y) ((x >= (r)->x0) && (x < (r)->x1) && (y >= (r)->y0) && (y < (r)->y1))
 
 #define NR_MATRIX_D_TO_DOUBLE(m) ((m)->c)
 #define NR_MATRIX_D_FROM_DOUBLE(d) ((NRMatrix *) &(d)[0])