diff options
| author | Chun-wei Fan <fanchunwei@src.gnome.org> | 2015-04-15 17:17:06 +0800 |
|---|---|---|
| committer | Chun-wei Fan <fanchunwei@src.gnome.org> | 2015-04-17 11:23:39 +0800 |
| commit | 24d3f3fcb2894df110a17317260b8705d68d22ec (patch) | |
| tree | db62f525bd3d5c96b09e769d39e2f76279f89fe5 | |
| parent | 740bcf5fe0ff9dd25856e5d000faff80bcf44eea (diff) | |
| download | gtk+-24d3f3fcb2894df110a17317260b8705d68d22ec.tar.gz | |
gdk-win32: Clean Up A Bit
As GLib dropped XP support some time ago [1][2], and the current git master already
depends on a GLib release that is well after it dropped XP support, clean
up the code a bit as we are assured that the code will run on XP and later,
plus, we are dropping XP support during this cycle (i.e. very soon).
https://bugzilla.gnome.org/show_bug.cgi?id=741849
[1]: https://git.gnome.org/browse/glib/commit/?id=80c24d36f2525d83e458ebbdf62fdbd085945a02
[2]: https://git.gnome.org/browse/glib/commit/?id=731b46990896665a8107535080bb075a6e18b6f7
| -rw-r--r-- | gdk/win32/gdkcursor-win32.c | 17 | ||||
| -rw-r--r-- | gdk/win32/gdkwindow-win32.c | 8 |
2 files changed, 3 insertions, 22 deletions
diff --git a/gdk/win32/gdkcursor-win32.c b/gdk/win32/gdkcursor-win32.c index 28b2745266..eb4a454228 100644 --- a/gdk/win32/gdkcursor-win32.c +++ b/gdk/win32/gdkcursor-win32.c @@ -821,22 +821,7 @@ _gdk_win32_pixbuf_to_hcursor (GdkPixbuf *pixbuf, gboolean _gdk_win32_pixbuf_to_hicon_supports_alpha (void) { - static gboolean is_win_xp=FALSE, is_win_xp_checked=FALSE; - - if (!is_win_xp_checked) - { - OSVERSIONINFO version; - - is_win_xp_checked = TRUE; - - memset (&version, 0, sizeof (version)); - version.dwOSVersionInfoSize = sizeof (version); - is_win_xp = GetVersionEx (&version) - && version.dwPlatformId == VER_PLATFORM_WIN32_NT - && (version.dwMajorVersion > 5 - || (version.dwMajorVersion == 5 && version.dwMinorVersion >= 1)); - } - return is_win_xp; + return TRUE; } HICON diff --git a/gdk/win32/gdkwindow-win32.c b/gdk/win32/gdkwindow-win32.c index 3e568a4a99..da85ded5e2 100644 --- a/gdk/win32/gdkwindow-win32.c +++ b/gdk/win32/gdkwindow-win32.c @@ -375,12 +375,8 @@ RegisterGdkClass (GdkWindowType wtype, GdkWindowTypeHint wtype_hint) { wcl.lpszClassName = L"gdkWindowTempShadow"; wcl.style |= CS_SAVEBITS; - if (LOBYTE (g_win32_get_windows_version()) > 0x05 || - LOWORD (g_win32_get_windows_version()) == 0x0105) - { - /* Windows XP (5.1) or above */ - wcl.style |= 0x00020000; /* CS_DROPSHADOW */ - } + wcl.style |= 0x00020000; /* CS_DROPSHADOW */ + ONCE_PER_CLASS (); klassTEMPSHADOW = RegisterClassExW (&wcl); } |