diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2005-06-19 02:02:09 +0000 |
|---|---|---|
| committer | Matthias Clasen <matthiasc@src.gnome.org> | 2005-06-19 02:02:09 +0000 |
| commit | 58a30d5f5ab308e0a20abfdebcdff5cb5b90eba3 (patch) | |
| tree | e6b6dc96c552367905adf65048df990d7d68811f | |
| parent | 6db99a9b8f0eb572ebef2b382c3d29d25fec5626 (diff) | |
| download | gdk-pixbuf-58a30d5f5ab308e0a20abfdebcdff5cb5b90eba3.tar.gz | |
Make this function public. (#64792, Havoc Pennington)
2005-06-18 Matthias Clasen <mclasen@redhat.com>
* gtk/gtk.symbols:
* gtk/gtkimage.h:
* gtk/gtkimage.c (gtk_image_clear): Make this function
public. (#64792, Havoc Pennington)
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 7 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 7 | ||||
| -rw-r--r-- | docs/reference/ChangeLog | 4 | ||||
| -rw-r--r-- | docs/reference/gtk/gtk-sections.txt | 1 | ||||
| -rw-r--r-- | gtk/gtk.symbols | 3 | ||||
| -rw-r--r-- | gtk/gtkimage.c | 17 | ||||
| -rw-r--r-- | gtk/gtkimage.h | 1 |
8 files changed, 44 insertions, 3 deletions
@@ -1,3 +1,10 @@ +2005-06-18 Matthias Clasen <mclasen@redhat.com> + + * gtk/gtk.symbols: + * gtk/gtkimage.h: + * gtk/gtkimage.c (gtk_image_clear): Make this function + public. (#64792, Havoc Pennington) + 2005-06-18 Kristian Rietveld <kris@gtk.org> * gtk/gtktreeview.c (gtk_tree_view_bin_expose): undo merging diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 5f7191907..98ecaf807 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,10 @@ +2005-06-18 Matthias Clasen <mclasen@redhat.com> + + * gtk/gtk.symbols: + * gtk/gtkimage.h: + * gtk/gtkimage.c (gtk_image_clear): Make this function + public. (#64792, Havoc Pennington) + 2005-06-18 Kristian Rietveld <kris@gtk.org> * gtk/gtktreeview.c (gtk_tree_view_bin_expose): undo merging diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 5f7191907..98ecaf807 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,10 @@ +2005-06-18 Matthias Clasen <mclasen@redhat.com> + + * gtk/gtk.symbols: + * gtk/gtkimage.h: + * gtk/gtkimage.c (gtk_image_clear): Make this function + public. (#64792, Havoc Pennington) + 2005-06-18 Kristian Rietveld <kris@gtk.org> * gtk/gtktreeview.c (gtk_tree_view_bin_expose): undo merging diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog index 84c4b391c..42d5fdcd5 100644 --- a/docs/reference/ChangeLog +++ b/docs/reference/ChangeLog @@ -1,3 +1,7 @@ +2005-06-18 Matthias Clasen <mclasen@redhat.com> + + * gtk/gtk-sections.txt: Updates + 2005-06-17 Matthias Clasen <mclasen@redhat.com> * gtk/gtk-sections.txt: diff --git a/docs/reference/gtk/gtk-sections.txt b/docs/reference/gtk/gtk-sections.txt index d44124d30..7b9e50a8b 100644 --- a/docs/reference/gtk/gtk-sections.txt +++ b/docs/reference/gtk/gtk-sections.txt @@ -1727,6 +1727,7 @@ gtk_image_set_from_pixmap gtk_image_set_from_stock gtk_image_set_from_animation gtk_image_set_from_icon_name +gtk_image_clear gtk_image_new gtk_image_set gtk_image_get diff --git a/gtk/gtk.symbols b/gtk/gtk.symbols index 9fa563c28..2dec3cfa3 100644 --- a/gtk/gtk.symbols +++ b/gtk/gtk.symbols @@ -1718,6 +1718,7 @@ gtk_icon_view_create_drag_icon gtk_image_get gtk_image_set #endif +gtk_image_clear gtk_image_get_animation gtk_image_get_icon_name gtk_image_get_icon_set @@ -2656,10 +2657,12 @@ gtk_signal_newv #if IN_HEADER(__GTK_SIZE_GROUP_H__) #if IN_FILE(__GTK_SIZE_GROUP_C__) gtk_size_group_add_widget +gtk_size_group_get_ignore_hidden gtk_size_group_get_mode gtk_size_group_get_type G_GNUC_CONST gtk_size_group_new gtk_size_group_remove_widget +gtk_size_group_set_ignore_hidden gtk_size_group_set_mode #endif #endif diff --git a/gtk/gtkimage.c b/gtk/gtkimage.c index 834c32867..40f196f29 100644 --- a/gtk/gtkimage.c +++ b/gtk/gtkimage.c @@ -65,7 +65,6 @@ static void gtk_image_style_set (GtkWidget *widget, static void gtk_image_screen_changed (GtkWidget *widget, GdkScreen *prev_screen); static void gtk_image_destroy (GtkObject *object); -static void gtk_image_clear (GtkImage *image); static void gtk_image_reset (GtkImage *image); static void gtk_image_calc_size (GtkImage *image); @@ -1839,10 +1838,22 @@ gtk_image_expose (GtkWidget *widget, return FALSE; } -static void +/** + * gtk_image_clear: + * @image: a #GtkImage + * + * Resets the image to be empty. + * + * Since: 2.8 + */ +void gtk_image_clear (GtkImage *image) { - GtkImagePrivate *priv = GTK_IMAGE_GET_PRIVATE (image); + GtkImagePrivate *priv; + + g_return_if_fail (GTK_IS_IMAGE (image)); + + priv = GTK_IMAGE_GET_PRIVATE (image); g_object_freeze_notify (G_OBJECT (image)); diff --git a/gtk/gtkimage.h b/gtk/gtkimage.h index 701fe2d29..e1b061cca 100644 --- a/gtk/gtkimage.h +++ b/gtk/gtkimage.h @@ -162,6 +162,7 @@ GtkWidget* gtk_image_new_from_animation (GdkPixbufAnimation *animation); GtkWidget* gtk_image_new_from_icon_name (const gchar *icon_name, GtkIconSize size); +void gtk_image_clear (GtkImage *image); void gtk_image_set_from_pixmap (GtkImage *image, GdkPixmap *pixmap, GdkBitmap *mask); |