[cairo-commit] cairo/src cairoint.h,1.149,1.150

[Carl Worth]

Committed by: cworth

Update of /cvs/cairo/cairo/src
In directory gabe:/tmp/cvs-serv24454/src

Modified Files:
	cairoint.h 
Log Message:

        * src/cairoint.h: Provide font-backend-specific macros for
        FONT_FAMILY_DEFAULT. Change CAIRO_FT_FONT_FAMILY_DEFAULT from
        "serif" to "" to allow the actual default to come from the
        system/user configuration.


Index: cairoint.h
===================================================================
RCS file: /cvs/cairo/cairo/src/cairoint.h,v
retrieving revision 1.149
retrieving revision 1.150
diff -u -d -r1.149 -r1.150
--- cairoint.h	10 Jun 2005 19:18:21 -0000	1.149
+++ cairoint.h	11 Jun 2005 07:06:04 -0000	1.150
@@ -859,19 +859,23 @@
 #define CAIRO_FONT_SLANT_DEFAULT   CAIRO_FONT_SLANT_NORMAL
 #define CAIRO_FONT_WEIGHT_DEFAULT  CAIRO_FONT_WEIGHT_NORMAL
 
+#define CAIRO_WIN32_FONT_FAMILY_DEFAULT "Arial"
+#define CAIRO_ATSUI_FONT_FAMILY_DEFAULT  "Monaco"
+#define CAIRO_FT_FONT_FAMILY_DEFAULT     ""
+
 #if   CAIRO_HAS_WIN32_FONT
 
-#define CAIRO_FONT_FAMILY_DEFAULT "Arial"
+#define CAIRO_FONT_FAMILY_DEFAULT CAIRO_WIN32_FONT_FAMILY_DEFAULT
 #define CAIRO_FONT_BACKEND_DEFAULT &cairo_win32_scaled_font_backend
 
 #elif CAIRO_HAS_ATSUI_FONT
 
-#define CAIRO_FONT_FAMILY_DEFAULT  "Monaco"
+#define CAIRO_FONT_FAMILY_DEFAULT CAIRO_ATSUI_FONT_FAMILY_DEFAULT
 #define CAIRO_FONT_BACKEND_DEFAULT &cairo_atsui_scaled_font_backend
 
 #elif CAIRO_HAS_FT_FONT
 
-#define CAIRO_FONT_FAMILY_DEFAULT  "serif"
+#define CAIRO_FONT_FAMILY_DEFAULT CAIRO_FT_FONT_FAMILY_DEFAULT
 #define CAIRO_FONT_BACKEND_DEFAULT &cairo_ft_scaled_font_backend
 
 #endif