[gimp] app: make GimpScaleComboBox build with GTK+ >= 2.23.1
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] app: make GimpScaleComboBox build with GTK+ >= 2.23.1
- Date: Tue, 26 Oct 2010 14:41:11 +0000 (UTC)
commit 8c65edcc55657c71ca3997848ef0769fdeb667ca
Author: Michael Natterer <mitch gimp org>
Date: Tue Oct 26 16:40:41 2010 +0200
app: make GimpScaleComboBox build with GTK+ >= 2.23.1
app/display/gimpscalecombobox.h | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
---
diff --git a/app/display/gimpscalecombobox.h b/app/display/gimpscalecombobox.h
index f15af16..9ab2db7 100644
--- a/app/display/gimpscalecombobox.h
+++ b/app/display/gimpscalecombobox.h
@@ -22,6 +22,16 @@
#define __GIMP_SCALE_COMBO_BOX_H__
+#if GTK_CHECK_VERSION(2,23,1)
+#undef GTK_DISABLE_DEPRECATED
+#undef GTK_DISABLE_SINGLE_INCLUDES
+#undef __GTK_COMBO_BOX_ENTRY_H__
+#include <gtk/gtkcomboboxentry.h>
+#define GTK_DISABLE_SINGLE_INCLUDES
+#define GTK_DISABLE_DEPRECATED
+#endif
+
+
#define GIMP_TYPE_SCALE_COMBO_BOX (gimp_scale_combo_box_get_type ())
#define GIMP_SCALE_COMBO_BOX(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_SCALE_COMBO_BOX, GimpScaleComboBox))
#define GIMP_SCALE_COMBO_BOX_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_SCALE_COMBO_BOX, GimpScaleComboBoxClass))
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]