summaryrefslogtreecommitdiff
path: root/gtk/gtklabel.h
diff options
context:
space:
mode:
authorAlexander Larsson <alexl@redhat.com>2001-03-05 14:08:42 +0000
committerAlexander Larsson <alexl@src.gnome.org>2001-03-05 14:08:42 +0000
commit8190728773257cf422700a907e92d95523175350 (patch)
tree8f61ea360cf58f5cdbfda64de57747c8e2a1e26d /gtk/gtklabel.h
parentf653e182e764cf14add9214dbe2eb5c0c2a0bdae (diff)
downloadgdk-pixbuf-8190728773257cf422700a907e92d95523175350.tar.gz
Convert from GtkArg to GParam (originally based on patch from Lee
2001-03-05 Alexander Larsson <alexl@redhat.com> * gtk/gtklabel.[ch]: Convert from GtkArg to GParam (originally based on patch from Lee Mallabone). New function gtk_label_get_accel_keyval () to get the underline accelerator of the label. Setting the label pattern overrides other attributes.
Diffstat (limited to 'gtk/gtklabel.h')
-rw-r--r--gtk/gtklabel.h14
1 files changed, 9 insertions, 5 deletions
diff --git a/gtk/gtklabel.h b/gtk/gtklabel.h
index 628567011..7a8caa416 100644
--- a/gtk/gtklabel.h
+++ b/gtk/gtklabel.h
@@ -54,15 +54,18 @@ struct _GtkLabel
GtkMisc misc;
/*< private >*/
-
- gchar *label;
- gchar *pattern;
-
+ gchar *label;
guint jtype : 2;
guint wrap : 1;
+ guint use_underline : 1;
+ guint use_markup : 1;
+
+ guint accel_keyval;
- PangoLayout *layout;
+ gchar *text;
PangoAttrList *attrs;
+
+ PangoLayout *layout;
GtkLabelSelectionInfo *select_info;
};
@@ -87,6 +90,7 @@ void gtk_label_set_markup (GtkLabel *label,
guint gtk_label_set_markup_with_accel (GtkLabel *label,
const gchar *str);
+guint gtk_label_get_accel_keyval (GtkLabel *label);
void gtk_label_set_justify (GtkLabel *label,
GtkJustification jtype);
void gtk_label_set_pattern (GtkLabel *label,