Commit 0be93f8e authored by Benjamin Otte's avatar Benjamin Otte

gtkx: Warn if we include gtkx.h during GTK compilation

parent fcbbe549
......@@ -1450,7 +1450,7 @@ gtkprivatetypebuiltins.c: $(gtk_private_type_h_sources) gtkprivatetypebuiltins.
gtktypefuncs.c: stamp-gtktypebuiltins.h stamp-gtkprivatetypebuiltins.h $(top_srcdir)/gtk/*.h $(top_srcdir)/gtk/a11y/*.h $(top_srcdir)/gtk/deprecated/*.h $(top_srcdir)/gdk/*.h Makefile
$(AM_V_GEN) echo '#include <gtk/gtkx.h>' > xgen-gtfsrc.c && \
$(AM_V_GEN) (echo '#undef GTK_COMPILATION' && echo '#include <gtk/gtkx.h>') > xgen-gtfsrc.c && \
echo 'G_GNUC_BEGIN_IGNORE_DEPRECATIONS' > xgen-gtf && \
${CPP} $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) xgen-gtfsrc.c | \
$(GREP) -o '\bg[td]k_[a-zA-Z0-9_]*_get_type\b' | \
......
......@@ -19,7 +19,6 @@
#include "config.h"
#include <gtk/gtkx.h>
#include "gtkspinbutton.h"
#include "gtkmain.h"
#include "gtkbox.h"
......@@ -32,6 +31,14 @@
#include <string.h>
#include <math.h>
/* This is a hack.
* We want to include the same headers as gtktypefuncs.c but we are not
* allowed to include gtkx.h directly during GTK compilation.
* So....
*/
#undef GTK_COMPILATION
#include <gtk/gtkx.h>
#define GTK_COMPILATION
/**
* SECTION:gtktesting
......
......@@ -18,6 +18,10 @@
#ifndef __GTK_X_H__
#define __GTK_X_H__
#if defined (GTK_COMPILATION)
#error "<gtk/gtkx.h> must not be included by GTK+ headers."
#endif
#define __GTKX_H_INSIDE__
#include <gtk/gtk.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment