From a783f14eff6efe67e37e4f9d4bdb62a364493923 Mon Sep 17 00:00:00 2001
From: Jonathan Westhues <jwesthues@cq.cx>
Date: Fri, 18 Jul 2008 01:50:52 -0800
Subject: [PATCH] Add an icon file (ugly, but at least it's not the default
 anymore). And add the manifest that gets us visual styles on the controls
 under Win32.

[git-p4: depot-paths = "//depot/solvespace/": change = 1844]
---
 Makefile           |  11 +++++++++--
 icon.ico           | Bin 0 -> 29926 bytes
 win32/manifest.xml |  22 ++++++++++++++++++++++
 win32/resource.rc  |   6 ++++++
 win32/w32main.cpp  |   6 ++++--
 5 files changed, 41 insertions(+), 4 deletions(-)
 create mode 100644 icon.ico
 create mode 100644 win32/manifest.xml
 create mode 100644 win32/resource.rc

diff --git a/Makefile b/Makefile
index 6330b2a8..da790f57 100644
--- a/Makefile
+++ b/Makefile
@@ -36,6 +36,8 @@ SSOBJS   = $(OBJDIR)\solvespace.obj \
            $(OBJDIR)\generate.obj \
            $(OBJDIR)\export.obj \
 
+RES = $(OBJDIR)\resource.res
+
 
 LIBS = user32.lib gdi32.lib comctl32.lib advapi32.lib opengl32.lib glu32.lib \
        extlib\libpng.lib extlib\zlib.lib
@@ -47,8 +49,8 @@ all: $(OBJDIR)/solvespace.exe
 clean:
 	rm -f obj/*
 
-$(OBJDIR)/solvespace.exe: $(SSOBJS) $(W32OBJS) $(FREEZE)
-    @$(CC) $(DEFINES) $(CFLAGS) -Fe$(OBJDIR)/solvespace.exe $(SSOBJS) $(W32OBJS) $(FREEZE) $(LIBS)
+$(OBJDIR)/solvespace.exe: $(SSOBJS) $(W32OBJS) $(FREEZE) $(RES)
+    @$(CC) $(DEFINES) $(CFLAGS) -Fe$(OBJDIR)/solvespace.exe $(SSOBJS) $(W32OBJS) $(FREEZE) $(RES) $(LIBS)
     editbin /nologo /STACK:8388608 $(OBJDIR)/solvespace.exe
     @echo solvespace.exe
 
@@ -60,3 +62,8 @@ $(W32OBJS): win32/$(@B).cpp $(HEADERS)
 
 $(FREEZE): ..\common\win32\$(@B).cpp $(HEADERS)
     @$(CC) $(CFLAGS) $(DEFINES) -c -Fo$(OBJDIR)/$(@B).obj ..\common\win32\$(@B).cpp
+
+$(RES): win32/$(@B).rc icon.ico
+	rc win32/$(@B).rc
+	mv win32/$(@B).res $(OBJDIR)/$(@B).res
+
diff --git a/icon.ico b/icon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..e545e2f2c09f809364be7fccca516a14cadd0813
GIT binary patch
literal 29926
zcmeI4zi%By5XUDFAp8hP8Waf$Jz0PvMM9CbCrEZpXKJcdI;e0*Qo5r)QKUnW{{<Jg
z0;D|AK^H<vfgD!|gz@p2y*JO7^X|R7_sj1&dr#jtx3e=lv$J!%dw2E|xg>ANojcc|
zm*w88B0q@8U{IC+cuC}=*F<jK9F;GLyz_?0_3Ksn7Uh#S1${yPiadH-<io3~KPq1l
z`T1SdugX8s{#Wm-epSBripa;eO@APdJ`nkiwkmzf$bI^m=?`T0b&<ck=?~=IWs$GH
z6uE`ZsLAI*`;j_IDdhp55`hPx<m5p(i8D$B4h{~GQ6ZJj$K(ij@1sKJ#g95OCG)>0
zdOSU&9nvF`A1QuW9$h`tNMKx8{<V02Gq-O9Y#y3|9;+?%QuOF<Rc|y*ddM3!zR^@W
z$A8QHVCN{zvE{MR@|%(UdC`Zh{b~9~?}Gf4RM(jS_ynx>I@6qM=Uol~?D^H4I|(Ak
zX(P?@**UT~H=cWWL35g>Z5?{KDXIvGSh+5vmz-W^0bFLso$&BEJJz1&Ia{`{r&{ei
zA7_vMVtiVr&dX9$(B$af>F^yrH8zp%dw!}q|1-Tl#yH_zaeTj&Be@pn$?tdN<lw%X
z{6k$6|5oy*S8q$tb)4B^hdFJj<7^|;q^Bb^9vvHviL@p5&$x0FKaQ>-rH3zz{K>t|
zvxgCUU&))^^Y<55@GX95OoyNV?19ArT>#4=d{6)n96(UY0zN2!2M(YtrH2m+z-C$;
zpg}1ed{6)n9KZ<cGkj104;;`{yDW#88Pens^&z4|*hmiHg93Qq01W(r4+`Lc0|?;{
zd{6)n96%9&;DZ8q-~f$b89tu^c;EmA@CObkfCmm>6o24@0(js6j!*?36u<)qDBur#
zPyi1cKmdQ>g93Qq0801+ALz#e2WSX?@D3Ef0|#gvf8c`xc;EmA@drLAfCmoX1S;@B
z0a$7A2R<krd{6)n9H0_^;0I6O^Kk$L{2@}H03J9%BlrU!6u<)qXc&Lsg93Qq0LJhK
zJ}7_(4&VSy!3PEKzyZGS2Y!eOe5ih?z#q&2O-oHdO*e$`2R_jB&{WW2rvV*G9X1^z
z9S#jW1^9GNL#W}>&}bO6%i2Bdin^^Xsyk|0&1jRVuA<83iUm)=KG*}hU<Yi2EwBM@
z%v($j4-bV^L-zOgWp8g!c6WDWXJ<#Yx3^_$YfCmZHsr<)>~geBLAfeNpjQOG4M%sC
z7frr<WR@&>yLNOiy;(ath?h0-%`WmmW^?m)XIT}@^6lYTz4)~In`?6fmKFiq2Teis
z0fg=^Q`DY28V#E+<c%8NXsVqT;`wC0PtEtK++F7T)O?@1g7>MD?pId5erd~T?RFxz
ziJx>oFsVNDW72*$*T+JCngW~MZ^cfP&hO0L^BC3bl0vspdRW=&16|nrrMyqc`;@#-
z$<Nc*<#{?gljzjlmmeA#t?tbRN2_*|t>x6CyoK{)&a6C7-^q+&@4*-I{yeW^c^%8^
zSYF4bS;v}d$E0$YcN=R*WX))<2{V_coA2%KXy)_xH-m7GlD~2Uas+Y&as+Y&x<;UW
zFHk>6U!Q&H;x@ilSj2f(KT~okpR)hm#w``suKbG@fBEITGKN$?XXST|b4sphKjypg
znsW0hr~K-{5AzK26-~r{TyJvoqdi=WimtW)%{*AQ{JCiUTYoIyt-L52&FCJ?lwaBZ
z)m?udKYm>HL28VZKkJcdJC#4b%5P;Kq}n%r_CKDdsrXym>eR+VbE?koa=z^N$9&5E
zPd^H=cq%XFPyD)S#%ub>SDMZCteoSY<KHE>EMJ;5=g<1(Pjd{rl)L0en@q|^pZrO+
z(S_gUTbH_&jqLyW<bP@myYRc@NSjQ`#=7KBTi<eBjzEq;jzEsU`bL2DNtdYbB6ljP
z|LCClDQf>$YE(m|@<xqsG}X=v@&Bg-jY{;;Ajg2PhB6F7tbWnFZ2x@XzwGyL%{*GR
zeao{kUH*IEaGjl({qv6hs@XSxY&@*IY?|$-=f6Jh5T|)Jq+^|mzrC~RN~g`6Rka`M
zkHuozSjXB-^*<(??N{%nbNu_i2ae^F@^b#A=ig?`^7U6;f6cheQtp#~v)D=LX8Yaq
zKNZ7S_{)la_&o_6HL8zG6xa`km90L|h5i1-U}QCuRgXYDxAB!?{5evJKdFCpy+yWP
zf8J2HIq7_o|LSu<{dt1%y3tk>=HH_HxAv84KkDVS`!ADgb-rqF{M@nLzU?Jq)Y?`$
z>1fDOJe!|tBeiGF?U!;9;u9Np<xM*3ddN~dn?G&5i{AdE{^k1lMxdE%i~aqSLDKoU
z9|%$GcU{!wXVITw-J5A$Hvgx!Z~97`{qM4_ru1X$rSa-I_4B5Et81J0O-5<fkLSO}
WuO6q=c`AM>`6mB7^k@D3kpBTuksNmb

literal 0
HcmV?d00001

diff --git a/win32/manifest.xml b/win32/manifest.xml
new file mode 100644
index 00000000..9c8871dd
--- /dev/null
+++ b/win32/manifest.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
+<assemblyIdentity
+    version="1.0.0.0"
+    processorArchitecture="X86"
+    name="JonathanWesthues.3dCAD.MechSketch"
+    type="win32"
+/>
+<description>Parametric 3d CAD tool.</description>
+<dependency>
+    <dependentAssembly>
+        <assemblyIdentity
+            type="win32"
+            name="Microsoft.Windows.Common-Controls"
+            version="6.0.0.0"
+            processorArchitecture="X86"
+            publicKeyToken="6595b64144ccf1df"
+            language="*"
+        />
+    </dependentAssembly>
+</dependency>
+</assembly>
diff --git a/win32/resource.rc b/win32/resource.rc
new file mode 100644
index 00000000..19e0a82e
--- /dev/null
+++ b/win32/resource.rc
@@ -0,0 +1,6 @@
+
+// we need a manifest if we want visual styles; put in numbers since somethings a bit screwy
+// with my SDK install (I don't think I've got *.rh right)
+1 24 "manifest.xml"
+
+4000 ICON "../icon.ico"
diff --git a/win32/w32main.cpp b/win32/w32main.cpp
index cd2e6357..ba36edc0 100644
--- a/win32/w32main.cpp
+++ b/win32/w32main.cpp
@@ -915,8 +915,10 @@ static void CreateMainWindows(void)
     wc.lpszClassName    = "GraphicsWnd";
     wc.lpszMenuName     = NULL;
     wc.hCursor          = LoadCursor(NULL, IDC_ARROW);
-    wc.hIcon            = NULL;
-    wc.hIconSm          = NULL;
+    wc.hIcon            = (HICON)LoadImage(Instance, MAKEINTRESOURCE(4000),
+                            IMAGE_ICON, 32, 32, 0);
+    wc.hIconSm          = (HICON)LoadImage(Instance, MAKEINTRESOURCE(4000),
+                            IMAGE_ICON, 16, 16, 0);
     if(!RegisterClassEx(&wc)) oops();
 
     HMENU top = CreateGraphicsWindowMenus();