x11: Move remaining APIs into gdkx11utils.h

[~andy/gtk] / gtk / gtkthemes.h

diff --git a/gtk/gtkthemes.h b/gtk/gtkthemes.h
index 8185a7f82d14e1c2209c0a8c9ee5798929099ea7..91edccc1097a2bf8911f514b0a46f2d543551e29 100644 (file)
--- a/gtk/gtkthemes.h
+++ b/gtk/gtkthemes.h
@@ -2,7 +2,7 @@
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
  * Themes added by The Rasterman <raster@redhat.com>
- * 
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ -22,31 +22,31 @@
  * Modified by the GTK+ Team and others 1997-2000.  See the AUTHORS
  * file for a list of people on the GTK+ Team.  See the ChangeLog
  * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
  */
 
 #ifndef __GTK_THEMES_H__
 #define __GTK_THEMES_H__
 
-#include <gdk/gdk.h>
+
 #include <gtk/gtkstyle.h>
 #include <gtk/gtkwidget.h>
 
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
+
+G_BEGIN_DECLS
 
 #define GTK_TYPE_THEME_ENGINE             (gtk_theme_engine_get_type ())
 #define GTK_THEME_ENGINE(theme_engine)    (G_TYPE_CHECK_INSTANCE_CAST ((theme_engine), GTK_TYPE_THEME_ENGINE, GtkThemeEngine))
 #define GTK_IS_THEME_ENGINE(theme_engine) (G_TYPE_CHECK_INSTANCE_TYPE ((theme_engine), GTK_TYPE_THEME_ENGINE))
 
+#if !defined(GTK_DISABLE_DEPRECATED) || defined(GTK_COMPILATION)
+
 GType           gtk_theme_engine_get_type        (void) G_GNUC_CONST;
 GtkThemeEngine *gtk_theme_engine_get             (const gchar     *name);
 GtkRcStyle     *gtk_theme_engine_create_rc_style (GtkThemeEngine  *engine);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+#endif
 
+G_END_DECLS
 
 #endif /* __GTK_THEMES_H__ */