diff win/dw.c @ 1842:123d1a900f54

More MINGW cleanups... eliminate a few more warnings and disable the unused-value warning due to unfixable warnings generated by the Win32 macros.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Tue, 20 Nov 2012 20:42:06 +0000
parents 22225eb286e5
children 905f8632005b
line wrap: on
line diff
--- a/win/dw.c	Tue Nov 20 05:09:30 2012 +0000
+++ b/win/dw.c	Tue Nov 20 20:42:06 2012 +0000
@@ -1865,7 +1865,7 @@
                         WCHAR uc[2] = { 0 };
                         
                         uc[0] = (WCHAR)mp1;
-                        utf8 = WideToUTF8(uc);
+                        utf8 = WideToUTF8(&uc[0]);
 #endif                        
                         
                         if(GetAsyncKeyState(VK_SHIFT) & 0x8000)
@@ -9174,7 +9174,6 @@
 {
    int z;
    static HWND lasthwnd = NULL;
-   HIMAGELIST himl;
 
    /* We can't add an invalid handle */
    if(!hicon)
@@ -9194,12 +9193,12 @@
          ImageList_AddIcon(hLarge, hicon);
          if(type)
          {
-            himl = TreeView_SetImageList(handle, hSmall, TVSIL_NORMAL);
+            TreeView_SetImageList(handle, hSmall, TVSIL_NORMAL);
          }
          else
          {
-            himl = ListView_SetImageList(handle, hSmall, LVSIL_SMALL);
-            himl = ListView_SetImageList(handle, hLarge, LVSIL_NORMAL);
+            ListView_SetImageList(handle, hSmall, LVSIL_SMALL);
+            ListView_SetImageList(handle, hLarge, LVSIL_NORMAL);
          }
          lasthwnd = handle;
          return z;
@@ -9211,12 +9210,12 @@
          {
             if(type)
             {
-               himl = TreeView_SetImageList(handle, hSmall, TVSIL_NORMAL);
+               TreeView_SetImageList(handle, hSmall, TVSIL_NORMAL);
             }
             else
             {
-               himl = ListView_SetImageList(handle, hSmall, LVSIL_SMALL);
-               himl = ListView_SetImageList(handle, hLarge, LVSIL_NORMAL);
+               ListView_SetImageList(handle, hSmall, LVSIL_SMALL);
+               ListView_SetImageList(handle, hLarge, LVSIL_NORMAL);
             }
             lasthwnd = handle;
          }