accellabel: Stop saying it's a GtkLabel

And clean up the includes accordingly.

diff --git a/gtk/gtkaccellabel.c b/gtk/gtkaccellabel.c
index eb6956ea461c7aa05b856e155e3388f5c66f77ca..41c73a6f3a0adee27f5986d8c9f46e31c8a60e94 100644 (file)
--- a/gtk/gtkaccellabel.c
+++ b/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

diff --git a/gtk/gtkaccellabel.h b/gtk/gtkaccellabel.h
index 1c5b6c6f6f6dd316d324f0f8e008e0e6f50e6d30..4c5a2cbf3c2588206fef933776b41c79bf0798e4 100644 (file)
--- a/gtk/gtkaccellabel.h
+++ b/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
 

diff --git a/gtk/gtkmenuitem.c b/gtk/gtkmenuitem.c
index 6df94a0dcaa55ef73f52338f97fbdc572c9fda5e..a9b4c56812772c3fe46d5b42a6f4a0d7919e5a46 100644 (file)
--- a/gtk/gtkmenuitem.c
+++ b/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"

diff --git a/gtk/gtkmodelmenuitem.c b/gtk/gtkmodelmenuitem.c
index 88a0ad08fd121aee20bf68faf59b80a25b3cc35a..ffa8ad96352e48e49df807253664bfc4cf854588 100644 (file)
--- a/gtk/gtkmodelmenuitem.c
+++ b/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"