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

API: remove gdk_window_set_icon()

Browse Source 
gdk_window_set_icon_list() now does everything gdk_window_set_icon()
used to do.
This commit is contained in:
Benjamin Otte
2010-08-12 04:48:06 +02:00
parent dceb149ca4
commit 6ef27387e0
6 changed files with 0 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/reference/gdk/gdk3-sections.txt
View File

@ -508,7 +508,6 @@ gdk_window_get_children
gdk_window_peek_children gdk_window_peek_children
gdk_window_get_events gdk_window_get_events
gdk_window_set_events gdk_window_set_events
gdk_window_set_icon
gdk_window_set_icon_name gdk_window_set_icon_name
gdk_window_set_transient_for gdk_window_set_transient_for
gdk_window_set_role gdk_window_set_role

1
gdk/gdk.symbols
View File

@ -714,7 +714,6 @@ gdk_window_set_override_redirect
gdk_window_set_accept_focus gdk_window_set_accept_focus
gdk_window_set_focus_on_map gdk_window_set_focus_on_map
gdk_window_set_icon_list gdk_window_set_icon_list
gdk_window_set_icon
gdk_window_set_icon_name gdk_window_set_icon_name
gdk_window_set_opacity gdk_window_set_opacity
gdk_window_iconify gdk_window_iconify

4
gdk/gdkwindow.h
View File

@ -767,10 +767,6 @@ GdkEventMask gdk_window_get_device_events (GdkWindow *window,
void gdk_window_set_icon_list (GdkWindow *window, void gdk_window_set_icon_list (GdkWindow *window,
GList *pixbufs); GList *pixbufs);
void gdk_window_set_icon (GdkWindow *window,
GdkWindow *icon_window,
GdkPixmap *pixmap,
GdkBitmap *mask);
void gdk_window_set_icon_name (GdkWindow *window, void gdk_window_set_icon_name (GdkWindow *window,
const gchar *name); const gchar *name);
void gdk_window_set_group (GdkWindow *window, void gdk_window_set_group (GdkWindow *window,

9
gdk/quartz/gdkwindow-quartz.c
View File

@ -2282,15 +2282,6 @@ gdk_window_set_focus_on_map (GdkWindow *window,
private->focus_on_map = focus_on_map != FALSE; private->focus_on_map = focus_on_map != FALSE;
} }
void
gdk_window_set_icon (GdkWindow *window,
GdkWindow *icon_window,
GdkPixmap *pixmap,
GdkBitmap *mask)
{
/* FIXME: Implement */
}
void void
gdk_window_set_icon_name (GdkWindow *window, gdk_window_set_icon_name (GdkWindow *window,
const gchar *name) const gchar *name)

11
gdk/win32/gdkwindow-win32.c
View File

@ -2283,17 +2283,6 @@ gdk_window_set_icon_list (GdkWindow *window,
impl->hicon_small = small_hicon; impl->hicon_small = small_hicon;
} }
void
gdk_window_set_icon (GdkWindow *window,
GdkWindow *icon_window,
GdkPixmap *pixmap,
GdkBitmap *mask)
{
g_return_if_fail (GDK_IS_WINDOW (window));
/* do nothing, use gdk_window_set_icon_list instead */
}
void void
gdk_window_set_icon_name (GdkWindow *window, gdk_window_set_icon_name (GdkWindow *window,
const gchar *name) const gchar *name)

23
gdk/x11/gdkwindow-x11.c
View File

@ -3787,29 +3787,6 @@ gdk_window_set_icon_list (GdkWindow *window,
gdk_window_update_icon (window, pixbufs); gdk_window_update_icon (window, pixbufs);
} }
/**
* gdk_window_set_icon:
* @window: a toplevel #GdkWindow
* @icon_window: a #GdkWindow to use for the icon, or %NULL to unset
* @pixmap: a #GdkPixmap to use as the icon, or %NULL to unset
* @mask: a 1-bit pixmap (#GdkBitmap) to use as mask for @pixmap, or %NULL to have none
*
* Sets the icon of @window as a pixmap or window. If using GTK+, investigate
* gtk_window_set_default_icon_list() first, and then gtk_window_set_icon_list()
* and gtk_window_set_icon(). If those don't meet your needs, look at
* gdk_window_set_icon_list(). Only if all those are too high-level do you
* want to fall back to gdk_window_set_icon().
*
**/
void
gdk_window_set_icon (GdkWindow *window,
GdkWindow *icon_window,
GdkPixmap *pixmap,
GdkBitmap *mask)
{
return;
}
static gboolean static gboolean
gdk_window_icon_name_set (GdkWindow *window) gdk_window_icon_name_set (GdkWindow *window)
{ {