diff options
| author | Owen Taylor <otaylor@redhat.com> | 2002-09-23 22:57:13 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2002-09-23 22:57:13 +0000 |
| commit | 1b1f2458ea5f29305bbd589ac136be66a6db9337 (patch) | |
| tree | ddcea7bbcb3785d56b624a4fef4fee26068604ec /gtk/gtkprogress.c | |
| parent | 21f1b62d7eb01545b675e4134d8597857446ddc1 (diff) | |
| download | gtk+-1b1f2458ea5f29305bbd589ac136be66a6db9337.tar.gz | |
Restore back to the default format instead of an empty format.
Mon Sep 23 18:53:35 2002 Owen Taylor <otaylor@redhat.com>
* gtk/gtkprogressbar.c (gtk_progress_bar_set_text):
Restore back to the default format instead of an
empty format.
* gtk/gtkprogress.c (gtk_progress_set_format_string):
Make NULL restore back to the default format.
Diffstat (limited to 'gtk/gtkprogress.c')
| -rw-r--r-- | gtk/gtkprogress.c | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/gtk/gtkprogress.c b/gtk/gtkprogress.c index cd151ef997..41f09598a5 100644 --- a/gtk/gtkprogress.c +++ b/gtk/gtkprogress.c @@ -32,6 +32,7 @@ #include "gtkintl.h" #define EPSILON 1e-5 +#define DEFAULT_FORMAT "%P %%"; enum { PROP_0, @@ -221,7 +222,7 @@ gtk_progress_init (GtkProgress *progress) { progress->adjustment = NULL; progress->offscreen_pixmap = NULL; - progress->format = g_strdup ("%P %%"); + progress->format = g_strdup (DEFAULT_FORMAT); progress->x_align = 0.5; progress->y_align = 0.5; progress->show_text = FALSE; @@ -656,22 +657,25 @@ void gtk_progress_set_format_string (GtkProgress *progress, const gchar *format) { + gchar *old_format; + g_return_if_fail (GTK_IS_PROGRESS (progress)); /* Turn on format, in case someone called * gtk_progress_bar_set_text() and turned it off. */ progress->use_text_format = TRUE; - - if (format) - { - if (progress->format) - g_free (progress->format); - progress->format = g_strdup (format); - if (GTK_WIDGET_DRAWABLE (GTK_WIDGET (progress))) - gtk_widget_queue_resize (GTK_WIDGET (progress)); - } + old_format = progress->format; + + if (!format) + format = DEFAULT_FORMAT; + + progress->format = g_strdup (format); + g_free (old_format); + + if (GTK_WIDGET_DRAWABLE (GTK_WIDGET (progress))) + gtk_widget_queue_resize (GTK_WIDGET (progress)); } gchar * |