summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathon Jongsma <jonathon.jongsma@collabora.co.uk>2008-08-13 15:54:00 -0500
committerJonathon Jongsma <jonathon.jongsma@collabora.co.uk>2008-08-13 15:54:00 -0500
commit633cd4486ec59f18a76b68026cd901f9d163567a (patch)
treeafe730d92aa5178c9095b4bb6bfb1c5001702857
parentae0be3920a128a1dfdb25aca0b9d595beb0d0c8b (diff)
update surface type enum
-rw-r--r--ChangeLog6
-rw-r--r--cairomm/enums.h6
2 files changed, 9 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 2e75efd..14ef5f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2008-08-13 Jonathon Jongsma <jjongsma@gnome.org>
+ * cairomm/enums.h: update to include new surface types. Remove an unnecessary
+ cairo version check since we depend on a higher version of cairo for other
+ stuff anyway
+
+2008-08-13 Jonathon Jongsma <jjongsma@gnome.org>
+
* cairomm/exception.cc:
* cairomm/exception.h: renamed get_status() to get_status_code() to make the
name a little bit more clear
diff --git a/cairomm/enums.h b/cairomm/enums.h
index 67d4a6d..8f4cb39 100644
--- a/cairomm/enums.h
+++ b/cairomm/enums.h
@@ -120,9 +120,7 @@ typedef enum
EXTEND_NONE = CAIRO_EXTEND_NONE,
EXTEND_REPEAT = CAIRO_EXTEND_REPEAT,
EXTEND_REFLECT = CAIRO_EXTEND_REFLECT,
-#if CAIRO_VERSION >= CAIRO_VERSION_ENCODE(1,1,1)
EXTEND_PAD = CAIRO_EXTEND_PAD
-#endif /* CAIRO_VERSION > CAIRO_VERSION_ENCODE(1,1,1) */
} Extend;
@@ -176,7 +174,9 @@ typedef enum
SURFACE_TYPE_BEOS = CAIRO_SURFACE_TYPE_BEOS,
SURFACE_TYPE_DIRECTFB = CAIRO_SURFACE_TYPE_DIRECTFB,
SURFACE_TYPE_SVG = CAIRO_SURFACE_TYPE_SVG,
- SURFACE_TYPE_OS2 = CAIRO_SURFACE_TYPE_OS2
+ SURFACE_TYPE_OS2 = CAIRO_SURFACE_TYPE_OS2,
+ SURFACE_TYPE_WIN32_PRINTING = CAIRO_SURFACE_TYPE_WIN32_PRINTING,
+ SURFACE_TYPE_QUARTZ_IMAGE = CAIRO_SURFACE_TYPE_QUARTZ_IMAGE
} SurfaceType;
typedef enum