summaryrefslogtreecommitdiff
path: root/gtk/gtklabel.h
diff options
context:
space:
mode:
authorOwen Taylor <otaylor@redhat.com>2001-06-24 15:34:48 +0000
committerOwen Taylor <otaylor@src.gnome.org>2001-06-24 15:34:48 +0000
commitcc223eeff6d60f1b4ab77b09d3d6cdede6372916 (patch)
tree14c6426d96a95a70756dce3dd7154b9aeda15616 /gtk/gtklabel.h
parent5a5580a8e77dda9b7746012405f8e813a0e6c87b (diff)
downloadgtk+-cc223eeff6d60f1b4ab77b09d3d6cdede6372916.tar.gz
Fix stupid error introduced last night that was making things decidedly
Sun Jun 24 11:29:35 2001 Owen Taylor <otaylor@redhat.com> * gdk/x11/gdkimage-x11.c (gdk_image_new): Fix stupid error introduced last night that was making things decidedly not work. * gtk/*.[ch]: Patch from Kristian Rietveld adding 80 getters so that we have getter/setter pairing everywhere it makes sense. (#55767) * gtk/gtkradiobutton.[ch] gtk/gtktoolbar.c tests/testgtk.: Rename gtk_radio_button_group to gtk_radio_button_get_group, add a deprecated compat macro. (#55516) * gtk/gtklabel.[ch]: Add functions gtk_label_set/get_use_underline(), gtk_label_set/get_use_markup(), gtk_label_set_label(), which mirror the property API for GtkLabel. Make gtk_label_get_attributes() only reflect the attributes set by gtk_label_set_attributes. * gtk/gtknotebook.c (gtk_notebook_set_current_page) gtk/gtkcompat.h: Rename from gtk_notebook_set_page().
Diffstat (limited to 'gtk/gtklabel.h')
-rw-r--r--gtk/gtklabel.h34
1 files changed, 24 insertions, 10 deletions
diff --git a/gtk/gtklabel.h b/gtk/gtklabel.h
index 9181a3211c..5ba51e54fe 100644
--- a/gtk/gtklabel.h
+++ b/gtk/gtklabel.h
@@ -65,6 +65,7 @@ struct _GtkLabel
gchar *text;
PangoAttrList *attrs;
+ PangoAttrList *effective_attrs;
PangoLayout *layout;
@@ -80,28 +81,42 @@ struct _GtkLabelClass
};
GtkType gtk_label_get_type (void) G_GNUC_CONST;
-GtkWidget* gtk_label_new (const char *str);
-GtkWidget* gtk_label_new_with_mnemonic (const char *str);
-void gtk_label_set_text (GtkLabel *label,
- const char *str);
-G_CONST_RETURN gchar* gtk_label_get_text (GtkLabel *label);
-void gtk_label_set_attributes (GtkLabel *label,
- PangoAttrList *attrs);
-void gtk_label_set_markup (GtkLabel *label,
- const gchar *str);
+GtkWidget* gtk_label_new (const char *str);
+GtkWidget* gtk_label_new_with_mnemonic (const char *str);
+void gtk_label_set_text (GtkLabel *label,
+ const char *str);
+G_CONST_RETURN gchar* gtk_label_get_text (GtkLabel *label);
+void gtk_label_set_attributes (GtkLabel *label,
+ PangoAttrList *attrs);
+PangoAttrList *gtk_label_get_attributes (GtkLabel *label);
+void gtk_label_set_label (GtkLabel *label,
+ const gchar *str);
+G_CONST_RETURN gchar *gtk_label_get_label (GtkLabel *label);
+void gtk_label_set_markup (GtkLabel *label,
+ const gchar *str);
+void gtk_label_set_use_markup (GtkLabel *label,
+ gboolean setting);
+gboolean gtk_label_get_use_markup (GtkLabel *label);
+void gtk_label_set_use_underline (GtkLabel *label,
+ gboolean setting);
+gboolean gtk_label_get_use_underline (GtkLabel *label);
+
void gtk_label_set_markup_with_mnemonic (GtkLabel *label,
const gchar *str);
guint gtk_label_get_mnemonic_keyval (GtkLabel *label);
void gtk_label_set_mnemonic_widget (GtkLabel *label,
GtkWidget *widget);
+GtkWidget *gtk_label_get_mnemonic_widget (GtkLabel *label);
void gtk_label_set_text_with_mnemonic (GtkLabel *label,
const gchar *str);
void gtk_label_set_justify (GtkLabel *label,
GtkJustification jtype);
+GtkJustification gtk_label_get_justify (GtkLabel *label);
void gtk_label_set_pattern (GtkLabel *label,
const gchar *pattern);
void gtk_label_set_line_wrap (GtkLabel *label,
gboolean wrap);
+gboolean gtk_label_get_line_wrap (GtkLabel *label);
void gtk_label_set_selectable (GtkLabel *label,
gboolean setting);
gboolean gtk_label_get_selectable (GtkLabel *label);
@@ -118,7 +133,6 @@ void gtk_label_get_layout_offsets (GtkLabel *label,
gint *y);
-
#ifndef GTK_DISABLE_COMPAT_H
# define gtk_label_set gtk_label_set_text
#endif /* GTK_DISABLE_COMPAT_H */