gtk/gtkprogressbar.c (gtk_progress_bar_set_text): Move the setting

of use_text_format to the end of the function. (#56447)
This commit is contained in:
Matthias Clasen 2001-08-28 19:54:52 +00:00
parent a0c65ec21b
commit 2ffa754083
8 changed files with 38 additions and 3 deletions

View File

@ -1,3 +1,8 @@
Tue Aug 28 21:00:44 2001 Matthias Clasen <matthiasc@poet.de>
* gtk/gtkprogressbar.c (gtk_progress_bar_set_text): Move the setting
of use_text_format to the end of the function. (#56447)
Tue Aug 28 20:06:07 2001 Matthias Clasen <matthiasc@poet.de> Tue Aug 28 20:06:07 2001 Matthias Clasen <matthiasc@poet.de>
* demos/testpixbuf.c (update_timeout): Use gdk_pixbuf_loader_get_pixbuf * demos/testpixbuf.c (update_timeout): Use gdk_pixbuf_loader_get_pixbuf

View File

@ -1,3 +1,8 @@
Tue Aug 28 21:00:44 2001 Matthias Clasen <matthiasc@poet.de>
* gtk/gtkprogressbar.c (gtk_progress_bar_set_text): Move the setting
of use_text_format to the end of the function. (#56447)
Tue Aug 28 20:06:07 2001 Matthias Clasen <matthiasc@poet.de> Tue Aug 28 20:06:07 2001 Matthias Clasen <matthiasc@poet.de>
* demos/testpixbuf.c (update_timeout): Use gdk_pixbuf_loader_get_pixbuf * demos/testpixbuf.c (update_timeout): Use gdk_pixbuf_loader_get_pixbuf

View File

@ -1,3 +1,8 @@
Tue Aug 28 21:00:44 2001 Matthias Clasen <matthiasc@poet.de>
* gtk/gtkprogressbar.c (gtk_progress_bar_set_text): Move the setting
of use_text_format to the end of the function. (#56447)
Tue Aug 28 20:06:07 2001 Matthias Clasen <matthiasc@poet.de> Tue Aug 28 20:06:07 2001 Matthias Clasen <matthiasc@poet.de>
* demos/testpixbuf.c (update_timeout): Use gdk_pixbuf_loader_get_pixbuf * demos/testpixbuf.c (update_timeout): Use gdk_pixbuf_loader_get_pixbuf

View File

@ -1,3 +1,8 @@
Tue Aug 28 21:00:44 2001 Matthias Clasen <matthiasc@poet.de>
* gtk/gtkprogressbar.c (gtk_progress_bar_set_text): Move the setting
of use_text_format to the end of the function. (#56447)
Tue Aug 28 20:06:07 2001 Matthias Clasen <matthiasc@poet.de> Tue Aug 28 20:06:07 2001 Matthias Clasen <matthiasc@poet.de>
* demos/testpixbuf.c (update_timeout): Use gdk_pixbuf_loader_get_pixbuf * demos/testpixbuf.c (update_timeout): Use gdk_pixbuf_loader_get_pixbuf

View File

@ -1,3 +1,8 @@
Tue Aug 28 21:00:44 2001 Matthias Clasen <matthiasc@poet.de>
* gtk/gtkprogressbar.c (gtk_progress_bar_set_text): Move the setting
of use_text_format to the end of the function. (#56447)
Tue Aug 28 20:06:07 2001 Matthias Clasen <matthiasc@poet.de> Tue Aug 28 20:06:07 2001 Matthias Clasen <matthiasc@poet.de>
* demos/testpixbuf.c (update_timeout): Use gdk_pixbuf_loader_get_pixbuf * demos/testpixbuf.c (update_timeout): Use gdk_pixbuf_loader_get_pixbuf

View File

@ -1,3 +1,8 @@
Tue Aug 28 21:00:44 2001 Matthias Clasen <matthiasc@poet.de>
* gtk/gtkprogressbar.c (gtk_progress_bar_set_text): Move the setting
of use_text_format to the end of the function. (#56447)
Tue Aug 28 20:06:07 2001 Matthias Clasen <matthiasc@poet.de> Tue Aug 28 20:06:07 2001 Matthias Clasen <matthiasc@poet.de>
* demos/testpixbuf.c (update_timeout): Use gdk_pixbuf_loader_get_pixbuf * demos/testpixbuf.c (update_timeout): Use gdk_pixbuf_loader_get_pixbuf

View File

@ -1,3 +1,8 @@
Tue Aug 28 21:00:44 2001 Matthias Clasen <matthiasc@poet.de>
* gtk/gtkprogressbar.c (gtk_progress_bar_set_text): Move the setting
of use_text_format to the end of the function. (#56447)
Tue Aug 28 20:06:07 2001 Matthias Clasen <matthiasc@poet.de> Tue Aug 28 20:06:07 2001 Matthias Clasen <matthiasc@poet.de>
* demos/testpixbuf.c (update_timeout): Use gdk_pixbuf_loader_get_pixbuf * demos/testpixbuf.c (update_timeout): Use gdk_pixbuf_loader_get_pixbuf

View File

@ -907,9 +907,6 @@ gtk_progress_bar_set_text (GtkProgressBar *pbar,
{ {
g_return_if_fail (GTK_IS_PROGRESS_BAR (pbar)); g_return_if_fail (GTK_IS_PROGRESS_BAR (pbar));
/* We don't support formats in this interface */
GTK_PROGRESS (pbar)->use_text_format = FALSE;
if (text && *text) if (text && *text)
{ {
gtk_progress_set_show_text (GTK_PROGRESS (pbar), TRUE); gtk_progress_set_show_text (GTK_PROGRESS (pbar), TRUE);
@ -921,6 +918,9 @@ gtk_progress_bar_set_text (GtkProgressBar *pbar,
gtk_progress_set_format_string (GTK_PROGRESS (pbar), ""); gtk_progress_set_format_string (GTK_PROGRESS (pbar), "");
} }
/* We don't support formats in this interface */
GTK_PROGRESS (pbar)->use_text_format = FALSE;
g_object_notify (G_OBJECT (pbar), "text"); g_object_notify (G_OBJECT (pbar), "text");
} }