From 2d1ff33d8180bae75e7d931e8e5a9a74ca06bab0 Mon Sep 17 00:00:00 2001 From: falkTX Date: Sun, 23 May 2021 12:19:16 +0100 Subject: [PATCH] Less annoying backwards compatibility Signed-off-by: falkTX --- dgl/Image.hpp | 9 ++++++++- dgl/ImageWidgets.hpp | 18 +++++++++--------- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/dgl/Image.hpp b/dgl/Image.hpp index f6489bdf..2e515361 100644 --- a/dgl/Image.hpp +++ b/dgl/Image.hpp @@ -17,12 +17,19 @@ #ifndef DGL_IMAGE_HPP_INCLUDED #define DGL_IMAGE_HPP_INCLUDED +#ifdef DGL_CAIRO +#include "Cairo.hpp" +#else #include "OpenGL.hpp" +#endif START_NAMESPACE_DGL -DISTRHO_DEPRECATED_BY("OpenGLImage") +#ifdef DGL_CAIRO +typedef CairoImage Image; +#else typedef OpenGLImage Image; +#endif END_NAMESPACE_DGL diff --git a/dgl/ImageWidgets.hpp b/dgl/ImageWidgets.hpp index bf42ad3e..992b6e37 100644 --- a/dgl/ImageWidgets.hpp +++ b/dgl/ImageWidgets.hpp @@ -18,23 +18,23 @@ #define DGL_IMAGE_WIDGETS_HPP_INCLUDED #include "Image.hpp" +#include "ImageBaseWidgets.hpp" START_NAMESPACE_DGL -DISTRHO_DEPRECATED_BY("OpenGLImageAboutWindow") +#ifdef DGL_CAIRO +typedef CairoImageAboutWindow ImageAboutWindow; +typedef CairoImageButton ImageButton; +typedef CairoImageKnob ImageKnob; +typedef CairoImageSlider ImageSlider; +typedef CairoImageSwitch ImageSwitch; +#else typedef OpenGLImageAboutWindow ImageAboutWindow; - -DISTRHO_DEPRECATED_BY("OpenGLImageButton") typedef OpenGLImageButton ImageButton; - -DISTRHO_DEPRECATED_BY("OpenGLImageKnob") typedef OpenGLImageKnob ImageKnob; - -DISTRHO_DEPRECATED_BY("OpenGLImageSlider") typedef OpenGLImageSlider ImageSlider; - -DISTRHO_DEPRECATED_BY("OpenGLImageSwitch") typedef OpenGLImageSwitch ImageSwitch; +#endif END_NAMESPACE_DGL