From 019c0e56579fe7f94982434d8efcd7b00d8df0aa Mon Sep 17 00:00:00 2001
From: Miller Puckette <millerpuckette@users.sourceforge.net>
Date: Fri, 28 Dec 2007 03:43:06 +0000
Subject: ... and again trying to check in 0.41-0 test 10

svn path=/trunk/; revision=9108
---
 pd/src/g_rtext.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'pd/src/g_rtext.c')

diff --git a/pd/src/g_rtext.c b/pd/src/g_rtext.c
index cbb0ba88..948ebcb4 100644
--- a/pd/src/g_rtext.c
+++ b/pd/src/g_rtext.c
@@ -15,10 +15,16 @@
 #include "g_canvas.h"
 #include "t_tk.h"
 
-#define LMARGIN 1
-#define RMARGIN 1
+#define LMARGIN 2
+#define RMARGIN 2
+/* for some reason, it draws text 1 pixel lower on Mac OS X (& linux too?) */
+#ifndef MSW
 #define TMARGIN 2
 #define BMARGIN 2
+#else
+#define TMARGIN 3
+#define BMARGIN 1
+#endif
 
 #define SEND_FIRST 1
 #define SEND_UPDATE 2
@@ -150,7 +156,7 @@ extern int sys_oldtclversion;
 static void rtext_senditup(t_rtext *x, int action, int *widthp, int *heightp,
     int *indexp)
 {
-    float dispx, dispy;
+    t_float dispx, dispy;
     char smallbuf[200], *tempbuf;
     int outchars = 0, nlines = 0, ncolumns = 0,
         pixwide, pixhigh, font, fontwidth, fontheight, findx, findy;
-- 
cgit v1.2.1