AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Make this function public. (#64792, Havoc Pennington)

Browse Source 
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)
This commit is contained in:
Matthias Clasen 2005-06-19 02:02:09 +00:00 committed by Matthias Clasen
parent 6db99a9b8f
commit 58a30d5f5a
8 changed files with 44 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -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

7
ChangeLog.pre-2-10
View File

@ -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

7
ChangeLog.pre-2-8
View File

@ -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

4
docs/reference/ChangeLog
View File

@ -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:

1
docs/reference/gtk/gtk-sections.txt
View File

@ -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

3
gtk/gtk.symbols
View File

@ -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

17
gtk/gtkimage.c
View File

@ -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));

1
gtk/gtkimage.h
View File

@ -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);