diff options
| author | Tim Janik <timj@gtk.org> | 2001-03-22 13:44:00 +0000 |
|---|---|---|
| committer | Tim Janik <timj@src.gnome.org> | 2001-03-22 13:44:00 +0000 |
| commit | c2c98d9e120a0ed4493c7743c9e79ef5b71fb5b1 (patch) | |
| tree | 5ffef2868ce1715172daaee09aaaabe0a069ab50 /gtk/gtklabel.h | |
| parent | 6e58fd1ee3fe8916a89480fb3454f3f02397aab6 (diff) | |
| download | gtk+-c2c98d9e120a0ed4493c7743c9e79ef5b71fb5b1.tar.gz | |
some cleanups, fixed mnemonic_widget handling, added PROP_MNEMONIC_WIDGET.
Thu Mar 22 13:01:44 2001 Tim Janik <timj@gtk.org>
* gtk/gtklabel.[hc]: some cleanups, fixed mnemonic_widget handling,
added PROP_MNEMONIC_WIDGET.
* gtk/gtkwindow.c (gtk_window_activate_mnemonic):
(gtk_window_remove_mnemonic):
(gtk_window_add_mnemonic): fixed assertions.
(gtk_window_activate_mnemonic): constrain modifier checks to those
permitted by gtk_accelerator_get_default_mod_mask().
got rid of gtk_window_get_default_accel_group().
* gtk/gtkwidget.c (gtk_widget_real_activate_mnemonic): handle non
activatable widgets either by focussing or a warning.
added a signal accumulator to ::activate_mnemonic which stops the
emission once a handler returned TRUE.
Diffstat (limited to 'gtk/gtklabel.h')
| -rw-r--r-- | gtk/gtklabel.h | 72 |
1 files changed, 32 insertions, 40 deletions
diff --git a/gtk/gtklabel.h b/gtk/gtklabel.h index 3e3d783e4a..bef1ca491e 100644 --- a/gtk/gtklabel.h +++ b/gtk/gtklabel.h @@ -79,46 +79,38 @@ struct _GtkLabelClass GtkMiscClass parent_class; }; -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); -void gtk_label_set_markup_with_mnemonic (GtkLabel *label, - const gchar *str); - -guint gtk_label_get_mnemonic_keyval (GtkLabel *label); -void gtk_label_set_justify (GtkLabel *label, - GtkJustification jtype); -void gtk_label_set_pattern (GtkLabel *label, - const gchar *pattern); -void gtk_label_set_line_wrap (GtkLabel *label, - gboolean wrap); - -void gtk_label_set_text_with_mnemonic (GtkLabel *label, - const gchar *string); -void gtk_label_set_mnemonic_widget (GtkLabel *label, - GtkWidget *widget); - -void gtk_label_set_selectable (GtkLabel *label, - gboolean setting); -gboolean gtk_label_get_selectable (GtkLabel *label); - -void gtk_label_select_region (GtkLabel *label, - gint start_offset, - gint end_offset); - -void gtk_label_get_layout_offsets (GtkLabel *label, - gint *x, - gint *y); +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); +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); +void gtk_label_set_text_with_mnemonic (GtkLabel *label, + const gchar *string); +void gtk_label_set_justify (GtkLabel *label, + GtkJustification jtype); +void gtk_label_set_pattern (GtkLabel *label, + const gchar *pattern); +void gtk_label_set_line_wrap (GtkLabel *label, + gboolean wrap); +void gtk_label_set_selectable (GtkLabel *label, + gboolean setting); +gboolean gtk_label_get_selectable (GtkLabel *label); +void gtk_label_select_region (GtkLabel *label, + gint start_offset, + gint end_offset); +void gtk_label_get_layout_offsets (GtkLabel *label, + gint *x, + gint *y); #ifndef GTK_DISABLE_COMPAT_H # define gtk_label_set gtk_label_set_text |