diff options
| author | Timm Bäder <mail@baedert.org> | 2018-03-27 11:04:23 +0200 |
|---|---|---|
| committer | Timm Bäder <mail@baedert.org> | 2018-03-27 18:20:52 +0200 |
| commit | 5c66f2ec196bb1e4f77e036a6764221fc12e6147 (patch) | |
| tree | 9329d9a7c394cf0514c065cf6babbad628b08253 /gtk | |
| parent | 331af6815be013c9b5be4e0fd35667bc34b0d6aa (diff) | |
| download | gtk+-5c66f2ec196bb1e4f77e036a6764221fc12e6147.tar.gz | |
accellabel: Stop saying it's a GtkLabel
And clean up the includes accordingly.
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/gtkaccellabel.c | 5 | ||||
| -rw-r--r-- | gtk/gtkaccellabel.h | 3 | ||||
| -rw-r--r-- | gtk/gtkmenuitem.c | 1 | ||||
| -rw-r--r-- | gtk/gtkmodelmenuitem.c | 1 |
4 files changed, 6 insertions, 4 deletions
diff --git a/gtk/gtkaccellabel.c b/gtk/gtkaccellabel.c index eb6956ea46..41c73a6f3a 100644 --- 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 1c5b6c6f6f..4c5a2cbf3c 100644 --- 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 6df94a0dca..a9b4c56812 100644 --- 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 88a0ad08fd..ffa8ad9635 100644 --- 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" |