Update to tk 8.5.19

2017-11-24 17:53:51 -06:00
parent 27e7dfc7da
commit c67b328f06
325 changed files with 12511 additions and 12047 deletions
--- a/win/tkWinMenu.c
+++ b/win/tkWinMenu.c
@@ -3205,7 +3205,7 @@ SetDefaults(
        int padding;
 #endif
    } nc;
-    OSVERSIONINFO os;
+    OSVERSIONINFOW os;

    /*
     * Set all of the default options. The loop will terminate when we run out
@@ -3225,8 +3225,8 @@ SetDefaults(

    nc.metrics.cbSize = sizeof(nc);

-    os.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
-    GetVersionEx(&os);
+    os.dwOSVersionInfoSize = sizeof(OSVERSIONINFOW);
+    GetVersionExW(&os);
    if (os.dwMajorVersion < 6) {
 	nc.metrics.cbSize -= sizeof(int);
    }