[cairo-commit] cairo-gtk-engine/src Makefile.am, 1.6, 1.7 caligula-draw-sketchy.c, 1.1, 1.2 caligula-draw-sketchy.h, 1.1, 1.2 caligula-draw.c, 1.2, 1.3

[Carl Worth]

Committed by: cworth

Update of /cvs/cairo/cairo-gtk-engine/src
In directory gabe:/tmp/cvs-serv31809/src

Modified Files:
	Makefile.am caligula-draw-sketchy.c caligula-draw-sketchy.h 
	caligula-draw.c 
Log Message:

        * src/caligula-draw.c (draw_button): Remove a couple unused
        variables.

        * theme/caligula/gtkrc: Indent according to sh-mode.

        * src/caligula-draw-shadowed.h:
        * src/caligula-draw-shadowed.c (caligula_draw_shadowed_inset_box):
        Add new function for drawing an inset box with a soft shadow.

        * src/caligula-draw-sketchy.h:
        * src/caligula-draw-sketchy.c: Move include of cairo.h from .c
        to .h.


Index: Makefile.am
===================================================================
RCS file: /cvs/cairo/cairo-gtk-engine/src/Makefile.am,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Makefile.am	9 Feb 2005 19:37:20 -0000	1.6
+++ Makefile.am	9 Feb 2005 20:21:04 -0000	1.7
@@ -16,11 +16,13 @@
 	-avoid-version -no-undefined -module	\
 	$(CGE_LIBS)
 
-libcaligula_la_SOURCES = 	\
-	caligula.c 		\
-	caligula-draw.c 	\
-	caligula-draw.h		\
-	caligula-draw-sketchy.c \
+libcaligula_la_SOURCES = 	 \
+	caligula.c 		 \
+	caligula-draw.c 	 \
+	caligula-draw.h		 \
+	caligula-draw-shadowed.c \
+	caligula-draw-shadowed.h \
+	caligula-draw-sketchy.c  \
 	caligula-draw-sketchy.h
 
 libcaligula_la_LDFLAGS = \

Index: caligula-draw-sketchy.c
===================================================================
RCS file: /cvs/cairo/cairo-gtk-engine/src/caligula-draw-sketchy.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- caligula-draw-sketchy.c	9 Feb 2005 19:37:20 -0000	1.1
+++ caligula-draw-sketchy.c	9 Feb 2005 20:21:04 -0000	1.2
@@ -25,7 +25,6 @@
   by Diana Fong <dfong at redhat.com>.
 */
 
-#include <cairo.h>
 #include <stdlib.h>
 #include <math.h>
 #include <assert.h>

Index: caligula-draw-sketchy.h
===================================================================
RCS file: /cvs/cairo/cairo-gtk-engine/src/caligula-draw-sketchy.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- caligula-draw-sketchy.h	9 Feb 2005 19:37:20 -0000	1.1
+++ caligula-draw-sketchy.h	9 Feb 2005 20:21:04 -0000	1.2
@@ -28,6 +28,8 @@
 #ifndef CALIGULA_DRAW_SKETCHY_H
 #define CALIGULA_DRAW_SKETCHY_H
 
+#include <cairo.h>
+
 void
 caligula_draw_sketchy_box (cairo_t *cr, int x, int y, int width, int height);
 

Index: caligula-draw.c
===================================================================
RCS file: /cvs/cairo/cairo-gtk-engine/src/caligula-draw.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- caligula-draw.c	9 Feb 2005 04:20:01 -0000	1.2
+++ caligula-draw.c	9 Feb 2005 20:21:04 -0000	1.3
@@ -268,9 +268,7 @@
 static void
 draw_button (cairo_t *cr, int x, int y, int width, int height)
 {
-    cairo_text_extents_t extents;
     cairo_pattern_t *pattern;
-    int text_x, text_y;
     const double gray = 0.92;
     const double outline_gray = 0.50;
 
@@ -327,7 +325,7 @@
     gint x_offset, y_offset;
 
     cr = caligula_begin_paint (window, &x_offset, &y_offset);
-  
+
     draw_button (cr, x, y, width, height);
 
     caligula_end_paint (cr);