commit 2d1ff33d8180bae75e7d931e8e5a9a74ca06bab0 parent 2daf92818bf057bb09d9a69201b8562a4e65d717 Author: falkTX <falktx@falktx.com> Date: Sun, 23 May 2021 12:18:49 +0100 Less annoying backwards compatibility Signed-off-by: falkTX <falktx@falktx.com> Diffstat:
| M | dgl/Image.hpp | | | 9 | ++++++++- |
| M | dgl/ImageWidgets.hpp | | | 18 | +++++++++--------- |
2 files changed, 17 insertions(+), 10 deletions(-)
diff --git 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 @@ -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