From 723df29f7c3b793b26f41bfa1dd6430cdd75ae07 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Sat, 23 Aug 2014 13:20:14 +0100 Subject: gradient-vector: Clean up GObject boilerplate & fix deprecation (bzr r13341.1.153) --- src/widgets/gradient-vector.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/widgets/gradient-vector.h') diff --git a/src/widgets/gradient-vector.h b/src/widgets/gradient-vector.h index b63120a6e..0b653b016 100644 --- a/src/widgets/gradient-vector.h +++ b/src/widgets/gradient-vector.h @@ -65,7 +65,11 @@ struct SPGradientVectorSelector { }; struct SPGradientVectorSelectorClass { +#if GTK_CHECK_VERSION(3,0,0) + GtkBoxClass parent_class; +#else GtkVBoxClass parent_class; +#endif void (* vector_set) (SPGradientVectorSelector *gvs, SPGradient *gr); }; -- cgit v1.2.3 From fd314c7cbec965ec702c3ea80e1e48d41302d687 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Sat, 23 Aug 2014 21:30:32 +0100 Subject: Fix deprecated VBox use (bzr r13341.1.165) --- src/widgets/gradient-vector.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/widgets/gradient-vector.h') diff --git a/src/widgets/gradient-vector.h b/src/widgets/gradient-vector.h index 0b653b016..fc85b0d9c 100644 --- a/src/widgets/gradient-vector.h +++ b/src/widgets/gradient-vector.h @@ -43,7 +43,11 @@ class SPGradient; class SPStop; struct SPGradientVectorSelector { +#if GTK_CHECK_VERSION(3,0,0) + GtkBox vbox; +#else GtkVBox vbox; +#endif guint idlabel : 1; -- cgit v1.2.3 From 977857ef75a45ed1ec79cfdcf0f25dd66d4a7e86 Mon Sep 17 00:00:00 2001 From: Alex Valavanis Date: Sat, 30 Aug 2014 14:00:28 +0100 Subject: Reduce header bloat (bzr r13341.1.184) --- src/widgets/gradient-vector.h | 8 -------- 1 file changed, 8 deletions(-) (limited to 'src/widgets/gradient-vector.h') diff --git a/src/widgets/gradient-vector.h b/src/widgets/gradient-vector.h index fc85b0d9c..5ae90b28f 100644 --- a/src/widgets/gradient-vector.h +++ b/src/widgets/gradient-vector.h @@ -19,16 +19,8 @@ # include "config.h" #endif -#if GLIBMM_DISABLE_DEPRECATED && HAVE_GLIBMM_THREADS_H -#include -#endif - #include - -#include #include - -#include #include "gradient-selector.h" #define SP_TYPE_GRADIENT_VECTOR_SELECTOR (sp_gradient_vector_selector_get_type ()) -- cgit v1.2.3