Renamed GtkCellRendererKeys to GtkCellRendererAccel to be consistent with

2005-09-22  Michael Natterer  <mitch@imendio.com>

	Renamed GtkCellRendererKeys to GtkCellRendererAccel to be
	consistent with GTK+ terminology:

	* gtk/gtkcellrendererkeys.[ch]
	* tests/testkeys.c: removed...

	* gtk/gtkcellrendereraccel.[ch]
	* tests/testaccel.c: ...and added.

	* gtk/Makefile.am
	* gtk/gtk.h
	* gtk/gtk.symbols
	* tests/Makefile.am: changed accordingly.

1 files changed, 27 insertions, 27 deletions

diff --git a/gtk/gtkcellrendereraccel.h b/gtk/gtkcellrendereraccel.h
index 6ec3829963..d9fd1d1108 100644
--- 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
@@ -17,32 +17,32 @@
  * Boston, MA 02111-1307, USA.
  */
 
-#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"
 
 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)		(GTK_CHECK_CAST ((obj), GTK_TYPE_CELL_RENDERER_ACCEL, GtkCellRendererAccel))
+#define GTK_CELL_RENDERER_ACCEL_CLASS(klass)	(GTK_CHECK_CLASS_CAST ((klass), GTK_TYPE_CELL_RENDERER_ACCEL, GtkCellRendererAccelClass))
+#define GTK_IS_CELL_RENDERER_ACCEL(obj)		(GTK_CHECK_TYPE ((obj), GTK_TYPE_CELL_RENDERER_ACCEL))
+#define GTK_IS_CELL_RENDERER_ACCEL_CLASS(klass)	(GTK_CHECK_CLASS_TYPE ((klass), GTK_TYPE_CELL_RENDERER_ACCEL))
+#define GTK_CELL_RENDERER_ACCEL_GET_CLASS(obj)   (GTK_CHECK_GET_CLASS ((obj), GTK_TYPE_CELL_RENDERER_ACCEL, GtkCellRendererAccelClass))
 
-typedef struct _GtkCellRendererKeys      GtkCellRendererKeys;
-typedef struct _GtkCellRendererKeysClass GtkCellRendererKeysClass;
+typedef struct _GtkCellRendererAccel      GtkCellRendererAccel;
+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;
 
@@ -50,25 +50,25 @@ struct _GtkCellRendererKeys
   guint accel_key;
   GdkModifierType accel_mods;
   guint keycode;
-  GtkCellRendererKeysMode accel_mode;
+  GtkCellRendererAccelMode accel_mode;
 
   GtkWidget *edit_widget;
   GtkWidget *grab_widget;
   GtkWidget *sizing_label;
 };
 
-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 +78,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__ */