From dca0c7c4c42c706e2f1021c69d8eb9703f341f4d Mon Sep 17 00:00:00 2001
From: kichik <kichik@212acab6-be3b-0410-9dea-997c60f758d6>
Date: Mon, 10 Mar 2003 21:13:18 +0000
Subject: [PATCH] LangDLL defaults to MS Shell Dlg

git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2268 212acab6-be3b-0410-9dea-997c60f758d6
---
 Contrib/LangDLL/LangDLL.c   |  18 ++++++++++--------
 Contrib/LangDLL/resource.rc |   6 +++---
 Plugins/LangDLL.dll         | Bin 5120 -> 5120 bytes
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/Contrib/LangDLL/LangDLL.c b/Contrib/LangDLL/LangDLL.c
index de7bf21c..c973d67a 100644
--- a/Contrib/LangDLL/LangDLL.c
+++ b/Contrib/LangDLL/LangDLL.c
@@ -51,14 +51,16 @@ BOOL CALLBACK DialogProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
         size = myatoi(temp);
         if (!popstring(temp)) {
           LOGFONT f = {0,};
-          f.lfHeight = -MulDiv(size, GetDeviceCaps(GetDC(hwndDlg), LOGPIXELSY), 72);
-          lstrcpy(f.lfFaceName, temp);
-          font = CreateFontIndirect(&f);
-          SendMessage(hwndDlg, WM_SETFONT, (WPARAM)font, 1);
-          SendDlgItemMessage(hwndDlg, IDOK, WM_SETFONT, (WPARAM)font, 1);
-          SendDlgItemMessage(hwndDlg, IDCANCEL, WM_SETFONT, (WPARAM)font, 1);
-          SendDlgItemMessage(hwndDlg, IDC_LANGUAGE, WM_SETFONT, (WPARAM)font, 1);
-          SendDlgItemMessage(hwndDlg, IDC_TEXT, WM_SETFONT, (WPARAM)font, 1);
+          if (lstrcmp(temp, "MS Shell Dlg")) {
+            f.lfHeight = -MulDiv(size, GetDeviceCaps(GetDC(hwndDlg), LOGPIXELSY), 72);
+            lstrcpy(f.lfFaceName, temp);
+            font = CreateFontIndirect(&f);
+            SendMessage(hwndDlg, WM_SETFONT, (WPARAM)font, 1);
+            SendDlgItemMessage(hwndDlg, IDOK, WM_SETFONT, (WPARAM)font, 1);
+            SendDlgItemMessage(hwndDlg, IDCANCEL, WM_SETFONT, (WPARAM)font, 1);
+            SendDlgItemMessage(hwndDlg, IDC_LANGUAGE, WM_SETFONT, (WPARAM)font, 1);
+            SendDlgItemMessage(hwndDlg, IDC_TEXT, WM_SETFONT, (WPARAM)font, 1);
+          }
         }
       }
       ShowWindow(hwndDlg, SW_SHOW);
diff --git a/Contrib/LangDLL/resource.rc b/Contrib/LangDLL/resource.rc
index d0315e55..42ed87f4 100644
--- a/Contrib/LangDLL/resource.rc
+++ b/Contrib/LangDLL/resource.rc
@@ -26,10 +26,10 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 // Dialog
 //
 
-IDD_DIALOG DIALOG DISCARDABLE  0, 0, 192, 79
-STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
+IDD_DIALOG DIALOGEX DISCARDABLE  0, 0, 192, 79
+STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT
 CAPTION "Dialog"
-FONT 8, "MS Sans Serif"
+FONT 8, "MS Shell Dlg"
 BEGIN
     COMBOBOX        IDC_LANGUAGE,45,39,140,100,CBS_DROPDOWNLIST | WS_VSCROLL | 
                     WS_TABSTOP
diff --git a/Plugins/LangDLL.dll b/Plugins/LangDLL.dll
index 84127582700e00183b0b89ec61f2aac83ca7005d..6119d612b6bec1e6a9bb0035b8c138c5d9faed74 100644
GIT binary patch
delta 1222
zcmY*YZ)h837=Pd7n$$Gw-B=FW*=owJHq%tzyZ6fMYPY~riEBF#v&$KsNnsnk#e7f+
z$fP#aHq?+7HtvHW$czDTvnVdY{DYD$D(x5X(}w>Lzi48q9STZi@cP_kg)T?#p6B`f
zp5ODlf1bI}T<BcGeT8MuulM5Lth?|@*AzbAw};aZTCvJ5)%p|<;18@{@r!uMO1cK{
zU)5J!MNABS!R<n55MhLJ@mS7FYt0@A@K>VJL@eiz@dY2a%|8LB%rLBjTyHE)kic@Q
zw;ByMLP?|f4S?my!$^piPDn9**<_R@N<)z#5=J&>y2}n<Z5ZYeAew(bQk-3%Jo~$K
zf$O!t<nGJUjp0!{fA&zOt5LB<wN_HD!7(uiI)z%UV{By5Ce8e~ez#N2c<}3(W**z2
zIXp_BHGbg+Lg<T#iUhs!19V@gCHX=fVtQi*T)h~To@`tNE9oE?LjYwui!)LnxePC}
z9YplM-`}pxFT7?GVwtC`Y}>xPt}!tLEiFeS0ZarY-Kg|H&X}%cNZN=q@i+u^He?44
z9TvN7XIwj+?VZ>L&CS-%WZFPs0u)luJiR_pwnbq1UZ~X$L2I{XFHO&X^~f~=m7)?C
zuS8)}!17nRfC)xGPgH^}v&*0x<`m!+$x3-1!$IpkPYM&u>+Q#3YtS3=*=Lg|a(p>#
zrM>rewA?7qfq%}ciXniR7=^lN=%#KLtc0xZz5DZag#`4qzeEcE<n}E;%4sYo`CEHa
z+T}FhNfa>?!;npDsXF{4_4!d7LAl|w-ECsN)~;nDObh^r4LJ+AY0EfrVh=>ijuI+*
z9HU55_0ojI751*p1m?H8U*;Vh{==*8HVFiwNWEHiJ%KO#PPy!Xu%`Wec&u9V=dph>
z9*mo(v)N!YJ6+w~`5(4Ag+urj%!z;zV{pjMZ?%1O&N792^Wfo06o(UzBNLrQS$Kjd
z3h(LLRQuybecB)zKuhQpvhOxyg&inJAgqm}5u~6_d&&TxLyx2JJ2=477H@OlUOJp3
z*1y7@11*{hD)^wnJ;=TzjJ<kCHiR@E-~o7Uws4sFOL+l?ABabZMhucAvt*IHO;*T9
z<P&m@tdU>HCfOpKyi4wviF`(WK`zKk^6T<N`D6KWc}@OK{z-1iTXKgYDnX@RIiQRy
z$Cb45tn!?)sJy9MRz6c|%5|lwVCtpaG)xcD!}J6->GSj@x<ns%gT6yoXqA3TZ_uCV
hIu+H2R8>8!9#a$QN%f3+R-IKB)wk4lRXDN){vS?*Uf%!!

delta 1138
zcmYjQZ)jUp6hHUnHOaCpd1x{^+swwrC1REP?tO*LQWt5^%vBeNO&Vvj$^ON+;h*|Y
z2i0`z!pLf|<9?X34_nL!1t-=8QJKR?hIa0wIFy0n7fD;S1w}g$p69++@jc$-ob&tL
z-|w9F?wv?XBxc&K9kWNyEJnyTVjbD9B*~fR?P><#T~SjE@hORubK)oRGD(Vp5+}=z
z<4Tp#T=3*F0k{wFWo6Trhd1ZfDFDHbQ?a46<xdAIe<3t~6JPw#TuwZoM$+9BG~1f{
zyZx;TppctyAXrOo18u4=*#la3>Zw?II6wW0ePsa&6?=SR%~@ism{1x-@^IF^vHRG9
zIIl(&Zi~;<JImV#q`+(aW@mdws%BP~SSzX>?m^K?(^~&Xze5_oxfpWnOt|-}bf)z9
zn&RX@4>ktDlV1YB=Sc&!eES;CQfU@~l}lL5x6fgkucl%n?OBWp4)P`<Q7skI%s^p!
zJQgz3=99m_Cr)&1DVL;3#ttX2foWu52pF0qW74`G&GzQAcK8XWWcSHJ-Xu7iN&d~0
z|7UXS|De(mjwuTrC^3W*dq?*y#%odpXZ4_!S47<rQWQJf;fNQ@Q>j>JI9JzJ!_GYa
zwX_evSv@3PaPK6Vxa=;H9&v}~ZqhB1o`g?+^ITO8*1E-*XY2aaG!;}auX~JeC&G3(
zC7p|-ds?Wj);q;7o_kPgqjz)J@p0#>#18i&i8qTae3Grn0f~UMy(XK=O*Xw5GiirI
z$g%sJK9_AP=AV98#TmM>T62`3>UM%EEw-kHVru2ucxdw0rdNZGOz?v*Tpc0QLys2z
z5P-(kz&>)xcR-QbS{(LA32RjSWzyIZSR`Ur=@J3$LGlA`a&OZ+HzAjZ=e5n{#~_RU
zC<{-+v+$x59fUD>1`bIExFCv0LT>mtybcFo!DZVOS-^_`aj;#`4-5jB+x7(PhFz<$
zWH|V#HC%D<LC0x79E78iXE<bK&BTW$U9f~EC!D%$036H*J_zBxEHONxb7c*WDv}<h
z8Jed@=@>mtFVKthL;4B5O0Ux&=@Pv~Reghgmwvzgoc@x2T%Xa;>Tl~8^^f!``gQ$#
z{bzkeSJ(!28;h}R>>)P9M%XB`*eQ0Ny~EyTEp~(b#{OV#zKO?qFW<?Bd66IH$9RP&
s-r#TX3;Z&_%D?8{amDB|qDHULZwwk4BWD~kju@74+7L#gri_q(07$w(4gdfE