Commit bc1ac40d authored by Jose Rostagno's avatar Jose Rostagno Committed by Matthias Clasen

Simplify code a bit after xp support drop

https://bugzilla.gnome.org/show_bug.cgi?id=748156
parent b10d63c0
......@@ -484,7 +484,7 @@ _gdk_win32_display_supports_cursor_alpha (GdkDisplay *display)
{
g_return_val_if_fail (display == _gdk_display, FALSE);
return _gdk_win32_pixbuf_to_hicon_supports_alpha ();
return TRUE;
}
gboolean
......@@ -787,7 +787,7 @@ pixbuf_to_hicon (GdkPixbuf *pixbuf,
if (pixbuf == NULL)
return NULL;
if (_gdk_win32_pixbuf_to_hicon_supports_alpha() && gdk_pixbuf_get_has_alpha (pixbuf))
if (gdk_pixbuf_get_has_alpha (pixbuf))
success = pixbuf_to_hbitmaps_alpha_winxp (pixbuf, &ii.hbmColor, &ii.hbmMask);
else
success = pixbuf_to_hbitmaps_normal (pixbuf, &ii.hbmColor, &ii.hbmMask);
......@@ -818,12 +818,6 @@ _gdk_win32_pixbuf_to_hcursor (GdkPixbuf *pixbuf,
return pixbuf_to_hicon (pixbuf, FALSE, x_hotspot, y_hotspot);
}
gboolean
_gdk_win32_pixbuf_to_hicon_supports_alpha (void)
{
return TRUE;
}
HICON
gdk_win32_pixbuf_to_hicon_libgtk_only (GdkPixbuf *pixbuf)
{
......
......@@ -369,7 +369,6 @@ HICON _gdk_win32_pixbuf_to_hicon (GdkPixbuf *pixbuf);
HICON _gdk_win32_pixbuf_to_hcursor (GdkPixbuf *pixbuf,
gint x_hotspot,
gint y_hotspot);
gboolean _gdk_win32_pixbuf_to_hicon_supports_alpha (void);
/* GdkDisplay member functions */
GdkCursor *_gdk_win32_display_get_cursor_for_type (GdkDisplay *display,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment