From e11278afdda303fa281883818d4d4bcb67dcf0d1 Mon Sep 17 00:00:00 2001
From: joostverburg <joostverburg@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Mon, 18 Nov 2002 15:53:32 +0000
Subject: [PATCH] shell font

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@1785 212acab6-be3b-0410-9dea-997c60f758d6
---
 Contrib/Makensisw/resource.rc     |   6 +++---
 Contrib/UIs/UI Holder/resource.rc |  28 ++++++++++++++--------------
 Contrib/UIs/default.exe           | Bin 5632 -> 6144 bytes
 Contrib/UIs/sdbarker_tiny.exe     | Bin 5632 -> 6144 bytes
 Source/exehead/resource.rc        |  24 ++++++++++++------------
 5 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/Contrib/Makensisw/resource.rc b/Contrib/Makensisw/resource.rc
index 02d0d839..23e345ad 100644
--- a/Contrib/Makensisw/resource.rc
+++ b/Contrib/Makensisw/resource.rc
@@ -129,7 +129,7 @@ END
 //
 
 DLG_MAIN DIALOGEX DISCARDABLE  0, 0, 361, 228
-STYLE DS_FIXEDSYS | DS_3DLOOK | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | 
+STYLE DS_SHELLFONT | DS_3DLOOK | DS_CENTER | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_POPUP | 
     WS_VISIBLE | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
 CAPTION "MakeNSIS"
 MENU IDM_MENU
@@ -144,8 +144,8 @@ BEGIN
     PUSHBUTTON      "&Test Installer",IDC_TEST,230,208,60,15,WS_DISABLED
 END
 
-DLG_ABOUT DIALOG DISCARDABLE  0, 0, 233, 126
-STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_POPUP | WS_CAPTION
+DLG_ABOUT DIALOGEX DISCARDABLE  0, 0, 233, 126
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_POPUP | WS_CAPTION
 CAPTION "About MakeNSISW"
 FONT 8, "MS Shell Dlg"
 BEGIN
diff --git a/Contrib/UIs/UI Holder/resource.rc b/Contrib/UIs/UI Holder/resource.rc
index c02b211e..27102c22 100644
--- a/Contrib/UIs/UI Holder/resource.rc	
+++ b/Contrib/UIs/UI Holder/resource.rc	
@@ -26,8 +26,8 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 // Dialog
 //
 
-IDD_LICENSE DIALOG DISCARDABLE  0, 0, 266, 130
-STYLE DS_CONTROL | WS_CHILD
+IDD_LICENSE DIALOGEX DISCARDABLE  0, 0, 266, 130
+STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON            103,IDC_ULICON,0,0,20,20
@@ -36,8 +36,8 @@ BEGIN
                     0x804,0,24,266,105
 END
 
-IDD_DIR DIALOG DISCARDABLE  0, 0, 266, 130
-STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD
+IDD_DIR DIALOGEX DISCARDABLE  0, 0, 266, 130
+STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD
 FONT 8, "MS Shell Dlg"
 BEGIN
     EDITTEXT        IDC_DIR,8,49,187,12,ES_AUTOHSCROLL
@@ -54,8 +54,8 @@ BEGIN
     LTEXT           "",IDC_INTROTEXT,25,0,241,34
 END
 
-IDD_SELCOM DIALOG DISCARDABLE  0, 0, 266, 130
-STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD
+IDD_SELCOM DIALOGEX DISCARDABLE  0, 0, 266, 130
+STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD
 FONT 8, "MS Shell Dlg"
 BEGIN
     COMBOBOX        IDC_COMBO1,114,25,152,102,CBS_DROPDOWNLIST | WS_VSCROLL | 
@@ -72,8 +72,8 @@ BEGIN
                     WS_BORDER | WS_TABSTOP,114,39,151,90
 END
 
-IDD_INST DIALOG DISCARDABLE  0, 0, 280, 162
-STYLE DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | 
+IDD_INST DIALOGEX DISCARDABLE  0, 0, 280, 162
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | 
     WS_SYSMENU
 FONT 8, "MS Shell Dlg"
 BEGIN
@@ -86,8 +86,8 @@ BEGIN
     CTEXT           "",IDC_VERSTR,59,145,108,8,WS_DISABLED
 END
 
-IDD_INSTFILES DIALOG DISCARDABLE  0, 0, 266, 130
-STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD
+IDD_INSTFILES DIALOGEX DISCARDABLE  0, 0, 266, 130
+STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD
 FONT 8, "MS Shell Dlg"
 BEGIN
     CONTROL         "",IDC_PROGRESS1,"msctls_progress32",NOT WS_VISIBLE | 
@@ -103,8 +103,8 @@ BEGIN
     PUSHBUTTON      "",IDC_SHOWDETAILS,0,28,60,14,NOT WS_TABSTOP
 END
 
-IDD_UNINST DIALOG DISCARDABLE  0, 0, 266, 130
-STYLE DS_FIXEDSYS | DS_CONTROL | WS_CHILD
+IDD_UNINST DIALOGEX DISCARDABLE  0, 0, 266, 130
+STYLE DS_SHELLFONT | DS_CONTROL | WS_CHILD
 FONT 8, "MS Shell Dlg"
 BEGIN
     ICON            103,IDC_ULICON,0,1,20,20
@@ -113,8 +113,8 @@ BEGIN
     LTEXT           "",IDC_INTROTEXT,25,0,241,34
 END
 
-IDD_VERIFY DIALOG DISCARDABLE  0, 0, 162, 22
-STYLE DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_VISIBLE
+IDD_VERIFY DIALOGEX DISCARDABLE  0, 0, 162, 22
+STYLE DS_SHELLFONT | DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_VISIBLE
 FONT 8, "MS Shell Dlg"
 BEGIN
     CTEXT           "",IDC_STR,7,7,148,8
diff --git a/Contrib/UIs/default.exe b/Contrib/UIs/default.exe
index 4983015901b74e7edf8b874d8ed39766b84d6547..4adb3c0aa094634d2c7ae502041291f121f32d60 100755
GIT binary patch
delta 1205
zcmah}O=}ZD7=C7xCet+*-84yqJ!lb>s&vzX_RzytTNJ#kf|u$+Xwjw!#Zo+Yu$zMS
zmKF4-=pRsf5xja3PkQh_D5$hI>(~0sOs3f_(af^hdFOfF&w1ZOCnJA-M;zGrvFP|R
zzU^F$Ux>%9F98I6-OX9&Wohmew|4nwfoWkSVC5VznUbGR6HCi8z_pZIIuE?*sN+55
z>p(o_RrX)VBgkpY6>IS&Z>&ivR0o56ig_SO*7)AkoX(FE)+ubGhHq3*ob<}eC$upH
zS2Xd7_+>OPhXu@Fp1T!{!^c$I@XFf1N}Y)t|Em#Np+p0(QNmAcyOlQ0y$Ih?{|pB3
zS>sU#=TXo2OK`|Jihd#SOWW9ue^nbZgu9x6b`jEEau9*U6z;&qR+k`*{*u;DvJTp2
zYyn3y1r(?yiFKszrl<v5n;edW%c$cKZeT~7y>H3-%Ojn8rN`X?$8if4{OJ;!3H=ap
ziQifLigsdiTO#5Axz#hd*+^@=;AI@cL(D?5wsF-v{A|J#b-_NeB$azX3nur*Koqc_
z*m3*tg;B-#%A-|77U)1<+t6tPsZfWw-DarW`m`@-1z<h<#R9%7Rc~<Qs!^rXvyI3k
zXBd-g#hmVvNGtD6gb-Kf5|x(dIbgskHn~J!m;Q@nE1bXyeBh9%0ZWp-L-McwN~*gx
fek-wV{wAKHs%F0|Sg#_ActE!W<9734;iLEqGmyAB

delta 1152
zcmaKsO=}cE5Qd+g*<?EFvM$SPk|hcn1SL^PL^Pm>^&={X;KwbefTD>67K7yAWoHB4
zS4Pl-popMX^{78Uy!kI8s2K2I{93DfW-`5)wPB#D->#~+s^6YyD%#)KQ003+ZhG@U
ze9Jo@zf_Nl^8wJ1Prsh?UX@yp#LQNB5<-=Eu<sO99DnAtV6Hz4haG?E3_Q!jshow2
zj^8NQ%J_D#s8(UnnmV4YjkRQZ^K?i^Q0R77>2`0}GoHojVy`p87vEsXD(EL^+$cr0
z$eMqdMXs{IEZ4-k%^{{Zk)DQgDGhCREDd9MBs3!0Hl1dgH<b7(rP`ap%3|*&;Ze$b
z6f8=y|Isgz(1$$?Da|j3evaKSSPN|5Nmd`#FqRhnD-`+a6wCvgHfh&MD(yJ)8t<7`
z*1u5#GO=uqnhRVZK2jT&tJrPBm#OoR>ugBsyY@Kd_AF-HTAynY?XV>1ABR#-cT6zN
z?=7(=P4qGP_fqfaWhA|<W%lxbIdmcJRCmQI+spCW>bH8<Y9ceIRT13IO4Kkth-gGo
z+xX<iI-IB~dbdB@?SmQnQHfX=_O1X28f}{inbwe6;JY8c2*)qEgZfv`*${VdT!iGy
zokx<|tc-NQdcCCGSE6M2TfY)GAoA1<I7*6iBI_9@`5>}hlkw-W?yr`2nvNloyz{3;
ahAl0Tq<OS8l?p8&;J%a`G$rM4^ZYMlz^-oq

diff --git a/Contrib/UIs/sdbarker_tiny.exe b/Contrib/UIs/sdbarker_tiny.exe
index 572af786d052736d2abb1547fc245e9a110c4e37..4661effbbd42a1645db784949ebf1a8171f4371c 100644
GIT binary patch
delta 1122
zcma)*%WD%+6vlsd@*2}<(@dIHh+v{_iX~B~x(GNvQUy0-aVLnN_(Bki`%Vh(BO~Ze
z(Ut4E5Z$^Ecl`_8DrhyXv_9gwcjoF4#r6)vz2|)AoO>SM4flra{y>%Qe7@#X-RP!s
zDte+G6ss=a%U@hsaGsZzp2^X!_EFfatORF{K_?~mj|-NTyKp`wf0~Dvf82R`LhzKV
z7!Iv?GK-&qyvRj0AI()-`$P;hT$QhoMU0o_zid5{-3hkKX}}a~(Q3u(X5EM4H7!wE
zyp<3OT;&2+=yFj`x7bgcBZ=>50tKT_?q3S&1unaIL5Xh?X*ld9es)vAYnmKn8}AGr
zTEOg^$-jgn+1A*iT)vwa%Qi;zrjnc0xZ<$ENqS%n^d92}3_g_lCtJ2371mPm{#)tk
z42@usaqe@Dug2?k`Vwp<lN(F|8eC@wKlLQG#<f*N<MJb=>2O0dCfhNa?RY%B@|5&^
zkvjL7!IgTW^@*L2>lL+Uv;a*MLzN^^O=F@tuTe`BguakKh%v@{$v?W}%_NXYK_3#x
zi@kKp({db0f`(4zoZs`~0k!#}jn}>A+1Oa5P4H9O)aeLEGG>0EaULy4AX%1qab&e2
z^Pwf|bIJXK8KK(?4l&EBa74d@zu9Yh-yCI1?f0vE<<gHI^doBeQF=-`RG`3Jxi%kP
LyE2jgs2unO$Dpn_

delta 1119
zcmaKs&1(}u7{-6IyX}rKBqdF4ixo_~6}7>G7AzP)Dg`fEJoloYmV#QuYd3;750w@4
zP*KE-XYry3J$v)Ns8EH7hln5RyED7ZEF>LBGVj;S^StjfiCWRo&916E{;}#Uh4EeQ
zQv61}C@qCRTR!^jviH8cu_fDl)z3jMH{`c`9>!GPF>^uouDuBJj(znayzZyd6Z^7b
zw*zxCzVVfmgh$O*$Iq(=H^jZ0U8hbMB*_Dk<c7)dOl(^AT_*YNr!l(%{W7bYqNL{7
z_LsTEHEy!Vb=lqH1TD^H*}^`9k#+*95E$w5urMMz<~Yp}K2YYjT-C8D@~uqlGfhrW
z;j6@=EVdW?G8R4@V4u?bap31M#hEm=0*1FewI4ib3KOSLAUi#&6?!s+V@A=ZVJg?D
z@{ARJ$*B(q(3lu91!%CwA^tgNa->Mj8k)ZYV+-6ypJq6XYJtXNHj8y;c*-m~i0{-6
z$M>t1c&qkvI%jEBv^z;*`EI;17PV7Kq6tyVes=tLXMDD%D7wEH_wgM4lvH#Dy{oU0
zcE_A#hu5O#$B*jGD|^jbPB9Hea4(2Xd>LsZ&UEFV17o?Mi;qA_BL_bMm=pDBMjW9;
z+NyS*V|)?SZcF?7s&$3ZERg%8*-U}hXZ)%p0=3ILh6$BvEF|QKTsfLvDSsv({{wSw
Bt4;s_

diff --git a/Source/exehead/resource.rc b/Source/exehead/resource.rc
index 81223116..bfee6a7f 100644
--- a/Source/exehead/resource.rc
+++ b/Source/exehead/resource.rc
@@ -28,9 +28,9 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 
 #if defined(APSTUDIO_INVOKED) || defined(NSIS_CONFIG_LICENSEPAGE)
 #if defined(APSTUDIO_INVOKED)
-IDD_LICENSE$(NSIS_CONFIG_LICENSEPAGE) DIALOG DISCARDABLE  0, 0, 266, 130
+IDD_LICENSE$(NSIS_CONFIG_LICENSEPAGE) DIALOGEX DISCARDABLE  0, 0, 266, 130
 #else
-IDD_LICENSE DIALOG DISCARDABLE  0, 0, 266, 130
+IDD_LICENSE DIALOGEX DISCARDABLE  0, 0, 266, 130
 #endif
 STYLE DS_CONTROL | DS_SHELLFONT | WS_CHILD
 FONT 8, "MS Shell Dlg"
@@ -44,9 +44,9 @@ END
 
 #if defined(APSTUDIO_INVOKED) || defined(NSIS_CONFIG_VISIBLE_SUPPORT)
 #if defined(APSTUDIO_INVOKED)
-IDD_DIR$(NSIS_CONFIG_VISIBLE_SUPPORT) DIALOG DISCARDABLE  0, 0, 266, 130
+IDD_DIR$(NSIS_CONFIG_VISIBLE_SUPPORT) DIALOGEX DISCARDABLE  0, 0, 266, 130
 #else
-IDD_DIR DIALOG DISCARDABLE  0, 0, 266, 130
+IDD_DIR DIALOGEX DISCARDABLE  0, 0, 266, 130
 #endif
 STYLE DS_CONTROL | DS_SHELLFONT | WS_CHILD
 FONT 8, "MS Shell Dlg"
@@ -68,9 +68,9 @@ END
 
 #if defined(APSTUDIO_INVOKED) || defined(NSIS_CONFIG_COMPONENTPAGE)
 #if defined(APSTUDIO_INVOKED)
-IDD_SELCOM$(NSIS_CONFIG_COMPONENTPAGE) DIALOG DISCARDABLE  0, 0, 266, 130
+IDD_SELCOM$(NSIS_CONFIG_COMPONENTPAGE) DIALOGEX DISCARDABLE  0, 0, 266, 130
 #else
-IDD_SELCOM DIALOG DISCARDABLE  0, 0, 266, 130
+IDD_SELCOM DIALOGEX DISCARDABLE  0, 0, 266, 130
 #endif
 STYLE DS_CONTROL | DS_SHELLFONT | WS_CHILD
 FONT 8, "MS Shell Dlg"
@@ -111,9 +111,9 @@ END
 
 #if defined(APSTUDIO_INVOKED) || defined(NSIS_CONFIG_VISIBLE_SUPPORT)
 #if defined(APSTUDIO_INVOKED)
-IDD_INSTFILES$(NSIS_CONFIG_VISIBLE_SUPPORT) DIALOG DISCARDABLE  0, 0, 266, 130
+IDD_INSTFILES$(NSIS_CONFIG_VISIBLE_SUPPORT) DIALOGEX DISCARDABLE  0, 0, 266, 130
 #else
-IDD_INSTFILES DIALOG DISCARDABLE  0, 0, 266, 130
+IDD_INSTFILES DIALOGEX DISCARDABLE  0, 0, 266, 130
 #endif
 STYLE DS_CONTROL | DS_SHELLFONT | WS_CHILD
 FONT 8, "MS Shell Dlg"
@@ -134,9 +134,9 @@ END
 
 #if defined(APSTUDIO_INVOKED) || defined(_NSIS_CONFIG_UNINSTDLG)
 #if defined(APSTUDIO_INVOKED)
-IDD_UNINST$(_NSIS_CONFIG_UNINSTDLG) DIALOG DISCARDABLE  0, 0, 266, 130
+IDD_UNINST$(_NSIS_CONFIG_UNINSTDLG) DIALOGEX DISCARDABLE  0, 0, 266, 130
 #else
-IDD_UNINST DIALOG DISCARDABLE  0, 0, 266, 130
+IDD_UNINST DIALOGEX DISCARDABLE  0, 0, 266, 130
 #endif
 STYLE DS_CONTROL | DS_SHELLFONT | WS_CHILD
 FONT 8, "MS Shell Dlg"
@@ -150,9 +150,9 @@ END
 
 #if defined(APSTUDIO_INVOKED) || defined(_NSIS_CONFIG_VERIFYDIALOG)
 #if defined(APSTUDIO_INVOKED)
-IDD_VERIFY$(_NSIS_CONFIG_VERIFYDIALOG) DIALOG DISCARDABLE  0, 0, 162, 22
+IDD_VERIFY$(_NSIS_CONFIG_VERIFYDIALOG) DIALOGEX DISCARDABLE  0, 0, 162, 22
 #else
-IDD_VERIFY DIALOG DISCARDABLE  0, 0, 162, 22
+IDD_VERIFY DIALOGEX DISCARDABLE  0, 0, 162, 22
 #endif
 STYLE DS_MODALFRAME | DS_SHELLFONT | DS_CENTER | WS_POPUP | WS_VISIBLE
 FONT 8, "MS Shell Dlg"