diff options
| author | David Robillard <d@drobilla.net> | 2019-10-17 15:48:14 +0200 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2019-10-17 15:48:14 +0200 |
| commit | 3f184e128b604c6d4ac2093c68cb9a25a90561de (patch) | |
| tree | d89e01b41858f6ff25ea2fa99423e88d091909dc | |
| parent | 5ec4d8591c6a98c9a9a98fb0f884804a9d70fc1c (diff) | |
| download | jalv-3f184e128b604c6d4ac2093c68cb9a25a90561de.tar.gz jalv-3f184e128b604c6d4ac2093c68cb9a25a90561de.tar.bz2 jalv-3f184e128b604c6d4ac2093c68cb9a25a90561de.zip | |
Avoid deprecation warnings in the Gtk headers themselves
Honestly...
| -rw-r--r-- | src/jalv_gtk.c | 21 | ||||
| -rw-r--r-- | src/jalv_gtkmm2.cpp | 4 |
2 files changed, 8 insertions, 17 deletions
diff --git a/src/jalv_gtk.c b/src/jalv_gtk.c index 68cab2d..dca5241 100644 --- a/src/jalv_gtk.c +++ b/src/jalv_gtk.c @@ -16,23 +16,16 @@ #include "jalv_internal.h" +#include "lv2/core/attributes.h" #include "lv2/patch/patch.h" #include "lv2/port-props/port-props.h" +LV2_DISABLE_DEPRECATION_WARNINGS + #include <gtk/gtk.h> #include <math.h> -#if GTK_MAJOR_VERSION == 3 -#if defined(__clang__) -# pragma clang diagnostic push -# pragma clang diagnostic ignored "-Wdeprecated-declarations" -#elif __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) -# pragma GCC diagnostic push -# pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#endif -#endif - static GtkCheckMenuItem* active_preset_item = NULL; static bool updating = false; @@ -1238,10 +1231,4 @@ jalv_close_ui(ZIX_UNUSED Jalv* jalv) return 0; } -#if GTK_MAJOR_VERSION == 3 -#if defined(__clang__) -# pragma clang diagnostic pop -#elif __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 6) -# pragma GCC diagnostic pop -#endif -#endif +LV2_RESTORE_WARNINGS diff --git a/src/jalv_gtkmm2.cpp b/src/jalv_gtkmm2.cpp index 52994f7..49b9aa9 100644 --- a/src/jalv_gtkmm2.cpp +++ b/src/jalv_gtkmm2.cpp @@ -16,9 +16,13 @@ #include "jalv_internal.h" +#include "lv2/core/attributes.h" + +LV2_DISABLE_DEPRECATION_WARNINGS #include <gtkmm/button.h> #include <gtkmm/main.h> #include <gtkmm/window.h> +LV2_RESTORE_WARNINGS Gtk::Main* jalv_gtk_main = NULL; |