summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKjell Ahlstedt <kjellahlstedt@gmail.com>2021-06-09 10:11:47 +0200
committerKjell Ahlstedt <kjellahlstedt@gmail.com>2021-06-09 10:11:47 +0200
commit003bb21aad74a692edee15ed37193a3c55cce53c (patch)
treec021df9a593acd3f121a7e6c179a392b6ec3ecb3
parentb121a42a79281c165d36e56b9f2868f84ec02ac3 (diff)
Surface::Type: Really deprecate WIN32 with CAIROMM_DISABLE_DEPRECATED
-rw-r--r--cairomm/surface.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/cairomm/surface.h b/cairomm/surface.h
index 9e85819..663bd57 100644
--- a/cairomm/surface.h
+++ b/cairomm/surface.h
@@ -121,15 +121,14 @@ public:
*/
QUARTZ = CAIRO_SURFACE_TYPE_QUARTZ,
- //TODO: In cairomm 1.18.0: Really deprecate, with ifndef CAIROMM_DISABLE_DEPRECATED
-#ifndef WIN32
+#if !defined(WIN32) && !defined(CAIROMM_DISABLE_DEPRECATED)
/**
* The surface is of type win32
*
* @deprecated Use WIN32_SURFACE instead.
*/
WIN32 = CAIRO_SURFACE_TYPE_WIN32,
-#endif // WIN32
+#endif // !WIN32 && !CAIROMM_DISABLE_DEPRECATED
/**
* The surface is of type win32
* @since 1.16.1