From 01bc7c92b9c5093d77e967d14ca6f9e0ee43100a Mon Sep 17 00:00:00 2001
From: Michael Natterer <mitch@gimp.org>
Date: Thu, 4 Nov 2004 11:58:16 +0000
Subject: [PATCH] #undef GTK_DISABLE_DEPRECATED

2004-11-04  Michael Natterer  <mitch@gimp.org>

	* libgimpwidgets/gimpoldwidgets.c: #undef GTK_DISABLE_DEPRECATED

	* libgimpwidgets/gimpunitmenu.h: #include <gtk/gtkoptionmenu.h>
	explicitely and #undef GTK_DISABLE_DEPRECATED only around the
	inclusion if it was defined before.
---
 ChangeLog                       | 8 ++++++++
 libgimpwidgets/gimpoldwidgets.c | 1 +
 libgimpwidgets/gimpunitmenu.h   | 8 ++++++++
 3 files changed, 17 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index ed1c44b85d..f681cb343c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2004-11-04  Michael Natterer  <mitch@gimp.org>
+
+	* libgimpwidgets/gimpoldwidgets.c: #undef GTK_DISABLE_DEPRECATED
+
+	* libgimpwidgets/gimpunitmenu.h: #include <gtk/gtkoptionmenu.h>
+	explicitely and #undef GTK_DISABLE_DEPRECATED only around the
+	inclusion if it was defined before.
+
 2004-11-04  Michael Natterer  <mitch@gimp.org>
 
 	* libgimp/gimpunitcache.h
diff --git a/libgimpwidgets/gimpoldwidgets.c b/libgimpwidgets/gimpoldwidgets.c
index 86320a4621..9ed9b93a19 100644
--- a/libgimpwidgets/gimpoldwidgets.c
+++ b/libgimpwidgets/gimpoldwidgets.c
@@ -24,6 +24,7 @@
 
 #include <string.h>
 
+#undef GTK_DISABLE_DEPRECATED
 #include <gtk/gtk.h>
 
 #include "gimpwidgetstypes.h"
diff --git a/libgimpwidgets/gimpunitmenu.h b/libgimpwidgets/gimpunitmenu.h
index cd2350989f..e5807259db 100644
--- a/libgimpwidgets/gimpunitmenu.h
+++ b/libgimpwidgets/gimpunitmenu.h
@@ -23,6 +23,14 @@
 #ifndef __GIMP_UNIT_MENU_H__
 #define __GIMP_UNIT_MENU_H__
 
+#ifdef GTK_DISABLE_DEPRECATED
+#undef GTK_DISABLE_DEPRECATED
+#include <gtk/gtkoptionmenu.h>
+#define GTK_DISABLE_DEPRECATED
+#else
+#include <gtk/gtkoptionmenu.h>
+#endif
+
 G_BEGIN_DECLS
 
 /* For information look into the C source or the html documentation */