Rename property to be more neutral

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

diff --git a/gtk/gtksettings.h b/gtk/gtksettings.h
index 8ada7118582881d39115ad8d54d2d1982c796e4a..9e6434a12e610997869af9be247b928381fa1fbe 100644 (file)
--- a/gtk/gtksettings.h
+++ b/gtk/gtksettings.h
@@ -15,14 +15,15 @@
  * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
+#ifndef __GTK_SETTINGS_H__
+#define __GTK_SETTINGS_H__
+
 #if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#ifndef __GTK_SETTINGS_H__
-#define __GTK_SETTINGS_H__
-
 #include <gdk/gdk.h>
+#include <gtk/gtktypes.h>
 
 G_BEGIN_DECLS
 
@@ -37,17 +38,11 @@ G_BEGIN_DECLS
 
 
 /* --- typedefs --- */
-typedef struct _GtkSettings GtkSettings;
 typedef struct _GtkSettingsPrivate GtkSettingsPrivate;
 typedef struct _GtkSettingsClass GtkSettingsClass;
 typedef struct _GtkSettingsValue GtkSettingsValue;
 
 
-typedef gboolean (*GtkRcPropertyParser) (const GParamSpec *pspec,
-                                         const GString    *rc_string,
-                                         GValue           *property_value);
-
-
 /* --- structures --- */
 struct _GtkSettings
 {