callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add this function, replacing the broken gtk_label_get ()

Browse Source 
2000-04-26  Havoc Pennington  <hp@redhat.com>

* gtk/gtklabel.c (gtk_label_get_text): Add this function,
replacing the broken gtk_label_get ()
This commit is contained in:
Havoc Pennington 2000-04-26 22:53:01 +00:00 committed by Havoc Pennington
parent 6b4e76ede6
commit ec60eb1baf
9 changed files with 58 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2000-04-26 Havoc Pennington <hp@redhat.com>
* gtk/gtklabel.c (gtk_label_get_text): Add this function,
replacing the broken gtk_label_get ()
2000-04-15 Havoc Pennington <hp@pobox.com> 2000-04-15 Havoc Pennington <hp@pobox.com>
* gdk/gdkdnd.h: clean up enum format, remove extra comma, * gdk/gdkdnd.h: clean up enum format, remove extra comma,

5
ChangeLog.pre-2-0
View File

@ -1,3 +1,8 @@
2000-04-26 Havoc Pennington <hp@redhat.com>
* gtk/gtklabel.c (gtk_label_get_text): Add this function,
replacing the broken gtk_label_get ()
2000-04-15 Havoc Pennington <hp@pobox.com> 2000-04-15 Havoc Pennington <hp@pobox.com>
* gdk/gdkdnd.h: clean up enum format, remove extra comma, * gdk/gdkdnd.h: clean up enum format, remove extra comma,

5
ChangeLog.pre-2-10
View File

@ -1,3 +1,8 @@
2000-04-26 Havoc Pennington <hp@redhat.com>
* gtk/gtklabel.c (gtk_label_get_text): Add this function,
replacing the broken gtk_label_get ()
2000-04-15 Havoc Pennington <hp@pobox.com> 2000-04-15 Havoc Pennington <hp@pobox.com>
* gdk/gdkdnd.h: clean up enum format, remove extra comma, * gdk/gdkdnd.h: clean up enum format, remove extra comma,

5
ChangeLog.pre-2-2
View File

@ -1,3 +1,8 @@
2000-04-26 Havoc Pennington <hp@redhat.com>
* gtk/gtklabel.c (gtk_label_get_text): Add this function,
replacing the broken gtk_label_get ()
2000-04-15 Havoc Pennington <hp@pobox.com> 2000-04-15 Havoc Pennington <hp@pobox.com>
* gdk/gdkdnd.h: clean up enum format, remove extra comma, * gdk/gdkdnd.h: clean up enum format, remove extra comma,

5
ChangeLog.pre-2-4
View File

@ -1,3 +1,8 @@
2000-04-26 Havoc Pennington <hp@redhat.com>
* gtk/gtklabel.c (gtk_label_get_text): Add this function,
replacing the broken gtk_label_get ()
2000-04-15 Havoc Pennington <hp@pobox.com> 2000-04-15 Havoc Pennington <hp@pobox.com>
* gdk/gdkdnd.h: clean up enum format, remove extra comma, * gdk/gdkdnd.h: clean up enum format, remove extra comma,

5
ChangeLog.pre-2-6
View File

@ -1,3 +1,8 @@
2000-04-26 Havoc Pennington <hp@redhat.com>
* gtk/gtklabel.c (gtk_label_get_text): Add this function,
replacing the broken gtk_label_get ()
2000-04-15 Havoc Pennington <hp@pobox.com> 2000-04-15 Havoc Pennington <hp@pobox.com>
* gdk/gdkdnd.h: clean up enum format, remove extra comma, * gdk/gdkdnd.h: clean up enum format, remove extra comma,

5
ChangeLog.pre-2-8
View File

@ -1,3 +1,8 @@
2000-04-26 Havoc Pennington <hp@redhat.com>
* gtk/gtklabel.c (gtk_label_get_text): Add this function,
replacing the broken gtk_label_get ()
2000-04-15 Havoc Pennington <hp@pobox.com> 2000-04-15 Havoc Pennington <hp@pobox.com>
* gdk/gdkdnd.h: clean up enum format, remove extra comma, * gdk/gdkdnd.h: clean up enum format, remove extra comma,

9
gtk/gtklabel.c
View File

@ -337,6 +337,15 @@ gtk_label_get (GtkLabel *label,
*str = label->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 static void
gtk_label_finalize (GtkObject *object) gtk_label_finalize (GtkObject *object)
{ {

8
gtk/gtklabel.h
View File

@ -69,7 +69,6 @@ struct _GtkLabelClass
GtkMiscClass parent_class; GtkMiscClass parent_class;
}; };
GtkType gtk_label_get_type (void); GtkType gtk_label_get_type (void);
GtkWidget *gtk_label_new (const char *str); GtkWidget *gtk_label_new (const char *str);
void gtk_label_set_text (GtkLabel *label, void gtk_label_set_text (GtkLabel *label,
@ -80,8 +79,7 @@ void gtk_label_set_pattern (GtkLabel *label,
const gchar *pattern); const gchar *pattern);
void gtk_label_set_line_wrap (GtkLabel *label, void gtk_label_set_line_wrap (GtkLabel *label,
gboolean wrap); gboolean wrap);
void gtk_label_get (GtkLabel *label, gchar * gtk_label_get_text (GtkLabel *label);
char **str);
/* Convenience function to set the name and pattern by parsing /* Convenience function to set the name and pattern by parsing
* a string with embedded underscores, and return the appropriate * 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 # define gtk_label_set gtk_label_set_text
#endif /* GTK_DISABLE_COMPAT_H */ #endif /* GTK_DISABLE_COMPAT_H */
/* Deprecated */
void gtk_label_get (GtkLabel *label,
char **str);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif /* __cplusplus */ #endif /* __cplusplus */