accellabel: Stop saying it's a GtkLabel

And clean up the includes accordingly.

gtk/gtkaccellabel.c

@@ -28,6 +28,7 @@
 #include "config.h"
 #include <string.h>
 
+#include "gtklabel.h"
 #include "gtkaccellabel.h"
 #include "gtkaccelmap.h"
 #include "gtkintl.h"
@@ -47,8 +48,8 @@
  * @Title: GtkAccelLabel
  * @See_also: #GtkAccelGroup
  *
- * The #GtkAccelLabel widget is a subclass of #GtkLabel that also displays an
- * accelerator key on the right of the label text, e.g. “Ctrl+S”.
+ * The #GtkAccelLabel is a widget that shows an accelerator next to a description
+ * of said accelerator, e.g. “Save Document Ctrl+S”.
  * It is commonly used in menus to show the keyboard short-cuts for commands.
  *
  * The accelerator key to display is typically not set explicitly (although it

gtk/gtkaccellabel.h

@@ -1,7 +1,6 @@
 /* GTK - The GIMP Toolkit
  * Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
  *
- * GtkAccelLabel: GtkLabel with accelerator monitoring facilities.
  * Copyright (C) 1998 Tim Janik
  *
  * This library is free software; you can redistribute it and/or
@@ -32,7 +31,7 @@
 #error "Only <gtk/gtk.h> can be included directly."
 #endif
 
-#include <gtk/gtklabel.h>
+#include <gtk/gtkwidget.h>
 
 G_BEGIN_DECLS
 

gtk/gtkmenuitem.c

@@ -27,6 +27,7 @@
 #include <string.h>
 
 #include "gtkaccellabel.h"
+#include "gtklabel.h"
 #include "gtkcontainerprivate.h"
 #include "gtkmain.h"
 #include "gtkmarshalers.h"

gtk/gtkmodelmenuitem.c

@@ -22,6 +22,7 @@
 #include "gtkmodelmenuitem.h"
 
 #include "gtkaccellabel.h"
+#include "gtklabel.h"
 #include "gtkcheckmenuitemprivate.h"
 #include "gtkimage.h"
 #include "gtkbox.h"