From ec60eb1baf8c1cf1f75c9cc00d5e19e28052c66e Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Wed, 26 Apr 2000 22:53:01 +0000 Subject: [PATCH] Add this function, replacing the broken gtk_label_get () 2000-04-26 Havoc Pennington * gtk/gtklabel.c (gtk_label_get_text): Add this function, replacing the broken gtk_label_get () --- ChangeLog | 5 +++++ ChangeLog.pre-2-0 | 5 +++++ ChangeLog.pre-2-10 | 5 +++++ ChangeLog.pre-2-2 | 5 +++++ ChangeLog.pre-2-4 | 5 +++++ ChangeLog.pre-2-6 | 5 +++++ ChangeLog.pre-2-8 | 5 +++++ gtk/gtklabel.c | 9 +++++++++ gtk/gtklabel.h | 26 ++++++++++++++------------ 9 files changed, 58 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index bbb60861e..089e43f21 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2000-04-26 Havoc Pennington + + * gtk/gtklabel.c (gtk_label_get_text): Add this function, + replacing the broken gtk_label_get () + 2000-04-15 Havoc Pennington * gdk/gdkdnd.h: clean up enum format, remove extra comma, diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index bbb60861e..089e43f21 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,8 @@ +2000-04-26 Havoc Pennington + + * gtk/gtklabel.c (gtk_label_get_text): Add this function, + replacing the broken gtk_label_get () + 2000-04-15 Havoc Pennington * gdk/gdkdnd.h: clean up enum format, remove extra comma, diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index bbb60861e..089e43f21 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,8 @@ +2000-04-26 Havoc Pennington + + * gtk/gtklabel.c (gtk_label_get_text): Add this function, + replacing the broken gtk_label_get () + 2000-04-15 Havoc Pennington * gdk/gdkdnd.h: clean up enum format, remove extra comma, diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index bbb60861e..089e43f21 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,8 @@ +2000-04-26 Havoc Pennington + + * gtk/gtklabel.c (gtk_label_get_text): Add this function, + replacing the broken gtk_label_get () + 2000-04-15 Havoc Pennington * gdk/gdkdnd.h: clean up enum format, remove extra comma, diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index bbb60861e..089e43f21 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,8 @@ +2000-04-26 Havoc Pennington + + * gtk/gtklabel.c (gtk_label_get_text): Add this function, + replacing the broken gtk_label_get () + 2000-04-15 Havoc Pennington * gdk/gdkdnd.h: clean up enum format, remove extra comma, diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index bbb60861e..089e43f21 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,8 @@ +2000-04-26 Havoc Pennington + + * gtk/gtklabel.c (gtk_label_get_text): Add this function, + replacing the broken gtk_label_get () + 2000-04-15 Havoc Pennington * gdk/gdkdnd.h: clean up enum format, remove extra comma, diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index bbb60861e..089e43f21 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,8 @@ +2000-04-26 Havoc Pennington + + * gtk/gtklabel.c (gtk_label_get_text): Add this function, + replacing the broken gtk_label_get () + 2000-04-15 Havoc Pennington * gdk/gdkdnd.h: clean up enum format, remove extra comma, diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c index 697f5e10b..0f16212b0 100644 --- a/gtk/gtklabel.c +++ b/gtk/gtklabel.c @@ -337,6 +337,15 @@ gtk_label_get (GtkLabel *label, *str = label->label; } +gchar * +gtk_label_get_text (GtkLabel *label) +{ + g_return_val_if_fail (label != NULL, NULL); + g_return_val_if_fail (GTK_IS_LABEL (label), NULL); + + return g_strdup (label->label); +} + static void gtk_label_finalize (GtkObject *object) { diff --git a/gtk/gtklabel.h b/gtk/gtklabel.h index 74fb70e90..0eb986698 100644 --- a/gtk/gtklabel.h +++ b/gtk/gtklabel.h @@ -69,19 +69,17 @@ struct _GtkLabelClass GtkMiscClass parent_class; }; - GtkType gtk_label_get_type (void); -GtkWidget* gtk_label_new (const char *str); -void gtk_label_set_text (GtkLabel *label, - const char *str); -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_get (GtkLabel *label, - char **str); +GtkWidget *gtk_label_new (const char *str); +void gtk_label_set_text (GtkLabel *label, + const char *str); +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); +gchar * gtk_label_get_text (GtkLabel *label); /* Convenience function to set the name and pattern by parsing * a string with embedded underscores, and return the appropriate @@ -95,6 +93,10 @@ guint gtk_label_parse_uline (GtkLabel *label, # define gtk_label_set gtk_label_set_text #endif /* GTK_DISABLE_COMPAT_H */ +/* Deprecated */ +void gtk_label_get (GtkLabel *label, + char **str); + #ifdef __cplusplus } #endif /* __cplusplus */ -- 2.43.2