# HG changeset patch
# User bsmith@81767d24-ef19-dc11-ae90-00e081727c95
# Date 1323034166 0
# Node ID 0676561865acaeab4d39ba776835b318ecabeef3
# Parent  cfc7af97c295b3683c3734c396348393490aaf55
Better extra border values for bitmap buttons on Windows.
Visual C Makefile warning removal.

diff -r cfc7af97c295 -r 0676561865ac makefile.vc
--- a/makefile.vc	Sun Dec 04 20:18:50 2011 +0000
+++ b/makefile.vc	Sun Dec 04 21:29:26 2011 +0000
@@ -113,7 +113,7 @@
 $(OBJS2) $(RES)
 $(LIBS)
 <<
-	lib /def:$(DEFFILE2) /out:dwcompat.lib
+	lib /def:$(DEFFILE2) /machine:$(TARGET_CPU) /out:dwcompat.lib
 	mt.exe /manifest dwcompat.dll.manifest /outputresource:dwcompat.dll;2
         copy dwcompat.lib $(DWLIBDIR)\dwcompat.lib
         copy dwcompat.dll $(DWDLLDIR)\dwcompat.dll
diff -r cfc7af97c295 -r 0676561865ac win/dw.c
--- a/win/dw.c	Sun Dec 04 20:18:50 2011 +0000
+++ b/win/dw.c	Sun Dec 04 21:29:26 2011 +0000
@@ -4433,8 +4433,8 @@
       /* Bitmap buttons */
       if(hbm)
       {
-         extrawidth = 2;
-         extraheight = 2;
+         extrawidth = 5;
+         extraheight = 5;
       }
       /* Checkbox or radio button */
       else if(style & BS_AUTOCHECKBOX || style & BS_AUTORADIOBUTTON)