diff options
| author | Kjell Ahlstedt <kjellahlstedt@gmail.com> | 2021-02-23 08:13:24 +0000 |
|---|---|---|
| committer | Kjell Ahlstedt <kjellahlstedt@gmail.com> | 2021-02-23 08:13:24 +0000 |
| commit | da328a5099950600c51f9e2185c689b8793d9650 (patch) | |
| tree | be72d98eb5cd2d44459ff197d33b0cc77f45a305 | |
| parent | 21b75b6276b3f04dddf4ae2b238fd81e5a99debb (diff) | |
| parent | 4fd453c42684f3d5dd268dfa0e27f5adff1c20d1 (diff) | |
Merge branch 'kjellahl/surface-type-win32' into 'master'
Don't define Surface::Type::WIN32 if WIN32 is a preprocessor macro
Closes #26
See merge request cairo/cairomm!14
| -rw-r--r-- | cairomm/surface.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/cairomm/surface.h b/cairomm/surface.h index c923e60..9e85819 100644 --- a/cairomm/surface.h +++ b/cairomm/surface.h @@ -69,7 +69,7 @@ class CAIROMM_API Surface { public: /** - * Type is used to describe the type of a given surface. The + * %Cairo::Surface::Type is used to describe the type of a given surface. The * surface types are also known as "backends" or "surface backends" within * cairo. * @@ -121,10 +121,20 @@ public: */ QUARTZ = CAIRO_SURFACE_TYPE_QUARTZ, + //TODO: In cairomm 1.18.0: Really deprecate, with ifndef CAIROMM_DISABLE_DEPRECATED +#ifndef WIN32 /** * The surface is of type win32 + * + * @deprecated Use WIN32_SURFACE instead. */ WIN32 = CAIRO_SURFACE_TYPE_WIN32, +#endif // WIN32 + /** + * The surface is of type win32 + * @since 1.16.1 + */ + WIN32_SURFACE = CAIRO_SURFACE_TYPE_WIN32, /** * The surface is of type beos @@ -216,7 +226,6 @@ public: * @since 1.10 */ SUBSURFACE = CAIRO_SURFACE_TYPE_SUBSURFACE - }; /** |