summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMurray Cumming <murrayc@murrayc.com>2008-03-23 11:19:54 +0100
committerMurray Cumming <murrayc@murrayc.com>2008-03-23 11:19:54 +0100
commit56d68c7dda87aaf7da08a64e8640222654b6ab22 (patch)
tree74f4f08f69f287aa23dcec3afe93783c700fc0c6
parentf48e958239c4e1409735686dd5d3ee5d186ea8f9 (diff)
2008-03-23 Murray Cumming <murrayc@murrayc.com>
* cairomm/enums.h (FONT_TYPE_ATSUI, FONT_TYPE_QUARTZ): Change the definition of FONT_TYPE_ATSUI from CAIRO_FONT_TYPE_ATSUI to CAIRO_FONT_TYPE_QUARTZ (the same numerical value) and document it as deprecated. The others should be documented too. Added FONT_TYPE_QUARTZ.
-rw-r--r--ChangeLog8
-rw-r--r--cairomm/cairommconfig.h.in76
-rw-r--r--cairomm/enums.h3
3 files changed, 10 insertions, 77 deletions
diff --git a/ChangeLog b/ChangeLog
index 51db080..b0bae8e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-03-23 Murray Cumming <murrayc@murrayc.com>
+
+ * cairomm/enums.h (FONT_TYPE_ATSUI, FONT_TYPE_QUARTZ):
+ Change the definition of FONT_TYPE_ATSUI from CAIRO_FONT_TYPE_ATSUI to
+ CAIRO_FONT_TYPE_QUARTZ (the same numerical value) and document it as
+ deprecated. The others should be documented too.
+ Added FONT_TYPE_QUARTZ.
+
== 1.5.0 ==
2008-03-10 Jonathon Jongsma <jjongsma@gnome.org>
diff --git a/cairomm/cairommconfig.h.in b/cairomm/cairommconfig.h.in
deleted file mode 100644
index 72bf94a..0000000
--- a/cairomm/cairommconfig.h.in
+++ /dev/null
@@ -1,76 +0,0 @@
-/* cairomm/cairommconfig.h.in. Generated from configure.in by autoheader. */
-
-/* Defined when the --enable-api-exceptions configure argument was given */
-#undef CAIROMM_EXCEPTIONS_ENABLED
-
-/* define if the Boost library is available */
-#undef HAVE_BOOST
-
-/* define if the Boost::Unit_Test_Framework library is available */
-#undef HAVE_BOOST_UNIT_TEST_FRAMEWORK
-
-/* Define to 1 if you have the <dlfcn.h> header file. */
-#undef HAVE_DLFCN_H
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the <list> header file. */
-#undef HAVE_LIST
-
-/* Define to 1 if you have the <map> header file. */
-#undef HAVE_MAP
-
-/* Define to 1 if you have the <math.h> header file. */
-#undef HAVE_MATH_H
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the <string> header file. */
-#undef HAVE_STRING
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Name of package */
-#undef PACKAGE
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Version number of package */
-#undef VERSION
diff --git a/cairomm/enums.h b/cairomm/enums.h
index 349d978..67d4a6d 100644
--- a/cairomm/enums.h
+++ b/cairomm/enums.h
@@ -192,7 +192,8 @@ typedef enum
FONT_TYPE_TOY = CAIRO_FONT_TYPE_TOY,
FONT_TYPE_FT = CAIRO_FONT_TYPE_FT,
FONT_TYPE_WIN32 = CAIRO_FONT_TYPE_WIN32,
- FONT_TYPE_ATSUI = CAIRO_FONT_TYPE_ATSUI
+ FONT_TYPE_ATSUI = CAIRO_FONT_TYPE_QUARTZ, /**< @deprecated Use FONT_TYPE_QUARTZ instead. */
+ FONT_TYPE_QUARTZ = CAIRO_FONT_TYPE_QUARTZ
} FontType;
} // namespace Cairo