Take thickness into account in the size allocation of the child widgets in

[~andy/gtk] / gdk / linux-fb / mizerline.c

diff --git a/gdk/linux-fb/mizerline.c b/gdk/linux-fb/mizerline.c
index 4c2adf040b115952439104289f80fa3ffb650363..c9a5ce163f4472d3e5064caad46c3f24c9f2913e 100644 (file)
--- a/gdk/linux-fb/mizerline.c
+++ b/gdk/linux-fb/mizerline.c
@@ -43,6 +43,7 @@ SOFTWARE.
 ******************************************************************/
 /* $TOG: mizerline.c /main/18 1998/02/09 14:49:45 kaleb $ */
 
+#include <config.h>
 #include "mi.h"
 #include "miline.h"
 
@@ -85,20 +86,16 @@ SOFTWARE.
 }
 
 void
-miZeroLine(pDraw, pGC, mode, npt, pptInit)
-    GdkDrawable* pDraw;
-    GdkGC*     pGC;
-    int                mode;           /* Origin or Previous */
-    int                npt;            /* number of points */
-    GdkPoint* pptInit;
+miZeroLine(GdkDrawable *pDraw, GdkGC *pGC,
+           int mode, int npt, GdkPoint *pptInit)
 {
-    int Nspans, current_y;
+    int Nspans, current_y = 0;
     GdkPoint* ppt; 
     GdkSpan* pspanInit, *spans;
     int list_len;
     int xleft, ytop, xright, ybottom;
     int new_x1, new_y1, new_x2, new_y2;
-    int x, y, x1, y1, x2, y2, xstart, ystart;
+    int x = 0, y = 0, x1, y1, x2, y2, xstart, ystart;
     int oc1, oc2;
     int result;
     int pt1_clipped, pt2_clipped = 0;
@@ -317,12 +314,8 @@ miZeroLine(pDraw, pGC, mode, npt, pptInit)
 }
 
 void
-miZeroDashLine(dst, pgc, mode, nptInit, pptInit)
-GdkDrawable* dst;
-GdkGC* pgc;
-int mode;
-int nptInit;           /* number of points in polyline */
-GdkPoint *pptInit;     /* points in the polyline */
+miZeroDashLine(GdkDrawable *dst, GdkGC *pgc,
+               int mode, int nptInit, GdkPoint *pptInit)
 {
     /* XXX kludge until real zero-width dash code is written */
     GDK_GC_FBDATA(pgc)->values.line_width = 1;