[gtk+] Simplify code a bit after xp support drop



commit bc1ac40d2a17b3daf902292bcaf4fcad4b564cdf
Author: Jose Rostagno <joserostagno vijona com ar>
Date:   Sun Apr 19 20:04:53 2015 -0300

    Simplify code a bit after xp support drop
    
    https://bugzilla.gnome.org/show_bug.cgi?id=748156

 gdk/win32/gdkcursor-win32.c  |   10 ++--------
 gdk/win32/gdkprivate-win32.h |    1 -
 2 files changed, 2 insertions(+), 9 deletions(-)
---
diff --git a/gdk/win32/gdkcursor-win32.c b/gdk/win32/gdkcursor-win32.c
index eb4a454..dd1d1ac 100644
--- a/gdk/win32/gdkcursor-win32.c
+++ b/gdk/win32/gdkcursor-win32.c
@@ -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)
 {
diff --git a/gdk/win32/gdkprivate-win32.h b/gdk/win32/gdkprivate-win32.h
index a14d8f5..e018371 100644
--- a/gdk/win32/gdkprivate-win32.h
+++ b/gdk/win32/gdkprivate-win32.h
@@ -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,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]