Fix includes

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

diff --git a/gtk/gtkcellrendereraccel.h b/gtk/gtkcellrendereraccel.h
index 6ec38299637cab3a2b247cf7023663a1b92fbd29..80391d7300192c7235b7f4e620443e6a9d94901c 100644 (file)
--- a/gtk/gtkcellrendereraccel.h
+++ b/gtk/gtkcellrendereraccel.h
@@ -1,4 +1,4 @@
-/* gtkcellrendererkeys.h
+/* gtkcellrendereraccel.h
  * Copyright (C) 2000  Red Hat, Inc.,  Jonathan Blandford <jrb@redhat.com>
  *
  * This library is free software; you can redistribute it and/or
@@ -12,63 +12,59 @@
  * Library General Public License for more details.
  *
  * You should have received a copy of the GNU Library General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef __GTK_CELL_RENDERER_KEYS_H__
-#define __GTK_CELL_RENDERER_KEYS_H__
+#ifndef __GTK_CELL_RENDERER_ACCEL_H__
+#define __GTK_CELL_RENDERER_ACCEL_H__
 
-#include "gtkcellrenderertext.h"
+#if !defined (__GTK_H_INSIDE__) && !defined (GTK_COMPILATION)
+#error "Only <gtk/gtk.h> can be included directly."
+#endif
+
+#include <gtk/gtkcellrenderertext.h>
 
 G_BEGIN_DECLS
 
-#define GTK_TYPE_CELL_RENDERER_KEYS            (gtk_cell_renderer_keys_get_type ())
-#define GTK_CELL_RENDERER_KEYS(obj)            (GTK_CHECK_CAST ((obj), GTK_TYPE_CELL_RENDERER_KEYS, GtkCellRendererKeys))
-#define GTK_CELL_RENDERER_KEYS_CLASS(klass)    (GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_CELL_RENDERER_KEYS, GtkCellRendererKeysClass))
-#define GTK_IS_CELL_RENDERER_KEYS(obj)         (GTK_CHECK_TYPE ((obj), GTK_TYPE_CELL_RENDERER_KEYS))
-#define GTK_IS_CELL_RENDERER_KEYS_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CELL_RENDERER_KEYS))
-#define GTK_CELL_RENDERER_KEYS_GET_CLASS(obj)   (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_CELL_RENDERER_KEYS, GtkCellRendererKeysClass))
+#define GTK_TYPE_CELL_RENDERER_ACCEL            (gtk_cell_renderer_accel_get_type ())
+#define GTK_CELL_RENDERER_ACCEL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GTK_TYPE_CELL_RENDERER_ACCEL, GtkCellRendererAccel))
+#define GTK_CELL_RENDERER_ACCEL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_CELL_RENDERER_ACCEL, GtkCellRendererAccelClass))
+#define GTK_IS_CELL_RENDERER_ACCEL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GTK_TYPE_CELL_RENDERER_ACCEL))
+#define GTK_IS_CELL_RENDERER_ACCEL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CELL_RENDERER_ACCEL))
+#define GTK_CELL_RENDERER_ACCEL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_CELL_RENDERER_ACCEL, GtkCellRendererAccelClass))
 
-typedef struct _GtkCellRendererKeys      GtkCellRendererKeys;
-typedef struct _GtkCellRendererKeysClass GtkCellRendererKeysClass;
+typedef struct _GtkCellRendererAccel              GtkCellRendererAccel;
+typedef struct _GtkCellRendererAccelPrivate       GtkCellRendererAccelPrivate;
+typedef struct _GtkCellRendererAccelClass         GtkCellRendererAccelClass;
 
 
 typedef enum
 {
-  GTK_CELL_RENDERER_KEYS_MODE_GTK,
-  GTK_CELL_RENDERER_KEYS_MODE_OTHER
-} GtkCellRendererKeysMode;
+  GTK_CELL_RENDERER_ACCEL_MODE_GTK,
+  GTK_CELL_RENDERER_ACCEL_MODE_OTHER
+} GtkCellRendererAccelMode;
 
 
-struct _GtkCellRendererKeys
+struct _GtkCellRendererAccel
 {
   GtkCellRendererText parent;
 
   /*< private >*/
-  guint accel_key;
-  GdkModifierType accel_mods;
-  guint keycode;
-  GtkCellRendererKeysMode accel_mode;
-
-  GtkWidget *edit_widget;
-  GtkWidget *grab_widget;
-  GtkWidget *sizing_label;
+  GtkCellRendererAccelPrivate *priv;
 };
 
-struct _GtkCellRendererKeysClass
+struct _GtkCellRendererAccelClass
 {
   GtkCellRendererTextClass parent_class;
 
-  void (* accel_edited)  (GtkCellRendererKeys *keys,
-                         const gchar         *path_string,
-                         guint                accel_key,
-                         GdkModifierType      accel_mods,
-                         guint                hardware_keycode);
+  void (* accel_edited)  (GtkCellRendererAccel *accel,
+                         const gchar          *path_string,
+                         guint                 accel_key,
+                         GdkModifierType       accel_mods,
+                         guint                 hardware_keycode);
 
-  void (* accel_cleared) (GtkCellRendererKeys *keys,
-                         const gchar         *path_string);
+  void (* accel_cleared) (GtkCellRendererAccel *accel,
+                         const gchar          *path_string);
 
   /* Padding for future expansion */
   void (*_gtk_reserved0) (void);
@@ -78,11 +74,11 @@ struct _GtkCellRendererKeysClass
   void (*_gtk_reserved4) (void);
 };
 
-GType            gtk_cell_renderer_keys_get_type        (void) G_GNUC_CONST;
-GtkCellRenderer *gtk_cell_renderer_keys_new             (void);
+GType            gtk_cell_renderer_accel_get_type        (void) G_GNUC_CONST;
+GtkCellRenderer *gtk_cell_renderer_accel_new             (void);
 
 
 G_END_DECLS
 
 
-#endif /* __GTK_CELL_RENDERER_KEYS_H__ */
+#endif /* __GTK_CELL_RENDERER_ACCEL_H__ */